From: AsamK <asamk@gmx.de>
Date: Sun, 10 Dec 2023 17:57:05 +0000 (+0100)
Subject: Update libsignal-service-java
X-Git-Tag: v0.12.7~3
X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/9823ad9070cc370a23eca1b7e1274e390ec55bc9?ds=sidebyside

Update libsignal-service-java
---

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
index 4e4eb165..d143c631 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
@@ -399,6 +399,7 @@ public class AccountHelper {
                             account.getAciIdentityKeyPair(),
                             account.getPniIdentityKeyPair(),
                             account.getProfileKey(),
+                            account.getOrCreatePinMasterKey(),
                             verificationCode);
         } catch (InvalidKeyException e) {
             throw new InvalidDeviceLinkException("Invalid device link", e);
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/SignalProtocolStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/SignalProtocolStore.java
index ea1a5c6f..f334a2be 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/SignalProtocolStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/SignalProtocolStore.java
@@ -21,6 +21,7 @@ import org.whispersystems.signalservice.api.push.DistributionId;
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 import java.util.function.Supplier;
@@ -140,7 +141,7 @@ public class SignalProtocolStore implements SignalServiceAccountDataStore {
     }
 
     @Override
-    public Set<SignalProtocolAddress> getAllAddressesWithActiveSessions(final List<String> addressNames) {
+    public Map<SignalProtocolAddress, SessionRecord> getAllAddressesWithActiveSessions(final List<String> addressNames) {
         return sessionStore.getAllAddressesWithActiveSessions(addressNames);
     }
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java
index b8c0a322..852e893b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java
@@ -22,7 +22,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 public class SessionStore implements SignalServiceSessionStore {
@@ -198,7 +197,7 @@ public class SessionStore implements SignalServiceSessionStore {
     }
 
     @Override
-    public Set<SignalProtocolAddress> getAllAddressesWithActiveSessions(final List<String> addressNames) {
+    public Map<SignalProtocolAddress, SessionRecord> getAllAddressesWithActiveSessions(final List<String> addressNames) {
         final var serviceIdsCommaSeparated = addressNames.stream()
                 .map(address -> "'" + address.replaceAll("'", "''") + "'")
                 .collect(Collectors.joining(","));
@@ -215,9 +214,8 @@ public class SessionStore implements SignalServiceSessionStore {
                 return Utils.executeQueryForStream(statement,
                                 res -> new Pair<>(getKeyFromResultSet(res), getSessionRecordFromResultSet(res)))
                         .filter(pair -> isActive(pair.second()))
-                        .map(Pair::first)
-                        .map(key -> new SignalProtocolAddress(key.address(), key.deviceId()))
-                        .collect(Collectors.toSet());
+                        .collect(Collectors.toMap(pair -> new SignalProtocolAddress(pair.first().address(),
+                                pair.first().deviceId()), Pair::second));
             }
         } catch (SQLException e) {
             throw new RuntimeException("Failed read from session store", e);
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java
index a535d82b..5126b691 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java
@@ -49,6 +49,7 @@ public class AttachmentUtils {
                 false,
                 false,
                 false,
+                false,
                 preview,
                 0,
                 0,
diff --git a/settings.gradle.kts b/settings.gradle.kts
index bc63bd9f..f1416a32 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -16,7 +16,7 @@ dependencyResolutionManagement {
             library("logback", "ch.qos.logback", "logback-classic").version("1.4.11")
 
 
-            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_88")
+            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_89")
             library("sqlite", "org.xerial", "sqlite-jdbc").version("3.44.0.0")
             library("hikari", "com.zaxxer", "HikariCP").version("5.1.0")
             library("junit.jupiter", "org.junit.jupiter", "junit-jupiter").version("5.10.1")