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 3236291cd6..b4b5c0dc05 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdateInstaller.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdateInstaller.kt @@ -91,6 +91,8 @@ object ApkUpdateInstaller { val packageInstaller: PackageInstaller = context.packageManager.packageInstaller val sessionParams = PackageInstaller.SessionParams(PackageInstaller.SessionParams.MODE_FULL_INSTALL).apply { + setAppPackageName(context.packageName) + // At this point, we always want to set this if possible, since we've already prompted the user with our own notification when necessary. // This lets us skip the system-generated notification. if (Build.VERSION.SDK_INT >= 31) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/ApkUpdateJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/ApkUpdateJob.kt index 9f1944929d..e0bae02029 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/ApkUpdateJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/ApkUpdateJob.kt @@ -6,7 +6,6 @@ import android.content.Intent import android.content.pm.PackageManager import android.net.Uri import com.fasterxml.jackson.annotation.JsonProperty -import okhttp3.OkHttpClient import okhttp3.Request import org.signal.core.util.Hex import org.signal.core.util.forEach @@ -17,6 +16,7 @@ import org.signal.core.util.requireLong import org.signal.core.util.requireString import org.thoughtcrime.securesms.BuildConfig import org.thoughtcrime.securesms.apkupdate.ApkUpdateDownloadManagerReceiver +import org.thoughtcrime.securesms.dependencies.AppDependencies import org.thoughtcrime.securesms.jobmanager.Job import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint import org.thoughtcrime.securesms.keyvalue.SignalStore @@ -63,7 +63,7 @@ class ApkUpdateJob private constructor(parameters: Parameters) : BaseJob(paramet Log.d(TAG, "Checking for APK update at ${BuildConfig.APK_UPDATE_MANIFEST_URL}") - val client = OkHttpClient() + val client = AppDependencies.signalOkHttpClient val request = Request.Builder().url(BuildConfig.APK_UPDATE_MANIFEST_URL).build() val rawUpdateDescriptor: String = client.newCall(request).execute().use { response ->