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

Treat member labels as unset if they can't be decrypted.

Browse Source
This commit is contained in:
jeffrey-signal
2026-03-12 17:33:54 -04:00
committed by GitHub
parent df89f8879d
commit 55e029e81d
2 changed files with 82 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations.java
View File

@@ -769,8 +769,8 @@ public final class GroupsV2Operations {
modifyMemberLabels.add(
new DecryptedModifyMemberLabel.Builder()
.aciBytes(decryptAciToBinary(action.userId))
.labelEmoji(Objects.requireNonNullElse(decryptString(action.labelEmoji), ""))
.labelString(Objects.requireNonNullElse(decryptString(action.labelString), ""))
.labelEmoji(decryptMemberLabelEmoji(action.labelEmoji))
.labelString(decryptMemberLabelText(action.labelString))
.build()
);
}
@@ -817,8 +817,8 @@ public final class GroupsV2Operations {
private DecryptedMember.Builder decryptMember(Member member)
throws InvalidGroupStateException, VerificationFailedException, InvalidInputException
{
String labelEmoji = Objects.requireNonNullElse(decryptString(member.labelEmoji), "");
String labelString = Objects.requireNonNullElse(decryptString(member.labelString), "");
String labelEmoji = decryptMemberLabelEmoji(member.labelEmoji);
String labelString = decryptMemberLabelText(member.labelString);
if (member.presentation.size() == 0) {
ACI aci = decryptAci(member.userId);
@@ -1072,6 +1072,26 @@ public final class GroupsV2Operations {
return new String(decryptedBytes, StandardCharsets.UTF_8);
}
@Nonnull
private String decryptMemberLabelText(@Nullable ByteString cipherText) {
try {
return Objects.requireNonNullElse(decryptString(cipherText), "");
} catch (VerificationFailedException e) {
Log.w(TAG, "Failed to decrypt member label string, treating as unset");
return "";
}
}
@Nonnull
private String decryptMemberLabelEmoji(@Nullable ByteString cipherText) {
try {
return Objects.requireNonNullElse(decryptString(cipherText), "");
} catch (VerificationFailedException e) {
Log.w(TAG, "Failed to decrypt member label emoji, treating as unset");
return "";
}
}
/**
* Verifies signature and parses actions on a group change.
*/