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

Make Group V2 creation driven by version flag.

Browse source
This commit is contained in:
Alan Evans 2020-09-03 18:46:50 -03:00 • committed by Cody Henthorne
parent ed9acd25f9
commit 6a14dc69c0
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -55,7 +55,7 @@ public final class FeatureFlags {
private static final String GROUPS_V2_OLD_1 = "android.groupsv2"; private static final String GROUPS_V2_OLD_1 = "android.groupsv2";
private static final String GROUPS_V2_OLD_2 = "android.groupsv2.2"; private static final String GROUPS_V2_OLD_2 = "android.groupsv2.2";
private static final String GROUPS_V2 = "android.groupsv2.3"; private static final String GROUPS_V2 = "android.groupsv2.3";
private static final String GROUPS_V2_CREATE = "android.groupsv2.create.3"; private static final String GROUPS_V2_CREATE_VERSION = "android.groupsv2.createVersion";
private static final String GROUPS_V2_JOIN_VERSION = "android.groupsv2.joinVersion"; private static final String GROUPS_V2_JOIN_VERSION = "android.groupsv2.joinVersion";
private static final String GROUPS_V2_LINKS_VERSION = "android.groupsv2.manageGroupLinksVersion"; private static final String GROUPS_V2_LINKS_VERSION = "android.groupsv2.manageGroupLinksVersion";
private static final String GROUPS_V2_CAPACITY = "global.groupsv2.maxGroupSize"; private static final String GROUPS_V2_CAPACITY = "global.groupsv2.maxGroupSize";
@ -74,7 +74,7 @@ public final class FeatureFlags {
ATTACHMENTS_V3, ATTACHMENTS_V3,
REMOTE_DELETE, REMOTE_DELETE,
GROUPS_V2, GROUPS_V2,
GROUPS_V2_CREATE, GROUPS_V2_CREATE_VERSION,
GROUPS_V2_CAPACITY, GROUPS_V2_CAPACITY,
GROUPS_V2_JOIN_VERSION, GROUPS_V2_JOIN_VERSION,
GROUPS_V2_LINKS_VERSION, GROUPS_V2_LINKS_VERSION,
@ -104,7 +104,7 @@ public final class FeatureFlags {
*/ */
private static final Set<String> HOT_SWAPPABLE = Sets.newHashSet( private static final Set<String> HOT_SWAPPABLE = Sets.newHashSet(
ATTACHMENTS_V3, ATTACHMENTS_V3,
GROUPS_V2_CREATE, GROUPS_V2_CREATE_VERSION,
GROUPS_V2_JOIN_VERSION, GROUPS_V2_JOIN_VERSION,
VERIFY_V2, VERIFY_V2,
CDS_VERSION CDS_VERSION
@ -209,7 +209,7 @@ public final class FeatureFlags {
/** Attempt groups v2 creation. */ /** Attempt groups v2 creation. */
public static boolean groupsV2create() { public static boolean groupsV2create() {
return groupsV2LatestFlag() && return groupsV2LatestFlag() &&
getBoolean(GROUPS_V2_CREATE, false) && getVersionFlag(GROUPS_V2_CREATE_VERSION) == VersionFlag.ON &&
!SignalStore.internalValues().gv2DoNotCreateGv2Groups(); !SignalStore.internalValues().gv2DoNotCreateGv2Groups();
} }