update & bug fixes

Author: deadYokai

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

@@ -63,7 +63,7 @@ public long getNextSeqId() {
                 preferences.edit()
                         .putLong(CLOCKWORK_NODE_PREFERENCE_NEXT_SEQ_ID_BLOCK, seqIdBlock + 1000)
                         .commit();
-                seqIdBlock = 0;
+                seqIdInBlock = 0;
             }
 
             if (seqIdInBlock >= 1000) {

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

@@ -34,7 +34,7 @@ public class DataTransport {
 
     private volatile SyncStart pendingSyncStart = null;
     private volatile Runnable syncFallback = null;
-
+    private volatile long syncDeadline = 0L;
     private volatile boolean isV1Peer = false;
 
     public DataTransport(String localNodeId, String peerNodeId, WearableImpl wearable) {
@@ -122,18 +122,11 @@ public void sendSyncStart() {
                 + " receivedSeqId=" + receivedSeqId + " entries=" + table.size());
     }
 
-    private static final long SYNC_FALLBACK_MS = 10_000;
+    private static final long SYNC_FALLBACK_MS = 1500;
+    private static final long SYNC_MAX_DEFER_MS = 4_000;
     public void respondToSyncStart(SyncStart syncStart) {
-//        ConnectionConfiguration cfg = wearable.getConfigurationByPeerNodeId(peerNodeId);
-//        if (cfg != null && !cfg.dataItemSyncEnabled) {
-//            Log.d(TAG, "respondToSyncStart: dataItemSyncEnabled=false, deferring sync for " + peerNodeId);
-//            pendingSyncStart = syncStart;
-//            return;
-//        }
-//
-//        doRespondToSyncStart(syncStart);
-
         pendingSyncStart = syncStart;
+        syncDeadline = android.os.SystemClock.uptimeMillis() + SYNC_MAX_DEFER_MS;
 
         scheduleFallback();
         Log.d(TAG, "respondToSyncStart: deferred sync for " + peerNodeId
@@ -145,7 +138,8 @@ private void scheduleFallback() {
             if (pendingSyncStart == null) return;
             ChannelManager cm = wearable.getChannelManager();
             boolean channelActive = cm != null && cm.hasActiveChannelForNode(peerNodeId);
-            if (channelActive) {
+            boolean deadlinePassed = android.os.SystemClock.uptimeMillis() >= syncDeadline;
+            if (channelActive && !deadlinePassed) {
                 Log.d(TAG, "syncFallback: channel still active for " + peerNodeId
                         + ", rescheduling");
                 scheduleFallback();
@@ -221,12 +215,23 @@ private void runSync(Map<String, Long> remotePeerSeqIds) {
         Log.d(TAG, "runSync start: peer=" + peerNodeId);
         try {
             Map<String, Long> localSeqIds = wearable.getNodeDatabase().getAllCurrentSeqIds();
+            int synced = 0;
+            int skipped = 0;
             for (Map.Entry<String, Long> local : localSeqIds.entrySet()) {
                 if (Thread.currentThread().isInterrupted()) {
                     Log.d(TAG, "runSync interrupted for peer=" + peerNodeId);
                     return;
                 }
 
+                String src = local.getKey();
+                long peer = remotePeerSeqIds.containsKey(src) ? remotePeerSeqIds.get(src) : -1;
+                long localMax = local.getValue() != null ? local.getValue() : -1;
+
+                if (localMax <= peer) {
+                    skipped++;
+                    continue;
+                }
+
                 if (hasActiveChannelForPeer()) {
                     try {
                         Thread.sleep(20);
@@ -236,10 +241,8 @@ private void runSync(Map<String, Long> remotePeerSeqIds) {
                     }
                 }
 
-                String src = local.getKey();
-                long peer = remotePeerSeqIds.containsKey(src) ? remotePeerSeqIds.get(src) : -1l;
-
                 wearable.syncToPeer(peerNodeId, src, peer);
+                synced++;
             }
         } catch (Exception e) {
             Log.w(TAG, "runSync exception for peer=" + peerNodeId, e);

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

@@ -101,6 +101,7 @@ public class WearableImpl {
     private static final long ASSET_FETCH_COOLDOWN_MS = 500;
     private static final int ASSET_BATCH_SIZE = 10;
     private static final long NODE_DISCONNECT_DEBOUNCE_MS = 2500;
+    private static final long ASSET_FETCH_INITIAL_DELAY_MS = 1500;
     private final Context context;
     private final NodeDatabaseHelper nodeDatabase;
     private final ConfigurationDatabaseHelper configDatabase;
@@ -779,33 +780,38 @@ public void onConnectReceived(WearableConnection connection, String nodeId, Conn
         }
 
         if (btAddress != null) {
-            Iterator<Map.Entry<String, WearableConnection>> connIter = activeConnections.entrySet().iterator();
+            Set<String> staleNodeIds = new HashSet<>();
 
-            while (connIter.hasNext()) {
-                Map.Entry<String, WearableConnection> e = connIter.next();
-
-                if (e.getKey().equals(connect.id))
+            for (String existingId : activeConnections.keySet()) {
+                if (existingId.equals(connect.id))
                     continue;
 
                 for (ConnectionConfiguration c : getConfigurations()) {
-                    if (e.getKey().equals(c.peerNodeId) && btAddress.equals(c.address)) {
-                        connIter.remove();
+                    if (existingId.equals(c.peerNodeId) && btAddress.equals(c.address)) {
+                        staleNodeIds.add(existingId);
                         break;
                     }
                 }
             }
 
             for (Node n : connectedNodes) {
-                if (n.getId().equals(connect.id))
+                String existsingId = n.getId();
+                if (existsingId.equals(connect.id))
                     continue;
 
                 for (ConnectionConfiguration c : getConfigurations()) {
-                    if (n.getId().equals(c.peerNodeId) && btAddress.equals(c.address)) {
-                        connIter.remove();
+                    if (existsingId.equals(c.peerNodeId) && btAddress.equals(c.address)) {
+                        staleNodeIds.add(existsingId);
                         break;
                     }
                 }
             }
+
+            for (String staleId : staleNodeIds) {
+                Log.i(TAG, "onConnectReceived: evicting stale connection" + staleId
+                        + " for address " + btAddress + " superseded by " + connect.id);
+                closeConnection(staleId);
+            }
         }
 
         activeConnections.put(connect.id, connection);
@@ -823,7 +829,7 @@ public void onConnectReceived(WearableConnection connection, String nodeId, Conn
                 } else {
                     Log.d(TAG, "Connection closed before asset fetch could start");
                 }
-            }, 5000);
+            }, ASSET_FETCH_INITIAL_DELAY_MS);
         } else {
             Log.w(TAG, "networkHandler is dead, skipping asset fetch scheduling for " + connect.id);
         }