From 98e9694b358a036a75ebe9eeaa090043ea905d8a Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Thu, 11 Sep 2025 10:44:31 -0400 Subject: [PATCH] Support backup4 and backup5 capabilities for linked devices. --- .../securesms/linkdevice/LinkDeviceViewModel.kt | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceViewModel.kt index f2a43a5813..8cbe37c930 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceViewModel.kt @@ -22,7 +22,6 @@ import org.thoughtcrime.securesms.linkdevice.LinkDeviceSettingsState.OneTimeEven import org.thoughtcrime.securesms.linkdevice.LinkDeviceSettingsState.QrCodeState import org.thoughtcrime.securesms.logsubmit.SubmitDebugLogRepository import org.thoughtcrime.securesms.notifications.NotificationIds -import org.thoughtcrime.securesms.util.RemoteConfig import org.thoughtcrime.securesms.util.ServiceUtil import org.thoughtcrime.securesms.util.Util import org.whispersystems.signalservice.api.backup.MessageBackupKey @@ -424,15 +423,8 @@ class LinkDeviceViewModel : ViewModel() { } private fun Uri.supportsLinkAndSync(): Boolean { - return if (RemoteConfig.internalUser) { - this.getQueryParameter("capabilities")?.split(",")?.contains("backup") == true || - this.getQueryParameter("capabilities")?.split(",")?.contains("backup2") == true || - this.getQueryParameter("capabilities")?.split(",")?.contains("backup3") == true || - this.getQueryParameter("capabilities")?.split(",")?.contains("backup4") == true - } else { - this.getQueryParameter("capabilities")?.split(",")?.contains("backup3") == true || - this.getQueryParameter("capabilities")?.split(",")?.contains("backup4") == true - } + val capabilities = this.getQueryParameter("capabilities")?.split(",")?.toSet() ?: emptySet() + return "backup4" in capabilities || "backup5" in capabilities } fun onSyncErrorIgnored() = viewModelScope.launch(Dispatchers.IO) {