From d347cf535146a6fb6425e8c157f99a6f29a79479 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Thu, 23 Jan 2025 16:05:42 -0500 Subject: [PATCH] Allow internal users to accept both backup capabilities. --- .../backup/v2/exporters/ChatItemArchiveExporter.kt | 2 +- .../securesms/linkdevice/LinkDeviceViewModel.kt | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ChatItemArchiveExporter.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ChatItemArchiveExporter.kt index 472da33ea5..431ce20549 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ChatItemArchiveExporter.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ChatItemArchiveExporter.kt @@ -771,7 +771,7 @@ private fun LinkPreview.toRemoteLinkPreview(mediaArchiveEnabled: Boolean): org.t } private fun BackupMessageRecord.toRemoteViewOnceMessage(mediaArchiveEnabled: Boolean, reactionRecords: List?, attachments: List?): ViewOnceMessage { - val attachment: DatabaseAttachment? = attachments?.firstOrNull()?.takeUnless { !it.hasData && it.size == 0L && it.archiveMediaId == null && it.width == 0 && it.height == 0 && it.blurHash == null} + val attachment: DatabaseAttachment? = attachments?.firstOrNull()?.takeUnless { !it.hasData && it.size == 0L && it.archiveMediaId == null && it.width == 0 && it.height == 0 && it.blurHash == null } return ViewOnceMessage( attachment = attachment?.toRemoteMessageAttachment(mediaArchiveEnabled), 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 a99d63d8ff..535f056fa3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceViewModel.kt @@ -407,7 +407,14 @@ class LinkDeviceViewModel : ViewModel() { LinkedDeviceInactiveCheckJob.enqueue() } - private fun Uri.supportsLinkAndSync(): Boolean = this.getQueryParameter("capabilities")?.split(",")?.contains("backup") == true + private fun Uri.supportsLinkAndSync(): Boolean { + return if (RemoteConfig.internalUser) { + this.getQueryParameter("capabilities")?.split(",")?.contains("backup") == true || + this.getQueryParameter("capabilities")?.split(",")?.contains("backup2") == true + } else { + this.getQueryParameter("capabilities")?.split(",")?.contains("backup") == true + } + } fun onSyncErrorIgnored() = viewModelScope.launch(Dispatchers.IO) { val dialogState = _state.value.dialogState