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

Prevent ZkGroup link crashes.

Browse Source
This commit is contained in:
Alan Evans
2020-05-14 10:30:36 -03:00
committed by Alex Hart
parent 8861ad76ed
commit 4de86cb6cf
5 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
View File

@@ -507,4 +507,7 @@ public final class FeatureFlags {
/** Read and write versioned profile information. */
public static final boolean VERSIONED_PROFILES = org.whispersystems.signalservice.FeatureFlags.VERSIONED_PROFILES;
/** Enabled ZKGroups library. */
public static final boolean ZK_GROUPS = org.whispersystems.signalservice.FeatureFlags.ZK_GROUPS;
}

3
app/src/main/java/org/thoughtcrime/securesms/util/GroupUtil.java
View File

@@ -41,6 +41,9 @@ public final class GroupUtil {
if (groupContext.getGroupV1().isPresent()) {
return GroupId.v1(groupContext.getGroupV1().get().getGroupId());
} else if (groupContext.getGroupV2().isPresent()) {
if (!FeatureFlags.ZK_GROUPS) {
throw new BadGroupIdException();
}
return GroupId.v2(groupContext.getGroupV2().get().getMasterKey());
} else {
throw new AssertionError();