update

and added IosMultiAppAuth to proto

Author: deadYokai

play-services-wearable/core/src/main/java/org/microg/gms/wearable/CapabilityManager.java

@@ -127,9 +127,11 @@ public int addWithType(String capability, CapabilityType type) {
                     byte[] data = existingData.getByteArray("data", 0, 0);
                     CapabilityType existingType = CapabilityType.fromBytes(data);
 
-                    if (existingType == CapabilityType.STATIC || type == CapabilityType.DYNAMIC) {
+                    if (existingType == type)
+                        return CommonStatusCodes.SUCCESS;
+
+                    if (existingType == CapabilityType.STATIC)
                         return WearableStatusCodes.DUPLICATE_CAPABILITY;
-                    }
                 }
             } finally {
                 existingData.close();

play-services-wearable/core/src/main/java/org/microg/gms/wearable/MessageHandler.java

@@ -19,6 +19,7 @@
 import static org.microg.gms.wearable.WearableConnection.calculateDigest;
 import static org.microg.gms.wearable.WearableImpl.ROLE_CLIENT;
 import static org.microg.gms.wearable.WearableImpl.ROLE_SERVER;
+import static org.microg.gms.wearable.WearableImpl.TYPE_NETWORK;
 import static org.microg.gms.wearable.WearableServiceImpl.DATA_SYNC_PROGRESS_PATH;
 
 import android.content.Context;
@@ -90,13 +91,15 @@ private static Connect buildConnect(Context ctx, WearableImpl wearable,
         Connect.Builder b = new Connect.Builder()
                 .name(Build.MODEL) // TODO: Should be hostname, but seems to be irrelevant
                 .id(wearable.getLocalNodeId())
-                .networkId(config.nodeId)
                 .peerAndroidId(androidId)
                 .unknown4(3)
-                .peerVersion(2)
+                .peerVersion(ConnectHandshake.PEER_VERSION)
                 .peerMinimumVersion(0)
                 .androidSdkVersion(Build.VERSION.SDK_INT);
 
+        if (config.type == TYPE_NETWORK && config.address != null)
+            b.networkId(config.address);
+
         if (config.migrating && config.role == ROLE_SERVER) {
             String prevPeerNodeId = wearable.getClockworkNodePreferences().getPeerNodeId();
             b.migrating(true);

play-services-wearable/core/src/main/java/org/microg/gms/wearable/TransportConnectionHandler.java

@@ -85,10 +85,11 @@ public void handle(WearableConnection connection) {
 
             config.peerNodeId = peerNodeId;
             config.connected = true;
-
-            if (config.nodeId == null || config.nodeId.isEmpty()) {
-                config.nodeId = wearable.getLocalNodeId();
-            }
+//
+//            if (config.nodeId == null || config.nodeId.isEmpty()) {
+//                config.nodeId = wearable.getLocalNodeId();
+//            }
+            config.nodeId = peerNodeId;
 
             try {
                 wearable.updateConfiguration(config);

play-services-wearable/core/src/main/java/org/microg/gms/wearable/WearableImpl.java

@@ -277,12 +277,12 @@ public DataTransport getDataTransport(String peerNodeId) {
     }
 
     public String getLocalNodeId() {
-        ConnectionConfiguration[] cfgs = getConfigurations();
-        if (cfgs != null) {
-            for (ConnectionConfiguration c : cfgs) {
-                if (c.nodeId != null && !c.nodeId.isEmpty()) return c.nodeId;
-            }
-        }
+//        ConnectionConfiguration[] cfgs = getConfigurations();
+//        if (cfgs != null) {
+//            for (ConnectionConfiguration c : cfgs) {
+//                if (c.nodeId != null && !c.nodeId.isEmpty()) return c.nodeId;
+//            }
+//        }
         return clockworkNodePreferences.getLocalNodeId();
     }