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

Inline the announcement groups flag.

Browse source
This commit is contained in:
Greyson Parrelli 2021-08-24 15:22:34 -04:00 • committed by Alex Hart
parent 3c4e3cf048
commit 8748056130
2 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/permissions/PermissionsSettingsViewModel.kt
View file

@ -7,7 +7,6 @@ import org.thoughtcrime.securesms.groups.GroupAccessControl
import org.thoughtcrime.securesms.groups.GroupId import org.thoughtcrime.securesms.groups.GroupId
import org.thoughtcrime.securesms.groups.LiveGroup import org.thoughtcrime.securesms.groups.LiveGroup
import org.thoughtcrime.securesms.recipients.Recipient import org.thoughtcrime.securesms.recipients.Recipient
import org.thoughtcrime.securesms.util.FeatureFlags
import org.thoughtcrime.securesms.util.SingleLiveEvent import org.thoughtcrime.securesms.util.SingleLiveEvent
import org.thoughtcrime.securesms.util.livedata.Store import org.thoughtcrime.securesms.util.livedata.Store
@ -45,7 +44,7 @@ class PermissionsSettingsViewModel(
store.update(liveGroup.groupRecipient) { groupRecipient, state -> store.update(liveGroup.groupRecipient) { groupRecipient, state ->
val allHaveCapability = groupRecipient.participants.map { it.announcementGroupCapability }.all { it == Recipient.Capability.SUPPORTED } val allHaveCapability = groupRecipient.participants.map { it.announcementGroupCapability }.all { it == Recipient.Capability.SUPPORTED }
state.copy(announcementGroupPermissionEnabled = (FeatureFlags.announcementGroups() && allHaveCapability) || state.announcementGroup) state.copy(announcementGroupPermissionEnabled = allHaveCapability || state.announcementGroup)
} }
} }

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

@ -81,7 +81,6 @@ public final class FeatureFlags {
private static final String SENDER_KEY = "android.senderKey.4"; private static final String SENDER_KEY = "android.senderKey.4";
private static final String RETRY_RECEIPTS = "android.retryReceipts"; private static final String RETRY_RECEIPTS = "android.retryReceipts";
private static final String SUGGEST_SMS_BLACKLIST = "android.suggestSmsBlacklist"; private static final String SUGGEST_SMS_BLACKLIST = "android.suggestSmsBlacklist";
private static final String ANNOUNCEMENT_GROUPS = "android.announcementGroups";
private static final String MAX_GROUP_CALL_RING_SIZE = "global.calling.maxGroupCallRingSize"; private static final String MAX_GROUP_CALL_RING_SIZE = "global.calling.maxGroupCallRingSize";
private static final String GROUP_CALL_RINGING = "android.calling.groupCallRinging"; private static final String GROUP_CALL_RINGING = "android.calling.groupCallRinging";
@ -119,7 +118,6 @@ public final class FeatureFlags {
SENDER_KEY, SENDER_KEY,
RETRY_RECEIPTS, RETRY_RECEIPTS,
SUGGEST_SMS_BLACKLIST, SUGGEST_SMS_BLACKLIST,
ANNOUNCEMENT_GROUPS,
MAX_GROUP_CALL_RING_SIZE, MAX_GROUP_CALL_RING_SIZE,
GROUP_CALL_RINGING GROUP_CALL_RINGING
); );
@ -379,11 +377,6 @@ public final class FeatureFlags {
return getBoolean(SENDER_KEY, false); return getBoolean(SENDER_KEY, false);
} }
/** Whether or not showing the announcement group setting in the UI is enabled . */
public static boolean announcementGroups() {
return getBoolean(ANNOUNCEMENT_GROUPS, false);
}
/** A comma-delimited list of country codes that should not be told about SMS during onboarding. */ /** A comma-delimited list of country codes that should not be told about SMS during onboarding. */
public static @NonNull String suggestSmsBlacklist() { public static @NonNull String suggestSmsBlacklist() {
return getString(SUGGEST_SMS_BLACKLIST, ""); return getString(SUGGEST_SMS_BLACKLIST, "");