]> nmode's Git Repositories - signal-cli/commitdiff
Update libsignal-service-java
authorAsamK <asamk@gmx.de>
Sat, 16 Jul 2022 13:17:48 +0000 (15:17 +0200)
committerAsamK <asamk@gmx.de>
Sat, 16 Jul 2022 13:17:48 +0000 (15:17 +0200)
lib/build.gradle.kts
lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java

index 567afd1985ab4f5b94602bf0e23ed1d952efbc24..f475d567442262222ad23caf05557210eeaf4f7a 100644 (file)
@@ -14,7 +14,7 @@ repositories {
 }
 
 dependencies {
-    implementation("com.github.turasa", "signal-service-java", "2.15.3_unofficial_50")
+    implementation("com.github.turasa", "signal-service-java", "2.15.3_unofficial_51")
     implementation("com.fasterxml.jackson.core", "jackson-databind", "2.13.3")
     implementation("com.google.protobuf", "protobuf-javalite", "3.11.4")
     implementation("org.bouncycastle", "bcprov-jdk15on", "1.70")
index 234239556822ddd2ae697c03f9a376cb7a30f328..7b09aa3ef55593856054be70d72d8ada2014fd06 100644 (file)
@@ -564,7 +564,8 @@ class ManagerImpl implements Manager {
             final var quote = message.quote().get();
             messageBuilder.withQuote(new SignalServiceDataMessage.Quote(quote.timestamp(),
                     context.getRecipientHelper()
-                            .resolveSignalServiceAddress(context.getRecipientHelper().resolveRecipient(quote.author())),
+                            .resolveSignalServiceAddress(context.getRecipientHelper().resolveRecipient(quote.author()))
+                            .getServiceId(),
                     quote.message(),
                     List.of(),
                     resolveMentions(quote.mentions()),
@@ -651,7 +652,7 @@ class ManagerImpl implements Manager {
         var targetAuthorRecipientId = context.getRecipientHelper().resolveRecipient(targetAuthor);
         var reaction = new SignalServiceDataMessage.Reaction(emoji,
                 remove,
-                context.getRecipientHelper().resolveSignalServiceAddress(targetAuthorRecipientId),
+                context.getRecipientHelper().resolveSignalServiceAddress(targetAuthorRecipientId).getServiceId(),
                 targetSentTimestamp);
         final var messageBuilder = SignalServiceDataMessage.newBuilder().withReaction(reaction);
         return sendMessage(messageBuilder, recipients);
index 523df2c9427748146dc1a41320de0dbc47ee73a8..f71133ae097abbc95f7c7a4cf0a7c6297df0160f 100644 (file)
@@ -633,7 +633,7 @@ public class SendHelper {
                 message.getTimestamp(),
                 Optional.of(message),
                 message.getExpiresInSeconds(),
-                Map.of(address, true),
+                Map.of(address.getServiceId(), true),
                 false,
                 Optional.empty(),
                 Set.of());