Add initial support for Vision Barcode API

This work is heavily based on work by @lfxgroove

Co-Authored-By: lfxgroove <[email protected]>

play-services-basement/src/main/kotlin/com/google/android/gms/dynamic/ObjectWrapper.kt

@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-package org.microg.gms.kotlin
-
-import com.google.android.gms.dynamic.IObjectWrapper
-import com.google.android.gms.dynamic.ObjectWrapper
+package com.google.android.gms.dynamic
 
 inline fun <reified T> IObjectWrapper?.unwrap(): T? = ObjectWrapper.unwrapTyped(this, T::class.java)

play-services-core/build.gradle

@@ -45,6 +45,7 @@ dependencies {
     implementation project(':play-services-base-core-ui')
     implementation project(':play-services-conscrypt-provider-core')
     implementation project(':play-services-location-core')
+    implementation project(':play-services-vision-core')
     withNearbyImplementation project(':play-services-nearby-core')
     withNearbyImplementation project(':play-services-nearby-core-ui')
     implementation project(':play-services-core-proto')

play-services-core/src/main/java/com/google/android/gms/chimera/container/DynamiteLoaderImpl.java

@@ -28,12 +28,14 @@
 
 import org.microg.gms.common.Constants;
 
+import java.lang.reflect.Field;
+
 public class DynamiteLoaderImpl extends IDynamiteLoader.Stub {
     private static final String TAG = "GmsDynamiteLoaderImpl";
 
     @Override
     public IObjectWrapper createModuleContext(IObjectWrapper wrappedContext, String moduleId, int minVersion) throws RemoteException {
-        Log.d(TAG, "unimplemented Method: createModuleContext for " + moduleId + " at version " + minVersion + ", returning gms context");
+        Log.d(TAG, "createModuleContext for " + moduleId + " at version " + minVersion);
         final Context context = (Context) ObjectWrapper.unwrap(wrappedContext);
         try {
             return ObjectWrapper.wrap(new ContextWrapper(context.createPackageContext(Constants.GMS_PACKAGE_NAME, Context.CONTEXT_INCLUDE_CODE | Context.CONTEXT_IGNORE_SECURITY)) {
@@ -55,6 +57,12 @@ public int getModuleVersion(IObjectWrapper context, String moduleId) throws Remo
 
     @Override
     public int getModuleVersion2(IObjectWrapper context, String moduleId, boolean updateConfigIfRequired) throws RemoteException {
+        try {
+            return Class.forName("com.google.android.gms.dynamite.descriptors." + moduleId + ".ModuleDescriptor").getDeclaredField("MODULE_VERSION").getInt(null);
+        } catch (Exception e) {
+            Log.w(TAG, "No such module known: " + moduleId);
+        }
+
         if (moduleId.equals("com.google.android.gms.firebase_database")) {
             Log.d(TAG, "returning temp fix module version for " + moduleId + ". Firebase Database will not be functional!");
             return com.google.android.gms.dynamite.descriptors.com.google.android.gms.firebase_database.ModuleDescriptor.MODULE_VERSION;

play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/GoogleMap.kt

@@ -50,7 +50,7 @@ import com.mapbox.mapboxsdk.maps.Style
 import com.mapbox.mapboxsdk.plugins.annotation.*
 import com.mapbox.mapboxsdk.plugins.annotation.Annotation
 import com.mapbox.mapboxsdk.style.layers.Property.LINE_CAP_ROUND
-import org.microg.gms.kotlin.unwrap
+import com.google.android.gms.dynamic.unwrap
 import org.microg.gms.maps.MapsConstants.*
 import org.microg.gms.maps.mapbox.model.*
 import org.microg.gms.maps.mapbox.utils.MapContext

play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/Projection.kt

@@ -25,7 +25,7 @@ import com.google.android.gms.maps.internal.IProjectionDelegate
 import com.google.android.gms.maps.model.LatLng
 import com.google.android.gms.maps.model.VisibleRegion
 import com.mapbox.mapboxsdk.maps.Projection
-import org.microg.gms.kotlin.unwrap
+import com.google.android.gms.dynamic.unwrap
 import org.microg.gms.maps.mapbox.utils.toGms
 import org.microg.gms.maps.mapbox.utils.toMapbox
 import kotlin.math.roundToInt
@@ -77,4 +77,4 @@ class ProjectionImpl(private val projection: Projection, private val withoutTilt
     companion object {
         private val TAG = "GmsMapProjection"
     }
-}
+}

play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/Marker.kt

@@ -26,7 +26,7 @@ import com.google.android.gms.maps.model.internal.IMarkerDelegate
 import com.mapbox.mapboxsdk.plugins.annotation.AnnotationManager
 import com.mapbox.mapboxsdk.plugins.annotation.Symbol
 import com.mapbox.mapboxsdk.plugins.annotation.SymbolOptions
-import org.microg.gms.kotlin.unwrap
+import com.google.android.gms.dynamic.unwrap
 import org.microg.gms.maps.mapbox.GoogleMapImpl
 import org.microg.gms.maps.mapbox.utils.toMapbox
 

play-services-vision-api/build.gradle

@@ -0,0 +1,35 @@
+/*
+ * SPDX-FileCopyrightText: 2020, microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+apply plugin: 'com.android.library'
+apply plugin: 'maven-publish'
+apply plugin: 'signing'
+
+android {
+    compileSdkVersion androidCompileSdk
+    buildToolsVersion "$androidBuildVersionTools"
+
+    defaultConfig {
+        versionName version
+        minSdkVersion androidMinSdk
+        targetSdkVersion androidTargetSdk
+    }
+
+    compileOptions {
+        sourceCompatibility = 1.8
+        targetCompatibility = 1.8
+    }
+}
+
+apply from: '../gradle/publish-android.gradle'
+
+description = 'microG API for play-services-vision'
+
+dependencies {
+    api project(':play-services-basement')
+    api project(':play-services-base-api')
+
+    implementation "androidx.annotation:annotation:$annotationVersion"
+}

play-services-vision-api/src/main/AndroidManifest.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ SPDX-FileCopyrightText: 2020, microG Project Team
+  ~ SPDX-License-Identifier: Apache-2.0
+  -->
+<manifest package="org.microg.gms.vision.api"/>

play-services-vision-api/src/main/aidl/com/google/android/gms/vision/barcode/Barcode.aidl

@@ -0,0 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2020, microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.vision.barcode;
+
+parcelable Barcode;

play-services-vision-api/src/main/aidl/com/google/android/gms/vision/barcode/internal/client/BarcodeDetectorOptions.aidl

@@ -0,0 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2020, microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.vision.barcode.internal.client;
+
+parcelable BarcodeDetectorOptions;

play-services-vision-api/src/main/aidl/com/google/android/gms/vision/barcode/internal/client/INativeBarcodeDetector.aidl

@@ -0,0 +1,17 @@
+/*
+ * SPDX-FileCopyrightText: 2020, microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.vision.barcode.internal.client;
+
+import com.google.android.gms.vision.barcode.Barcode;
+import com.google.android.gms.vision.barcode.internal.client.BarcodeDetectorOptions;
+import com.google.android.gms.vision.internal.FrameMetadataParcel;
+import com.google.android.gms.dynamic.IObjectWrapper;
+
+interface INativeBarcodeDetector {
+    Barcode[] detectBytes(IObjectWrapper byteBuffer, in FrameMetadataParcel metadata) = 0;
+    Barcode[] detectBitmap(IObjectWrapper bitmap, in FrameMetadataParcel metadata) = 1;
+    void close() = 2;
+}

play-services-vision-api/src/main/aidl/com/google/android/gms/vision/barcode/internal/client/INativeBarcodeDetectorCreator.aidl

@@ -0,0 +1,14 @@
+/*
+ * SPDX-FileCopyrightText: 2020, microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.vision.barcode.internal.client;
+
+import com.google.android.gms.vision.barcode.internal.client.BarcodeDetectorOptions;
+import com.google.android.gms.vision.barcode.internal.client.INativeBarcodeDetector;
+import com.google.android.gms.dynamic.IObjectWrapper;
+
+interface INativeBarcodeDetectorCreator {
+    INativeBarcodeDetector create(IObjectWrapper context, in BarcodeDetectorOptions options) = 0;
+}

play-services-vision-api/src/main/aidl/com/google/android/gms/vision/internal/FrameMetadataParcel.aidl

@@ -0,0 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2020, microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.vision.internal;
+
+parcelable FrameMetadataParcel;