mirror of
https://github.com/AsamK/signal-cli.git
synced 2026-05-30 15:14:14 +00:00
Compare commits
3 Commits
9b09df5f17
...
251bd2d87a
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
251bd2d87a | ||
|
|
a3fcda7598 | ||
|
|
c9e2504349 |
@ -7,11 +7,11 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
tasks.named<KotlinCompilationTask<KotlinJvmCompilerOptions>>("compileKotlin").configure {
|
tasks.named<KotlinCompilationTask<KotlinJvmCompilerOptions>>("compileKotlin").configure {
|
||||||
compilerOptions.jvmTarget.set(JvmTarget.JVM_24)
|
compilerOptions.jvmTarget.set(JvmTarget.JVM_25)
|
||||||
}
|
}
|
||||||
|
|
||||||
java {
|
java {
|
||||||
targetCompatibility = JavaVersion.VERSION_24
|
targetCompatibility = JavaVersion.VERSION_25
|
||||||
}
|
}
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
|
|||||||
@ -558,16 +558,24 @@ 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) {
|
||||||
final var serviceId = ServiceId.parseOrThrow(member.aciBytes);
|
final var serviceId = ServiceId.parseOrThrow(member.aciBytes);
|
||||||
final var recipientId = account.getRecipientResolver().resolveRecipient(serviceId);
|
storeProfileKeyIfMissing(serviceId, member.profileKey.toByteArray());
|
||||||
final var profileStore = account.getProfileStore();
|
}
|
||||||
if (profileStore.getProfileKey(recipientId) != null) {
|
for (var member : group.requestingMembers) {
|
||||||
// We already have a profile key, not updating it from a non-authoritative source
|
final var serviceId = ServiceId.parseOrThrow(member.aciBytes);
|
||||||
continue;
|
storeProfileKeyIfMissing(serviceId, member.profileKey.toByteArray());
|
||||||
}
|
}
|
||||||
try {
|
}
|
||||||
profileStore.storeProfileKey(recipientId, new ProfileKey(member.profileKey.toByteArray()));
|
|
||||||
} catch (InvalidInputException ignored) {
|
private void storeProfileKeyIfMissing(final ServiceId serviceId, final byte[] profileKeyBytes) {
|
||||||
}
|
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(profileKeyBytes));
|
||||||
|
} catch (InvalidInputException ignored) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user