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 bddda61853..ecc9212fe4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceViewModel.kt @@ -181,7 +181,7 @@ class LinkDeviceViewModel : ViewModel() { if (LinkDeviceRepository.isValidQr(uri)) { _state.update { it.copy( - qrCodeState = if (uri.supportsLinkAndSync() && RemoteConfig.linkAndSync) QrCodeState.VALID_WITH_SYNC else QrCodeState.VALID_WITHOUT_SYNC, + qrCodeState = if (uri.supportsLinkAndSync()) QrCodeState.VALID_WITH_SYNC else QrCodeState.VALID_WITHOUT_SYNC, linkUri = uri, showFrontCamera = null ) @@ -225,7 +225,7 @@ class LinkDeviceViewModel : ViewModel() { Log.i(TAG, "Adding device with sync.") addDeviceWithSync(linkUri) } else { - Log.i(TAG, "Adding device without sync. (uri: ${linkUri.supportsLinkAndSync()}, remoteConfig: ${RemoteConfig.linkAndSync})") + Log.i(TAG, "Adding device without sync. (uri: ${linkUri.supportsLinkAndSync()})") addDeviceWithoutSync(linkUri) } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/RemoteConfig.kt b/app/src/main/java/org/thoughtcrime/securesms/util/RemoteConfig.kt index 97236a85b9..3953d10d29 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/RemoteConfig.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/util/RemoteConfig.kt @@ -1119,14 +1119,6 @@ object RemoteConfig { hotSwappable = false ) - /** Whether or not this device supports syncing data to newly-linked device. */ - @JvmStatic - val linkAndSync: Boolean by remoteBoolean( - key = "android.linkAndSync.3", - defaultValue = false, - hotSwappable = true - ) - /** Whether or not this device respect attachment backfill requests. */ val attachmentBackfillSync: Boolean by remoteBoolean( key = "android.attachmentBackfillSync",