Add checks to prevent re-initialization of the connectivitywatcher an…

…d unregistering before registering the same watcher to prevent too manyrequests to networkcallback registeration (awslabs#387)
notabasement · Nov 19, 2022 · 9f7b339 · 9f7b339
1 parent b36ea49
commit 9f7b339
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/...c/src/main/java/com/amazonaws/mobileconnectors/appsync/AppSyncOfflineMutationManager.java b/...c/src/main/java/com/amazonaws/mobileconnectors/appsync/AppSyncOfflineMutationManager.java
@@ -81,8 +81,12 @@ public AppSyncOfflineMutationManager(Context context,
 
         //Setup Network Monitoring objects
         this.networkUpdateHandler = new NetworkUpdateHandler(handlerThread.getLooper());
-        this.connectivityWatcher = new ConnectivityWatcher(context,
-                new NetworkInfoReceiver(this.networkUpdateHandler));
+        if (this.connectivityWatcher == null) {
+            this.connectivityWatcher = new ConnectivityWatcher(context,
+                    new NetworkInfoReceiver(this.networkUpdateHandler));
+        } else {
+            this.connectivityWatcher.unregister();
+        }
         this.connectivityWatcher.register();
 
         //Setup ancillary stuff

diff --git a/...sync/src/main/java/com/amazonaws/mobileconnectors/appsync/WebSocketConnectionManager.java b/...sync/src/main/java/com/amazonaws/mobileconnectors/appsync/WebSocketConnectionManager.java
@@ -254,7 +254,11 @@ public void onConnectivityChanged(boolean isNetworkConnected) {
                         if (isNetworkConnected) reportNetworkUp();
                     }
                 };
-                connectivityWatcher = new ConnectivityWatcher(applicationContext, callback);
+                if (connectivityWatcher == null) {
+                    connectivityWatcher = new ConnectivityWatcher(applicationContext, callback);
+                } else {
+                    connectivityWatcher.unregister();
+                }
                 connectivityWatcher.register();
             }