From: AsamK <asamk@gmx.de>
Date: Sun, 18 Feb 2024 14:16:41 +0000 (+0100)
Subject: Update libsignal-service
X-Git-Tag: v0.13.0~14
X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/bd792f5b7f027f1c4d52b35938cb1e7d6252c306?ds=sidebyside

Update libsignal-service
---

diff --git a/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java b/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
index c964281f..c5da641c 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
@@ -481,7 +481,7 @@ public record MessageEnvelope(
             ) {
 
                 static Address from(org.whispersystems.signalservice.api.messages.shared.SharedContact.PostalAddress address) {
-                    return new Address(Address.Type.from(address.getType()),
+                    return new Address(Type.from(address.getType()),
                             address.getLabel(),
                             address.getStreet(),
                             address.getPobox(),
@@ -690,7 +690,9 @@ public record MessageEnvelope(
                 DELETE,
                 BLOCK,
                 BLOCK_AND_DELETE,
-                UNBLOCK_AND_ACCEPT;
+                UNBLOCK_AND_ACCEPT,
+                SPAM,
+                BLOCK_AND_SPAM;
 
                 static Type from(MessageRequestResponseMessage.Type type) {
                     return switch (type) {
@@ -700,6 +702,8 @@ public record MessageEnvelope(
                         case BLOCK -> BLOCK;
                         case BLOCK_AND_DELETE -> BLOCK_AND_DELETE;
                         case UNBLOCK_AND_ACCEPT -> UNBLOCK_AND_ACCEPT;
+                        case SPAM -> SPAM;
+                        case BLOCK_AND_SPAM -> BLOCK_AND_SPAM;
                     };
                 }
             }
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
index 83646052..947c251b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
@@ -158,7 +158,7 @@ public class RecipientHelper {
     private Map<String, RegisteredUser> getRegisteredUsers(
             final Set<String> numbers, final boolean isPartialRefresh
     ) throws IOException {
-        Map<String, RegisteredUser> registeredUsers = getRegisteredUsersV2(numbers, isPartialRefresh, true);
+        Map<String, RegisteredUser> registeredUsers = getRegisteredUsersV2(numbers, isPartialRefresh);
 
         // Store numbers as recipients, so we have the number/uuid association
         registeredUsers.forEach((number, u) -> account.getRecipientTrustedResolver()
@@ -186,7 +186,7 @@ public class RecipientHelper {
     }
 
     private Map<String, RegisteredUser> getRegisteredUsersV2(
-            final Set<String> numbers, boolean isPartialRefresh, boolean useCompat
+            final Set<String> numbers, boolean isPartialRefresh
     ) throws IOException {
         final var previousNumbers = isPartialRefresh ? Set.<String>of() : account.getCdsiStore().getAllNumbers();
         final var newNumbers = new HashSet<>(numbers) {{
@@ -210,7 +210,6 @@ public class RecipientHelper {
                     .getRegisteredUsersWithCdsi(previousNumbers,
                             newNumbers,
                             account.getRecipientStore().getServiceIdToProfileKeyMap(),
-                            useCompat,
                             token,
                             serviceEnvironmentConfig.cdsiMrenclave(),
                             null,
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java
index 0e1a02b7..e9cd1fa6 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java
@@ -102,10 +102,8 @@ public class AccountRecordProcessor extends DefaultStorageRecordProcessor<Signal
         final var storiesDisabled = remote.isStoriesDisabled();
         final var hasSeenGroupStoryEducation = remote.hasSeenGroupStoryEducationSheet()
                 || local.hasSeenGroupStoryEducationSheet();
-        final var username = remote.getUsername() != null && !remote.getUsername().isEmpty()
-                ? remote.getUsername()
-                : local.getUsername();
-        final var usernameLink = remote.getUsernameLink() != null ? remote.getUsernameLink() : local.getUsernameLink();
+        final var username = remote.getUsername();
+        final var usernameLink = remote.getUsernameLink();
 
         final var mergedBuilder = new SignalAccountRecord.Builder(remote.getId().getRaw(), unknownFields).setGivenName(
                         givenName)
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 2ff8bc5c..4cd47c4e 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -15,7 +15,7 @@ dependencyResolutionManagement {
             library("slf4j.jul", "org.slf4j", "jul-to-slf4j").versionRef("slf4j")
             library("logback", "ch.qos.logback", "logback-classic").version("1.4.14")
 
-            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_95")
+            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_96")
             library("sqlite", "org.xerial", "sqlite-jdbc").version("3.45.1.0")
             library("hikari", "com.zaxxer", "HikariCP").version("5.1.0")
             library("junit.jupiter", "org.junit.jupiter", "junit-jupiter").version("5.10.2")