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

Handle absent change during invite.

Browse Source
This commit is contained in:
Alan Evans
2020-05-21 17:04:57 -03:00
committed by Greyson Parrelli
parent 4712833853
commit 297a7d0ef8
4 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupUtil.java
View File

@@ -88,8 +88,8 @@ public final class DecryptedGroupUtil {
/**
* The UUID of the member that made the change.
*/
public static UUID editorUuid(DecryptedGroupChange change) {
return change != null ? UuidUtil.fromByteStringOrUnknown(change.getEditor()) : UuidUtil.UNKNOWN_UUID;
public static Optional<UUID> editorUuid(DecryptedGroupChange change) {
return Optional.fromNullable(change != null ? UuidUtil.fromByteStringOrNull(change.getEditor()) : null);
}
public static Optional<DecryptedMember> findMemberByUuid(Collection<DecryptedMember> members, UUID uuid) {

5
libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/UuidUtil.java
View File

@@ -63,11 +63,6 @@ public final class UuidUtil {
return parseOrNull(bytes.toByteArray());
}
public static UUID fromByteStringOrUnknown(ByteString bytes) {
UUID uuid = parseOrNull(bytes.toByteArray());
return uuid != null ? uuid : UNKNOWN_UUID;
}
private static UUID parseOrNull(byte[] byteArray) {
return byteArray != null && byteArray.length == 16 ? parseOrThrow(byteArray) : null;
}

2
libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupUtilTest.java
View File

@@ -34,7 +34,7 @@ public final class DecryptedGroupUtilTest {
.setEditor(editor)
.build();
UUID parsed = DecryptedGroupUtil.editorUuid(groupChange);
UUID parsed = DecryptedGroupUtil.editorUuid(groupChange).get();
assertEquals(uuid, parsed);
}