nik/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli.git synced 2026-05-18 13:14:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor profile key extraction

Browse Source
This commit is contained in:
AsamK 2026-04-27 16:36:22 +02:00
parent a3fcda7598
commit 251bd2d87a
1 changed files with 6 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
View File

@ -38,8 +38,6 @@ import org.signal.storageservice.storage.protos.groups.GroupChangeResponse;
import org.signal.storageservice.storage.protos.groups.local.DecryptedGroup; import org.signal.storageservice.storage.protos.groups.local.DecryptedGroup;
import org.signal.storageservice.storage.protos.groups.local.DecryptedGroupChange; import org.signal.storageservice.storage.protos.groups.local.DecryptedGroupChange;
import org.signal.storageservice.storage.protos.groups.local.DecryptedGroupJoinInfo; import org.signal.storageservice.storage.protos.groups.local.DecryptedGroupJoinInfo;
import org.signal.storageservice.storage.protos.groups.local.DecryptedMember;
import org.signal.storageservice.storage.protos.groups.local.DecryptedRequestingMember;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.whispersystems.signalservice.api.groupsv2.DecryptedGroupChangeLog; import org.whispersystems.signalservice.api.groupsv2.DecryptedGroupChangeLog;
@ -559,18 +557,16 @@ public class GroupHelper {
private void storeProfileKeysFromMembers(final DecryptedGroup group) { private void storeProfileKeysFromMembers(final DecryptedGroup group) {
for (var member : group.members) { for (var member : group.members) {
storeProfileKeyForDecryptedMemberIfMissing(member); final var serviceId = ServiceId.parseOrThrow(member.aciBytes);
storeProfileKeyIfMissing(serviceId, member.profileKey.toByteArray());
} }
for (var member : group.requestingMembers) { for (var member : group.requestingMembers) {
storeProfileKeyForDecryptedRequestingMemberIfMissing(member); final var serviceId = ServiceId.parseOrThrow(member.aciBytes);
storeProfileKeyIfMissing(serviceId, member.profileKey.toByteArray());
} }
} }
private void storeProfileKeyForDecryptedMemberIfMissing(final DecryptedMember member) { private void storeProfileKeyIfMissing(final ServiceId serviceId, final byte[] profileKeyBytes) {
if (member == null) {
return;
}
final var serviceId = ServiceId.parseOrThrow(member.aciBytes);
final var recipientId = account.getRecipientResolver().resolveRecipient(serviceId); final var recipientId = account.getRecipientResolver().resolveRecipient(serviceId);
final var profileStore = account.getProfileStore(); final var profileStore = account.getProfileStore();
if (profileStore.getProfileKey(recipientId) != null) { if (profileStore.getProfileKey(recipientId) != null) {
@ -578,24 +574,7 @@ public class GroupHelper {
return; return;
} }
try { try {
profileStore.storeProfileKey(recipientId, new ProfileKey(member.profileKey.toByteArray())); profileStore.storeProfileKey(recipientId, new ProfileKey(profileKeyBytes));
} catch (InvalidInputException ignored) {
}
}
private void storeProfileKeyForDecryptedRequestingMemberIfMissing(final DecryptedRequestingMember member) {
if (member == null) {
return;
}
final var serviceId = ServiceId.parseOrThrow(member.aciBytes);
final var recipientId = account.getRecipientResolver().resolveRecipient(serviceId);
final var profileStore = account.getProfileStore();
if (profileStore.getProfileKey(recipientId) != null) {
// We already have a profile key, not updating it from a non-authoritative source
return;
}
try {
profileStore.storeProfileKey(recipientId, new ProfileKey(member.profileKey.toByteArray()));
} catch (InvalidInputException ignored) { } catch (InvalidInputException ignored) {
} }
} }