Combined changes:

- Adapt to GmsApi changes
- Add GmsLib for play-services-wearable library
- Increase version code (fixes microg#167)
- Update wearable

Author: mar-v-in

.gitmodules

@@ -7,3 +7,6 @@
 [submodule "extern/Wearable"]
 	path = extern/Wearable
 	url = https://github.com/microg/android_external_Wearable.git
+[submodule "extern/GmsLib"]
+	path = extern/GmsLib
+	url = https://github.com/microg/android_external_GmsLib.git

build.gradle

@@ -0,0 +1,7 @@
+subprojects {
+    group = 'org.microg'
+    repositories {
+        jcenter()
+    }
+}
+

extern/GmsApi

@@ -0,0 +1 @@
+extern/GmsLib/play-services-base

extern/GmsLib

@@ -0,0 +1 @@
+extern/GmsApi/play-services-basement

play-services-base

@@ -38,6 +38,7 @@ dependencies {
 
     compile project(":microg-ui-tools")
     compile project(':play-services-api')
+    compile project(':play-services-wearable')
     compile project(':unifiednlp-base')
     compile project(':wearable-lib')
 
@@ -80,8 +81,7 @@ android {
         versionName getMyVersionName()
         def x = getMyVersionCode()
         // We are not allowed to freely choose the hundreds column as it defines the device type
-        // Update commit id to current when increasing gms version code
-        versionCode(9256200 + x % 100 + ((int) (x / 100)) * 1000)
+        versionCode(9450200 + x % 100 + ((int) (x / 100)) * 1000)
 
         ndk {
             abiFilters "armeabi", "armeabi-v7a", "arm64-v8a", "x86"

play-services-basement

@@ -130,10 +130,10 @@
         </service>
 
         <service
-            android:name="org.microg.gms.wearable.WearableLocationService"
-            android:exported="false">
+            android:name="org.microg.gms.wearable.location.WearableLocationService">
             <intent-filter>
                 <action android:name="com.google.android.gms.wearable.MESSAGE_RECEIVED"/>
+                <data android:scheme="wear" android:host="*" android:pathPrefix="/com/google/android/location/fused/wearable" />
             </intent-filter>
         </service>
 

play-services-common-api

@@ -66,6 +66,7 @@ private boolean connect() {
                         if (!connecting) Log.d(TAG, "Could not connect to: " + intent);
                         return connecting;
                     }
+                    Log.d(TAG, "Unable to resolve: " + searchIntent);
                     return false;
                 } catch (Exception e) {
                     Log.w(TAG, e);
@@ -95,6 +96,8 @@ public void onServiceConnected(ComponentName name, IBinder service) {
                 }
                 waiting.clear();
                 context.unbindService(RemoteListenerProxy.this);
+                connecting = false;
+                remote = null;
             }
         }
     }

play-services-core/build.gradle

@@ -75,17 +75,20 @@ public synchronized Cursor getDataItemsForDataHolderByHostAndPath(String package
         if (path == null) {
             params = new String[]{packageName, signatureDigest};
             selection = "packageName = ? AND signatureDigest = ?";
-        } else if (host == null) {
+        } else if (TextUtils.isEmpty(host)) {
             if (path.endsWith("/")) path = path + "%";
+            path = path.replace("*", "%");
             params = new String[]{packageName, signatureDigest, path};
             selection = "packageName = ? AND signatureDigest = ? AND path LIKE ?";
         } else {
             if (path.endsWith("/")) path = path + "%";
+            path = path.replace("*", "%");
+            host = host.replace("*", "%");
             params = new String[]{packageName, signatureDigest, host, path};
             selection = "packageName = ? AND signatureDigest = ? AND host = ? AND path LIKE ?";
         }
         selection += " AND deleted=0 AND assetsPresent !=0";
-        return getReadableDatabase().rawQuery("SELECT host AS host,path AS path,data AS data,\'\' AS tags,assetname AS asset_key,assets_digest AS asset_id FROM dataItemsAndAssets WHERE " + selection, params);
+        return getReadableDatabase().rawQuery("SELECT null AS host,printf(\"wear://%s%s\",host,path) AS path,data AS data,\'\' AS tags,assetname AS asset_key,assets_digest AS asset_id FROM dataItemsAndAssets WHERE " + selection, params);
     }
 
     public synchronized Cursor getDataItemsByHostAndPath(String packageName, String signatureDigest, String host, String path) {

play-services-core/src/main/AndroidManifest.xml

@@ -417,9 +417,7 @@ public void onConnectedNodes(List<NodeParcelable> nodes) {
     }
 
     public DataItemRecord putData(PutDataRequest request, String packageName) {
-        String host = request.getUri().getHost();
-        if (TextUtils.isEmpty(host)) host = getLocalNodeId();
-        DataItemInternal dataItem = new DataItemInternal(host, request.getUri().getPath());
+        DataItemInternal dataItem = new DataItemInternal(fixHost(request.getUri().getHost(), true), request.getUri().getPath());
         for (Map.Entry<String, Asset> assetEntry : request.getAssets().entrySet()) {
             Asset asset = prepareAsset(packageName, assetEntry.getValue());
             if (asset != null) {
@@ -443,30 +441,36 @@ public DataHolder getDataItemsAsHolder(String packageName) {
         return DataHolder.fromCursor(dataHolderItems, 0, null);
     }
 
+    private String fixHost(String host, boolean nothingToLocal) {
+        if (TextUtils.isEmpty(host) && nothingToLocal) return getLocalNodeId();
+        if (TextUtils.isEmpty(host)) return null;
+        if (host.equals("local")) return getLocalNodeId();
+        return host;
+    }
+
     public DataHolder getDataItemsByUriAsHolder(Uri uri, String packageName) {
         String firstSignature;
         try {
             firstSignature = PackageUtils.firstSignatureDigest(context, packageName);
         } catch (Exception e) {
             return null;
         }
-        Cursor dataHolderItems = nodeDatabase.getDataItemsForDataHolderByHostAndPath(packageName, firstSignature, uri.getHost(), uri.getPath());
-        while (dataHolderItems.moveToNext()) {
-            Log.d(TAG, "getDataItems[]: path=" + Uri.parse(dataHolderItems.getString(1)).getPath());
-        }
-        dataHolderItems.moveToFirst();
-        dataHolderItems.moveToPrevious();
-        return new DataHolder(dataHolderItems, 0, null);
-    }
-
-    public DataHolder getDataItemForRecordAsHolder(DataItemRecord record) {
-        Cursor dataHolderItems = nodeDatabase.getDataItemsForDataHolderByHostAndPath(record.packageName, record.signatureDigest, record.dataItem.uri.getHost(), record.dataItem.uri.getPath());
+        Cursor dataHolderItems = nodeDatabase.getDataItemsForDataHolderByHostAndPath(packageName, firstSignature, fixHost(uri.getHost(), false), uri.getPath());
+        int j = 0;
         while (dataHolderItems.moveToNext()) {
-            Log.d(TAG, "getDataItems[]: path=" + Uri.parse(dataHolderItems.getString(1)).getPath());
+            for (int i = 0; i < dataHolderItems.getColumnCount(); i++) {
+                if (dataHolderItems.getType(i) == Cursor.FIELD_TYPE_STRING) {
+                    Log.d(TAG, "getDataItems[" + j + "]: " + dataHolderItems.getColumnName(i) + "=" + dataHolderItems.getString(i));
+                }
+                if (dataHolderItems.getType(i) == Cursor.FIELD_TYPE_INTEGER)
+                    Log.d(TAG, "getDataItems[" + j + "]: " + dataHolderItems.getColumnName(i) + "=" + dataHolderItems.getLong(i));
+            }
         }
         dataHolderItems.moveToFirst();
         dataHolderItems.moveToPrevious();
-        return new DataHolder(dataHolderItems, 0, null);
+        DataHolder dataHolder = new DataHolder(dataHolderItems, 0, null);
+        Log.d(TAG, "Returning data holder of size " + dataHolder.getCount() + " for query " + uri);
+        return dataHolder;
     }
 
     public synchronized void addListener(String packageName, IWearableListener listener) {
@@ -515,7 +519,7 @@ public void createConnection(ConnectionConfiguration config) {
     }
 
     public int deleteDataItems(Uri uri, String packageName) {
-        List<DataItemRecord> records = nodeDatabase.deleteDataItems(packageName, PackageUtils.firstSignatureDigest(context, packageName), uri.getHost(), uri.getPath());
+        List<DataItemRecord> records = nodeDatabase.deleteDataItems(packageName, PackageUtils.firstSignatureDigest(context, packageName), fixHost(uri.getHost(), false), uri.getPath());
         for (DataItemRecord record : records) {
             syncRecordToAll(record);
         }
@@ -533,7 +537,7 @@ public void sendMessageReceived(String packageName, MessageEventParcelable messa
     }
 
     public DataItemRecord getDataItemByUri(Uri uri, String packageName) {
-        Cursor cursor = nodeDatabase.getDataItemsByHostAndPath(packageName, PackageUtils.firstSignatureDigest(context, packageName), uri.getHost(), uri.getPath());
+        Cursor cursor = nodeDatabase.getDataItemsByHostAndPath(packageName, PackageUtils.firstSignatureDigest(context, packageName), fixHost(uri.getHost(), true), uri.getPath());
         DataItemRecord record = null;
         if (cursor != null) {
             if (cursor.moveToNext()) {

play-services-core/src/main/java/org/microg/gms/common/RemoteListenerProxy.java

@@ -21,6 +21,7 @@
 import android.os.Parcel;
 import android.os.ParcelFileDescriptor;
 import android.os.RemoteException;
+import android.util.Base64;
 import android.util.Log;
 
 import com.google.android.gms.common.api.Status;
@@ -154,11 +155,11 @@ public void deleteDataItemsWithFilter(IWearableCallbacks callbacks, Uri uri, int
 
     @Override
     public void sendMessage(IWearableCallbacks callbacks, String targetNodeId, String path, byte[] data) throws RemoteException {
-        Log.d(TAG, "sendMessage: " + targetNodeId + " / " + path);
+        Log.d(TAG, "sendMessage: " + targetNodeId + " / " + path + ": " + (data == null ? null : Base64.encodeToString(data, Base64.NO_WRAP)));
         SendMessageResponse sendMessageResponse = new SendMessageResponse();
         try {
-            sendMessageResponse.resultId = wearable.sendMessage(packageName, targetNodeId, path, data);
-            if (sendMessageResponse.resultId == -1) {
+            sendMessageResponse.requestId = wearable.sendMessage(packageName, targetNodeId, path, data);
+            if (sendMessageResponse.requestId == -1) {
                 sendMessageResponse.statusCode = 4000;
             }
         } catch (Exception e) {
@@ -262,8 +263,8 @@ public void removeListener(IWearableCallbacks callbacks, RemoveListenerRequest r
     }
 
     @Override
-    public void getStrorageInformation(IWearableCallbacks callbacks) throws RemoteException {
-        Log.d(TAG, "unimplemented Method: getStrorageInformation");
+    public void getStorageInformation(IWearableCallbacks callbacks) throws RemoteException {
+        Log.d(TAG, "unimplemented Method: getStorageInformation");
     }
 
     @Override