Do not register to distrib from UnifiedPushReceiver

To avoid a loop if a distributor changes the endpoint for every new registration request
mollyim · Dec 9, 2024 · 891d030 · 891d030
1 parent 6e9e089
commit 891d030
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/app/src/main/java/im/molly/unifiedpush/receiver/UnifiedPushReceiver.kt b/app/src/main/java/im/molly/unifiedpush/receiver/UnifiedPushReceiver.kt
@@ -90,7 +90,7 @@ class UnifiedPushReceiver : MessagingReceiver() {
       message.contains("\"test\":true") -> {
         Log.d(TAG, "Test message received.")
         UnifiedPushNotificationBuilder(context).setNotificationTest()
-        AppDependencies.jobManager.add(UnifiedPushRefreshJob())
+        AppDependencies.jobManager.add(UnifiedPushRefreshJob(testPing = false, registerDistrib = false))
       }
 
       else -> {
@@ -117,7 +117,7 @@ class UnifiedPushReceiver : MessagingReceiver() {
     val stored = SignalStore.unifiedpush.endpoint
     return if (endpoint != stored) {
       SignalStore.unifiedpush.endpoint = endpoint
-      AppDependencies.jobManager.add(UnifiedPushRefreshJob())
+      AppDependencies.jobManager.add(UnifiedPushRefreshJob(testPing = false, registerDistrib = false))
       true
     } else false
   }

diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/UnifiedPushRefreshJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/UnifiedPushRefreshJob.kt
@@ -26,13 +26,17 @@ import java.util.concurrent.TimeUnit
  */
 class UnifiedPushRefreshJob private constructor(
   private val testPing: Boolean,
+  private val registerDistrib: Boolean,
   parameters: Parameters,
 ) : BaseJob(parameters) {
 
   constructor() : this(testPing = false)
 
-  constructor(testPing: Boolean) : this(
+  constructor(testPing: Boolean) : this(testPing = testPing, registerDistrib = true)
+
+  constructor(testPing: Boolean, registerDistrib: Boolean) : this(
     testPing = testPing,
+    registerDistrib = registerDistrib,
     parameters = Parameters.Builder()
       .setQueue(FcmRefreshJob.QUEUE_KEY)
       .addConstraint(NetworkConstraint.KEY)
@@ -107,7 +111,9 @@ class UnifiedPushRefreshJob private constructor(
       }
     }
 
-    UnifiedPushDistributor.registerApp(vapid)
+    if (registerDistrib) {
+      UnifiedPushDistributor.registerApp(vapid)
+    }
 
     if (!UnifiedPushDistributor.checkIfActive() || endpoint == null) {
       Log.e(TAG, "Distributor is not active or endpoint is missing.")
@@ -163,6 +169,7 @@ class UnifiedPushRefreshJob private constructor(
   override fun serialize(): ByteArray? {
     return JsonJobData.Builder()
       .putBoolean(KEY_PING, testPing)
+      .putBoolean(KEY_REGISTER, registerDistrib)
       .serialize()
   }
 
@@ -173,6 +180,7 @@ class UnifiedPushRefreshJob private constructor(
       val data = JsonJobData.deserialize(serializedData)
       return UnifiedPushRefreshJob(
         testPing = data.getBoolean(KEY_PING),
+        registerDistrib = data.getBoolean(KEY_REGISTER),
         parameters = parameters,
       )
     }
@@ -183,5 +191,6 @@ class UnifiedPushRefreshJob private constructor(
 
     const val KEY = "UnifiedPushRefreshJob"
     private const val KEY_PING = "ping"
+    private const val KEY_REGISTER = "register"
   }
 }