From 39fe5b1eb50df75b4aa44f77424bf973bacd49b4 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Thu, 18 Dec 2025 16:51:48 -0500 Subject: [PATCH] Unconditionally disable auto updates. --- .../securesms/apkupdate/ApkUpdateInstaller.kt | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdateInstaller.kt b/app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdateInstaller.kt index 2245ce3681..3236291cd6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdateInstaller.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdateInstaller.kt @@ -10,17 +10,14 @@ import android.content.Context import android.content.Intent import android.content.pm.PackageInstaller import android.os.Build -import org.greenrobot.eventbus.EventBus import org.signal.core.util.PendingIntentFlags import org.signal.core.util.StreamUtil import org.signal.core.util.getDownloadManager import org.signal.core.util.logging.Log import org.thoughtcrime.securesms.dependencies.AppDependencies -import org.thoughtcrime.securesms.events.WebRtcViewModel import org.thoughtcrime.securesms.jobs.ApkUpdateJob import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.util.AppForegroundObserver -import org.thoughtcrime.securesms.util.Environment import org.thoughtcrime.securesms.util.FileUtils import java.io.FileInputStream import java.io.IOException @@ -150,10 +147,12 @@ object ApkUpdateInstaller { } private fun shouldAutoUpdate(): Boolean { - val webRtcViewModel = EventBus.getDefault().getStickyEvent(WebRtcViewModel::class.java) - val isCallActive = webRtcViewModel != null && webRtcViewModel.state != WebRtcViewModel.State.IDLE + // Once we have designs for allowing users to opt-out of auto-updates, we can re-enable this + return false - // TODO Auto-updates temporarily restricted to nightlies. Once we have designs for allowing users to opt-out of auto-updates, we can re-enable this - return Environment.IS_NIGHTLY && Build.VERSION.SDK_INT >= 31 && SignalStore.apkUpdate.autoUpdate && !AppForegroundObserver.isForegrounded() && !isCallActive +// val webRtcViewModel = EventBus.getDefault().getStickyEvent(WebRtcViewModel::class.java) +// val isCallActive = webRtcViewModel != null && webRtcViewModel.state != WebRtcViewModel.State.IDLE +// +// return Build.VERSION.SDK_INT >= 31 && SignalStore.apkUpdate.autoUpdate && !AppForegroundObserver.isForegrounded() && !isCallActive } }