Change isSubscribed() behaviour to return target state instead of cur…

…rent
ppgco · Jun 11, 2024 · 8a28bf6 · 8a28bf6
1 parent 79ad813
commit 8a28bf6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/library/src/main/java/com/pushpushgo/sdk/NotificationStatusChecker.kt b/library/src/main/java/com/pushpushgo/sdk/NotificationStatusChecker.kt
@@ -61,7 +61,7 @@ internal class NotificationStatusChecker private constructor(
             if (pref.subscriberId.isNotBlank()) {
                 checkerScope.launch(errorHandler) {
                     logDebug("Notifications disabled, but subscribed. Unregistering subscriber...")
-                    PushPushGo.getInstance().getNetwork().unregisterSubscriber(pref.isSubscribed)
+                    PushPushGo.getInstance().getNetwork().unregisterSubscriber()
                 }
             }
         }

diff --git a/library/src/main/java/com/pushpushgo/sdk/PushPushGo.kt b/library/src/main/java/com/pushpushgo/sdk/PushPushGo.kt
@@ -283,6 +283,7 @@ class PushPushGo private constructor(
             return logError("Notifications disabled! Subscriber registration canceled")
         }
 
+        networkModule.sharedPref.isSubscribed = true
         getUploadManager().sendRegister(null)
     }
 
@@ -298,6 +299,7 @@ class PushPushGo private constructor(
             }
 
             getNetwork().registerToken(null)
+            networkModule.sharedPref.isSubscribed = true
             getSubscriberId()
         }
     }
@@ -307,6 +309,7 @@ class PushPushGo private constructor(
      */
     fun unregisterSubscriber() {
         getUploadManager().sendUnregister()
+        networkModule.sharedPref.isSubscribed = false
     }
 
     fun unregisterSubscriber(projectId: String, projectToken: String, subscriberId: String): ListenableFuture<Unit> {
@@ -316,6 +319,7 @@ class PushPushGo private constructor(
                 token = projectToken,
                 subscriberId = subscriberId,
             )
+            networkModule.sharedPref.isSubscribed = false
         }
     }
 

diff --git a/library/src/main/java/com/pushpushgo/sdk/network/ApiRepository.kt b/library/src/main/java/com/pushpushgo/sdk/network/ApiRepository.kt
@@ -37,21 +37,19 @@ internal class ApiRepository(
         )
         if (data.id.isNotBlank()) {
             sharedPref.subscriberId = data.id
-            sharedPref.isSubscribed = true
         }
         logDebug("RegisterSubscriber received: $data")
     }
 
-    suspend fun unregisterSubscriber(isSubscribed: Boolean = false) {
-        logDebug("unregisterSubscriber($isSubscribed) invoked")
+    suspend fun unregisterSubscriber() {
+        logDebug("unregisterSubscriber() invoked")
 
         apiService.unregisterSubscriber(
             token = apiKey,
             projectId = projectId,
             subscriberId = sharedPref.subscriberId,
         )
         sharedPref.subscriberId = ""
-        sharedPref.isSubscribed = isSubscribed
     }
 
     suspend fun unregisterSubscriber(projectId: String, token: String, subscriberId: String) {

diff --git a/library/src/main/java/com/pushpushgo/sdk/work/UploadDelegate.kt b/library/src/main/java/com/pushpushgo/sdk/work/UploadDelegate.kt
@@ -21,7 +21,7 @@ internal class UploadDelegate {
         with(PushPushGo.getInstance().getNetwork()) {
             when (type) {
                 UploadWorker.REGISTER -> registerToken(data)
-                UploadWorker.UNREGISTER -> unregisterSubscriber(isSubscribed = false)
+                UploadWorker.UNREGISTER -> unregisterSubscriber()
                 else -> logDebug("Unknown upload data type")
             }
         }