Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-23 20:48:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Disallow GV1 group edits when GV1 is disabled.

Browse Source
This commit is contained in:
Greyson Parrelli
2021-04-05 15:25:41 -04:00
committed by GitHub
parent 8783d150e8
commit 33cb02b9e4
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java
View File

@@ -29,6 +29,7 @@ import org.thoughtcrime.securesms.groups.GroupMigrationMembershipChange;
import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.recipients.RecipientId; import org.thoughtcrime.securesms.recipients.RecipientId;
import org.thoughtcrime.securesms.util.CursorUtil; import org.thoughtcrime.securesms.util.CursorUtil;
import org.thoughtcrime.securesms.util.FeatureFlags;
import org.thoughtcrime.securesms.util.SetUtil; import org.thoughtcrime.securesms.util.SetUtil;
import org.thoughtcrime.securesms.util.SqlUtil; import org.thoughtcrime.securesms.util.SqlUtil;
import org.thoughtcrime.securesms.util.Util; import org.thoughtcrime.securesms.util.Util;
@@ -991,6 +992,8 @@ public final class GroupDatabase extends Database {
return GroupAccessControl.ALL_MEMBERS; return GroupAccessControl.ALL_MEMBERS;
} }
return GroupAccessControl.ONLY_ADMINS; return GroupAccessControl.ONLY_ADMINS;
} else if (isV1Group() && FeatureFlags.groupsV1ForcedMigration()) {
return GroupAccessControl.NO_ONE;
} else { } else {
return id.isV1() ? GroupAccessControl.ALL_MEMBERS : GroupAccessControl.ONLY_ADMINS; return id.isV1() ? GroupAccessControl.ALL_MEMBERS : GroupAccessControl.ONLY_ADMINS;
} }
@@ -1005,6 +1008,8 @@ public final class GroupDatabase extends Database {
return GroupAccessControl.ALL_MEMBERS; return GroupAccessControl.ALL_MEMBERS;
} }
return GroupAccessControl.ONLY_ADMINS; return GroupAccessControl.ONLY_ADMINS;
} else if (isV1Group() && FeatureFlags.groupsV1ForcedMigration()) {
return GroupAccessControl.NO_ONE;
} else { } else {
return GroupAccessControl.ALL_MEMBERS; return GroupAccessControl.ALL_MEMBERS;
} }