Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 09:20:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

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
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,11 +86,6 @@ public final class GroupsV1MigrationUtil {
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());
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 -> {
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;
} else if (showLegacyInfo && FeatureFlags.groupsV1ManualMigration()) {
return GroupInfoMessage.LEGACY_GROUP_UPGRADE;
} else if (showLegacyInfo) {
return GroupInfoMessage.LEGACY_GROUP_LEARN_MORE;
return GroupInfoMessage.LEGACY_GROUP_UPGRADE;
} else if (groupId.isMms()) {
return GroupInfoMessage.MMS_WARNING;
} else {