From 7df015ceef96764c18edb841e73230541840ffbb Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Tue, 16 Jun 2026 13:43:35 -0400
Subject: [PATCH] Improve registered check for CheckServiceReachabilityJob.

---
 .../securesms/jobs/CheckServiceReachabilityJob.kt      | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/CheckServiceReachabilityJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/CheckServiceReachabilityJob.kt
index 43f81f7729..90ba789368 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/CheckServiceReachabilityJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/CheckServiceReachabilityJob.kt
@@ -7,6 +7,7 @@ import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.stories.Stories
+import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.whispersystems.signalservice.api.websocket.WebSocketConnectionState
 import org.whispersystems.signalservice.internal.util.StaticCredentialsProvider
 import org.whispersystems.signalservice.internal.websocket.OkHttpWebSocketConnection
@@ -34,8 +35,9 @@ class CheckServiceReachabilityJob private constructor(params: Parameters) : Base
     @JvmStatic
     fun enqueueIfNecessary() {
       val isCensored = AppDependencies.signalServiceNetworkAccess.isCensored()
+      val context = AppDependencies.application
       val timeSinceLastCheck = System.currentTimeMillis() - SignalStore.misc.lastCensorshipServiceReachabilityCheckTime
-      if (SignalStore.account.isRegistered && isCensored && timeSinceLastCheck > TimeUnit.DAYS.toMillis(1)) {
+      if (SignalStore.account.isRegistered && !TextSecurePreferences.isUnauthorizedReceived(context) && isCensored && timeSinceLastCheck > TimeUnit.DAYS.toMillis(1)) {
         AppDependencies.jobManager.add(CheckServiceReachabilityJob())
       }
     }
@@ -56,6 +58,12 @@ class CheckServiceReachabilityJob private constructor(params: Parameters) : Base
       return
     }
 
+    if (TextSecurePreferences.isUnauthorizedReceived(context)) {
+      Log.w(TAG, "Unauthorized received, skipping.")
+      SignalStore.misc.lastCensorshipServiceReachabilityCheckTime = System.currentTimeMillis()
+      return
+    }
+
     if (!AppDependencies.signalServiceNetworkAccess.isCensored()) {
       Log.w(TAG, "Not currently censored, skipping.")
       SignalStore.misc.lastCensorshipServiceReachabilityCheckTime = System.currentTimeMillis()