diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/ChatsSettingsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/ChatsSettingsViewModel.kt index 602093cac9..f6ad07c928 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/ChatsSettingsViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/ChatsSettingsViewModel.kt @@ -14,7 +14,7 @@ import org.thoughtcrime.securesms.jobs.LocalBackupJob import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.util.BackupUtil import org.thoughtcrime.securesms.util.ConversationUtil -import org.thoughtcrime.securesms.util.Environment +import org.thoughtcrime.securesms.util.RemoteConfig import org.thoughtcrime.securesms.util.TextSecurePreferences import org.thoughtcrime.securesms.util.ThrottledDebouncer @@ -35,7 +35,7 @@ class ChatsSettingsViewModel @JvmOverloads constructor( folderCount = 0, userUnregistered = TextSecurePreferences.isUnauthorizedReceived(AppDependencies.application) || !SignalStore.account.isRegistered, clientDeprecated = SignalStore.misc.isClientDeprecated, - isPlaintextExportEnabled = Environment.Backups.isLocalPlaintextBackupExportEnabled(), + isPlaintextExportEnabled = RemoteConfig.localPlaintextExport, chatExportState = ChatExportState.None ) ) diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/Environment.kt b/app/src/main/java/org/thoughtcrime/securesms/util/Environment.kt index 6bb3411943..3f0912f4d2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/Environment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/util/Environment.kt @@ -27,10 +27,6 @@ object Environment { @JvmStatic fun isNewFormatSupportedForLocalBackup(): Boolean = true - - fun isLocalPlaintextBackupExportEnabled(): Boolean { - return isInternal() - } } object Donations { 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 6e76fac078..5457178474 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/RemoteConfig.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/util/RemoteConfig.kt @@ -1348,5 +1348,16 @@ object RemoteConfig { hotSwappable = false ) + /** + * Whether local plaintext export is available + */ + @JvmStatic + @get:JvmName("localPlaintextExport") + val localPlaintextExport: Boolean by remoteBoolean( + key = "android.localPlaintextExport", + defaultValue = false, + hotSwappable = false + ) + // endregion }