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

Inline manual group migration feature flag.

Browse source
This commit is contained in:
Greyson Parrelli 2021-02-24 20:17:01 -05:00
parent b809008291
commit 69884935f3
4 changed files with 3 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationGroupViewModel.java
View file

@ -193,7 +193,6 @@ final class ConversationGroupViewModel extends ViewModel {
if (record == null || if (record == null ||
!record.isV1Group() || !record.isV1Group() ||
!record.isActive() || !record.isActive() ||
!FeatureFlags.groupsV1ManualMigration() ||
FeatureFlags.groupsV1ForcedMigration() || FeatureFlags.groupsV1ForcedMigration() ||
Recipient.self().getGroupsV1MigrationCapability() != Recipient.Capability.SUPPORTED || Recipient.self().getGroupsV1MigrationCapability() != Recipient.Capability.SUPPORTED ||
!Recipient.resolved(record.getRecipientId()).isProfileSharing()) !Recipient.resolved(record.getRecipientId()).isProfileSharing())

5
app/src/main/java/org/thoughtcrime/securesms/groups/GroupsV1MigrationUtil.java
View file

@ -86,11 +86,6 @@ public final class GroupsV1MigrationUtil {
throw new InvalidMigrationStateException(); throw new InvalidMigrationStateException();
} }
if (forced && !FeatureFlags.groupsV1ManualMigration()) {
Log.w(TAG, "Manual migration is not enabled! Skipping.");
throw new InvalidMigrationStateException();
}
List<Recipient> registeredMembers = RecipientUtil.getEligibleForSending(groupRecipient.getParticipants()); List<Recipient> registeredMembers = RecipientUtil.getEligibleForSending(groupRecipient.getParticipants());
if (RecipientUtil.ensureUuidsAreAvailable(context, registeredMembers)) { if (RecipientUtil.ensureUuidsAreAvailable(context, registeredMembers)) {

6
app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/ManageGroupViewModel.java
View file

@ -129,12 +129,10 @@ public class ManageGroupViewModel extends ViewModel {
recipient -> { recipient -> {
boolean showLegacyInfo = recipient.requireGroupId().isV1(); boolean showLegacyInfo = recipient.requireGroupId().isV1();
if (showLegacyInfo && FeatureFlags.groupsV1ManualMigration() && recipient.getParticipants().size() > FeatureFlags.groupLimits().getHardLimit()) { if (showLegacyInfo && recipient.getParticipants().size() > FeatureFlags.groupLimits().getHardLimit()) {
return GroupInfoMessage.LEGACY_GROUP_TOO_LARGE; return GroupInfoMessage.LEGACY_GROUP_TOO_LARGE;
} else if (showLegacyInfo && FeatureFlags.groupsV1ManualMigration()) {
return GroupInfoMessage.LEGACY_GROUP_UPGRADE;
} else if (showLegacyInfo) { } else if (showLegacyInfo) {
return GroupInfoMessage.LEGACY_GROUP_LEARN_MORE; return GroupInfoMessage.LEGACY_GROUP_UPGRADE;
} else if (groupId.isMms()) { } else if (groupId.isMms()) {
return GroupInfoMessage.MMS_WARNING; return GroupInfoMessage.MMS_WARNING;
} else { } else {

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

@ -63,7 +63,6 @@ public final class FeatureFlags {
public static final String DONATE_MEGAPHONE = "android.donate"; public static final String DONATE_MEGAPHONE = "android.donate";
private static final String VIEWED_RECEIPTS = "android.viewed.receipts"; private static final String VIEWED_RECEIPTS = "android.viewed.receipts";
private static final String GROUP_CALLING = "android.groupsv2.calling.2"; private static final String GROUP_CALLING = "android.groupsv2.calling.2";
private static final String GV1_MANUAL_MIGRATE = "android.groupsV1Migration.manual";
private static final String GV1_FORCED_MIGRATE = "android.groupsV1Migration.forced"; private static final String GV1_FORCED_MIGRATE = "android.groupsV1Migration.forced";
private static final String GV1_MIGRATION_JOB = "android.groupsV1Migration.job"; private static final String GV1_MIGRATION_JOB = "android.groupsV1Migration.job";
private static final String SEND_VIEWED_RECEIPTS = "android.sendViewedReceipts"; private static final String SEND_VIEWED_RECEIPTS = "android.sendViewedReceipts";
@ -95,7 +94,6 @@ public final class FeatureFlags {
DONATE_MEGAPHONE, DONATE_MEGAPHONE,
VIEWED_RECEIPTS, VIEWED_RECEIPTS,
GV1_MIGRATION_JOB, GV1_MIGRATION_JOB,
GV1_MANUAL_MIGRATE,
GV1_FORCED_MIGRATE, GV1_FORCED_MIGRATE,
GROUP_CALLING, GROUP_CALLING,
SEND_VIEWED_RECEIPTS, SEND_VIEWED_RECEIPTS,
@ -285,14 +283,9 @@ public final class FeatureFlags {
return getBoolean(GV1_MIGRATION_JOB, false); return getBoolean(GV1_MIGRATION_JOB, false);
} }
/** Whether or not manual migration from GV1->GV2 is enabled. */
public static boolean groupsV1ManualMigration() {
return getBoolean(GV1_MANUAL_MIGRATE, false);
}
/** Whether or not forced migration from GV1->GV2 is enabled. */ /** Whether or not forced migration from GV1->GV2 is enabled. */
public static boolean groupsV1ForcedMigration() { public static boolean groupsV1ForcedMigration() {
return getBoolean(GV1_FORCED_MIGRATE, false) && groupsV1ManualMigration(); return getBoolean(GV1_FORCED_MIGRATE, false);
} }
/** Whether or not to send viewed receipts. */ /** Whether or not to send viewed receipts. */