mirror of
https://github.com/signalapp/Signal-Android.git
synced 2026-06-29 10:35:52 +01:00
Improve registered check for CheckServiceReachabilityJob.
This commit is contained in:
@@ -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()
|
||||
|
||||
Reference in New Issue
Block a user