From f810d731ddae5ced6888411898288dbecceaabff Mon Sep 17 00:00:00 2001 From: Michelle Tang Date: Fri, 5 Jun 2026 14:32:07 -0400 Subject: [PATCH] Turn off KT. --- .../AdvancedPrivacySettingsFragment.kt | 45 ++++++++++--------- .../securesms/jobs/CheckKeyTransparencyJob.kt | 5 ++- .../verify/VerifyDisplayScreenState.kt | 5 ++- 3 files changed, 31 insertions(+), 24 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/advanced/AdvancedPrivacySettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/advanced/AdvancedPrivacySettingsFragment.kt index 283c243dbf..45b938ba71 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/advanced/AdvancedPrivacySettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/advanced/AdvancedPrivacySettingsFragment.kt @@ -45,6 +45,7 @@ import org.signal.core.ui.compose.Texts import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.compose.rememberStatusBarColorNestedScrollModifier import org.thoughtcrime.securesms.util.CommunicationActions +import org.thoughtcrime.securesms.util.RemoteConfig import org.thoughtcrime.securesms.util.viewModel /** @@ -298,29 +299,31 @@ private fun AdvancedPrivacySettingsScreen( ) } - item { - Dividers.Default() - } - - item { - val label = buildAnnotatedString { - append(stringResource(R.string.preferences_automatic_key_verification_body)) - append(" ") - withLink( - LinkAnnotation.Clickable("learn-more", linkInteractionListener = { - callbacks.onAutomaticVerificationLearnMoreClick() - }) - ) { - append(stringResource(R.string.LearnMoreTextView_learn_more)) - } + if (RemoteConfig.internalUser) { + item { + Dividers.Default() } - Rows.ToggleRow( - checked = state.allowAutomaticKeyVerification, - text = AnnotatedString(stringResource(R.string.preferences_automatic_key_verification)), - label = label, - onCheckChanged = callbacks::onAllowAutomaticVerificationChanged - ) + item { + val label = buildAnnotatedString { + append(stringResource(R.string.preferences_automatic_key_verification_body)) + append(" ") + withLink( + LinkAnnotation.Clickable("learn-more", linkInteractionListener = { + callbacks.onAutomaticVerificationLearnMoreClick() + }) + ) { + append(stringResource(R.string.LearnMoreTextView_learn_more)) + } + } + + Rows.ToggleRow( + checked = state.allowAutomaticKeyVerification, + text = AnnotatedString(stringResource(R.string.preferences_automatic_key_verification)), + label = label, + onCheckChanged = callbacks::onAllowAutomaticVerificationChanged + ) + } } } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/CheckKeyTransparencyJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/CheckKeyTransparencyJob.kt index 513f3902fa..4820b1060a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/CheckKeyTransparencyJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/CheckKeyTransparencyJob.kt @@ -82,7 +82,10 @@ class CheckKeyTransparencyJob private constructor( } private fun canRunJob(): Boolean { - return if (!SignalStore.account.isRegistered) { + return if (!RemoteConfig.internalUser) { + Log.i(TAG, "Remote config is not on. Exiting.") + false + } else if (!SignalStore.account.isRegistered) { Log.i(TAG, "Account not registered. Exiting.") false } else if (TextSecurePreferences.isUnauthorizedReceived(AppDependencies.application)) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/verify/VerifyDisplayScreenState.kt b/app/src/main/java/org/thoughtcrime/securesms/verify/VerifyDisplayScreenState.kt index cce024ba3c..1b709a7855 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/verify/VerifyDisplayScreenState.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/verify/VerifyDisplayScreenState.kt @@ -7,11 +7,12 @@ package org.thoughtcrime.securesms.verify import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.recipients.Recipient +import org.thoughtcrime.securesms.util.RemoteConfig data class VerifyDisplayScreenState( val isSafetyNumberVerified: Boolean, - val isAutomaticVerificationVisible: Boolean = SignalStore.settings.automaticVerificationEnabled, - val shouldDisplayVerifyAutomaticallyEducationSheet: Boolean = SignalStore.settings.automaticVerificationEnabled && !SignalStore.uiHints.hasSeenVerifyAutomaticallySheet(), + val isAutomaticVerificationVisible: Boolean = RemoteConfig.internalUser && SignalStore.settings.automaticVerificationEnabled, + val shouldDisplayVerifyAutomaticallyEducationSheet: Boolean = RemoteConfig.internalUser && SignalStore.settings.automaticVerificationEnabled && !SignalStore.uiHints.hasSeenVerifyAutomaticallySheet(), val recipient: Recipient? = null, val fingerprintHolder: FingerprintHolder = FingerprintHolder.Uninitialised, val automaticVerificationStatus: AutomaticVerificationStatus = AutomaticVerificationStatus.NONE,