From b6c653ff770cd90e9577b8a60928c046bf13e963 Mon Sep 17 00:00:00 2001 From: Cody Henthorne Date: Tue, 8 Jun 2021 11:20:06 -0400 Subject: [PATCH] Remove Universal Expire Timer flag and fix bug with SMS. --- .../app/privacy/PrivacySettingsFragment.kt | 26 +++++++++---------- .../conversation/ConversationRepository.java | 1 + .../securesms/keyvalue/SettingsValues.java | 6 +---- .../securesms/util/FeatureFlags.java | 7 ----- 4 files changed, 14 insertions(+), 26 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsFragment.kt index 5ccf54ece..947d3fb42 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsFragment.kt @@ -138,24 +138,22 @@ class PrivacySettingsFragment : DSLSettingsFragment(R.string.preferences__privac } ) - if (FeatureFlags.defaultMessageTimer()) { - dividerPref() + dividerPref() - sectionHeaderPref(R.string.PrivacySettingsFragment__disappearing_messages) + sectionHeaderPref(R.string.PrivacySettingsFragment__disappearing_messages) - customPref( - ValueClickPreference( - value = DSLSettingsText.from(ExpirationUtil.getExpirationAbbreviatedDisplayValue(requireContext(), state.universalExpireTimer)), - clickPreference = ClickPreference( - title = DSLSettingsText.from(R.string.PrivacySettingsFragment__default_timer_for_new_changes), - summary = DSLSettingsText.from(R.string.PrivacySettingsFragment__set_a_default_disappearing_message_timer_for_all_new_chats_started_by_you), - onClick = { - NavHostFragment.findNavController(this@PrivacySettingsFragment).navigate(R.id.action_privacySettingsFragment_to_disappearingMessagesTimerSelectFragment) - } - ) + customPref( + ValueClickPreference( + value = DSLSettingsText.from(ExpirationUtil.getExpirationAbbreviatedDisplayValue(requireContext(), state.universalExpireTimer)), + clickPreference = ClickPreference( + title = DSLSettingsText.from(R.string.PrivacySettingsFragment__default_timer_for_new_changes), + summary = DSLSettingsText.from(R.string.PrivacySettingsFragment__set_a_default_disappearing_message_timer_for_all_new_chats_started_by_you), + onClick = { + NavHostFragment.findNavController(this@PrivacySettingsFragment).navigate(R.id.action_privacySettingsFragment_to_disappearingMessagesTimerSelectFragment) + } ) ) - } + ) dividerPref() diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationRepository.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationRepository.java index 672ed0eb6..18f33969a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationRepository.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationRepository.java @@ -102,6 +102,7 @@ class ConversationRepository { if (SignalStore.settings().getUniversalExpireTimer() != 0 && conversationRecipient.getExpireMessages() == 0 && !conversationRecipient.isGroup() && + conversationRecipient.isRegistered() && (threadId == -1 || !DatabaseFactory.getMmsSmsDatabase(context).hasMeaningfulMessage(threadId))) { showUniversalExpireTimerUpdate = true; diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SettingsValues.java b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SettingsValues.java index 76ab7d769..a7fea540c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SettingsValues.java +++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SettingsValues.java @@ -381,11 +381,7 @@ public final class SettingsValues extends SignalStoreValues { } public int getUniversalExpireTimer() { - if (FeatureFlags.defaultMessageTimer()) { - return getInteger(UNIVERSAL_EXPIRE_TIMER, 0); - } else { - return 0; - } + return getInteger(UNIVERSAL_EXPIRE_TIMER, 0); } private @Nullable Uri getUri(@NonNull String key) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java index e7250760d..4a15f52ac 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java @@ -80,7 +80,6 @@ public final class FeatureFlags { private static final String NOTIFICATION_REWRITE = "android.notificationRewrite"; private static final String MP4_GIF_SEND_SUPPORT = "android.mp4GifSendSupport"; private static final String MEDIA_QUALITY_LEVELS = "android.mediaQuality.levels"; - private static final String DEFAULT_MESSAGE_TIMER = "android.defaultMessageTimer.2"; private static final String RETRY_RECEIPT_LIFESPAN = "android.retryReceiptLifespan"; private static final String RETRY_RESPOND_MAX_AGE = "android.retryRespondMaxAge"; private static final String SENDER_KEY = "android.senderKey"; @@ -118,7 +117,6 @@ public final class FeatureFlags { NOTIFICATION_REWRITE, MP4_GIF_SEND_SUPPORT, MEDIA_QUALITY_LEVELS, - DEFAULT_MESSAGE_TIMER, RETRY_RECEIPT_LIFESPAN, RETRY_RESPOND_MAX_AGE, SENDER_KEY @@ -168,7 +166,6 @@ public final class FeatureFlags { NOTIFICATION_REWRITE, MP4_GIF_SEND_SUPPORT, MEDIA_QUALITY_LEVELS, - DEFAULT_MESSAGE_TIMER, RETRY_RECEIPT_LIFESPAN, RETRY_RESPOND_MAX_AGE ); @@ -370,10 +367,6 @@ public final class FeatureFlags { return getString(MEDIA_QUALITY_LEVELS, ""); } - public static boolean defaultMessageTimer() { - return getBoolean(DEFAULT_MESSAGE_TIMER, false); - } - /** How long to wait before considering a retry to be a failure. */ public static long retryReceiptLifespan() { return getLong(RETRY_RECEIPT_LIFESPAN, TimeUnit.HOURS.toMillis(1));