empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Launch "Keep Muted Chats Archived".

Browse source
This commit is contained in:
Nicholas 2023-01-03 09:05:57 -05:00 • committed by GitHub
parent 7959343661
commit 5cb3e1cd02
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/ChatsSettingsFragment.kt
View file

@ -15,7 +15,6 @@ import org.thoughtcrime.securesms.components.settings.configure
import org.thoughtcrime.securesms.exporter.flow.SmsExportActivity import org.thoughtcrime.securesms.exporter.flow.SmsExportActivity
import org.thoughtcrime.securesms.exporter.flow.SmsExportDialogs import org.thoughtcrime.securesms.exporter.flow.SmsExportDialogs
import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.keyvalue.SignalStore
import org.thoughtcrime.securesms.util.FeatureFlags
import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
import org.thoughtcrime.securesms.util.navigation.safeNavigate import org.thoughtcrime.securesms.util.navigation.safeNavigate
@ -114,16 +113,14 @@ class ChatsSettingsFragment : DSLSettingsFragment(R.string.preferences_chats__ch
} }
) )
if (FeatureFlags.keepMutedChatsArchived() || FeatureFlags.internalUser()) { switchPref(
switchPref( title = DSLSettingsText.from(R.string.preferences__pref_keep_muted_chats_archived),
title = DSLSettingsText.from(R.string.preferences__pref_keep_muted_chats_archived), summary = DSLSettingsText.from(R.string.preferences__muted_chats_that_are_archived_will_remain_archived),
summary = DSLSettingsText.from(R.string.preferences__muted_chats_that_are_archived_will_remain_archived), isChecked = state.keepMutedChatsArchived,
isChecked = state.keepMutedChatsArchived, onClick = {
onClick = { viewModel.setKeepMutedChatsArchived(!state.keepMutedChatsArchived)
viewModel.setKeepMutedChatsArchived(!state.keepMutedChatsArchived) }
} )
)
}
dividerPref() dividerPref()

11
app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
View file

@ -99,7 +99,6 @@ public final class FeatureFlags {
private static final String HIDE_CONTACTS = "android.hide.contacts"; private static final String HIDE_CONTACTS = "android.hide.contacts";
public static final String CREDIT_CARD_PAYMENTS = "android.credit.card.payments.3"; public static final String CREDIT_CARD_PAYMENTS = "android.credit.card.payments.3";
private static final String PAYMENTS_REQUEST_ACTIVATE_FLOW = "android.payments.requestActivateFlow"; private static final String PAYMENTS_REQUEST_ACTIVATE_FLOW = "android.payments.requestActivateFlow";
private static final String KEEP_MUTED_CHATS_ARCHIVED = "android.keepMutedChatsArchived";
public static final String GOOGLE_PAY_DISABLED_REGIONS = "global.donations.gpayDisabledRegions"; public static final String GOOGLE_PAY_DISABLED_REGIONS = "global.donations.gpayDisabledRegions";
public static final String CREDIT_CARD_DISABLED_REGIONS = "global.donations.ccDisabledRegions"; public static final String CREDIT_CARD_DISABLED_REGIONS = "global.donations.ccDisabledRegions";
public static final String PAYPAL_DISABLED_REGIONS = "global.donations.paypalDisabledRegions"; public static final String PAYPAL_DISABLED_REGIONS = "global.donations.paypalDisabledRegions";
@ -158,11 +157,9 @@ public final class FeatureFlags {
HIDE_CONTACTS, HIDE_CONTACTS,
CREDIT_CARD_PAYMENTS, CREDIT_CARD_PAYMENTS,
PAYMENTS_REQUEST_ACTIVATE_FLOW, PAYMENTS_REQUEST_ACTIVATE_FLOW,
KEEP_MUTED_CHATS_ARCHIVED,
GOOGLE_PAY_DISABLED_REGIONS, GOOGLE_PAY_DISABLED_REGIONS,
CREDIT_CARD_DISABLED_REGIONS, CREDIT_CARD_DISABLED_REGIONS,
PAYPAL_DISABLED_REGIONS, PAYPAL_DISABLED_REGIONS,
KEEP_MUTED_CHATS_ARCHIVED,
CDS_HARD_LIMIT, CDS_HARD_LIMIT,
CHAT_FILTERS, CHAT_FILTERS,
PAYPAL_ONE_TIME_DONATIONS, PAYPAL_ONE_TIME_DONATIONS,
@ -228,7 +225,6 @@ public final class FeatureFlags {
RECIPIENT_MERGE_V2, RECIPIENT_MERGE_V2,
CREDIT_CARD_PAYMENTS, CREDIT_CARD_PAYMENTS,
PAYMENTS_REQUEST_ACTIVATE_FLOW, PAYMENTS_REQUEST_ACTIVATE_FLOW,
KEEP_MUTED_CHATS_ARCHIVED,
CDS_HARD_LIMIT CDS_HARD_LIMIT
); );
@ -541,13 +537,6 @@ public final class FeatureFlags {
return getBoolean(PAYMENTS_REQUEST_ACTIVATE_FLOW, false); return getBoolean(PAYMENTS_REQUEST_ACTIVATE_FLOW, false);
} }
/**
* Whether users can enable keeping conversations with incoming messages archived if the conversation is muted.
*/
public static boolean keepMutedChatsArchived() {
return getBoolean(KEEP_MUTED_CHATS_ARCHIVED, false);
}
/** /**
* @return Serialized list of regions in which Google Pay is disabled for donations * @return Serialized list of regions in which Google Pay is disabled for donations
*/ */