Update dependencies

diff --git a/build.gradle.kts b/build.gradle.kts
index a767e06d08730c2ed4a56c5b9656b1e9213d4ce6..81303932ab8142b8e5bc315421ccdf81d0251523 100644 (file)
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -36,9 +36,9 @@ dependencies {
     implementation("com.fasterxml.jackson.core", "jackson-databind", "2.13.3")
     implementation("net.sourceforge.argparse4j", "argparse4j", "0.9.0")
     implementation("com.github.hypfvieh", "dbus-java-transport-native-unixsocket", "4.1.0")
-    implementation("org.slf4j", "slf4j-api", "1.7.36")
-    implementation("ch.qos.logback", "logback-classic", "1.2.11")
-    implementation("org.slf4j", "jul-to-slf4j", "1.7.36")
+    implementation("org.slf4j", "slf4j-api", "2.0.0")
+    implementation("ch.qos.logback", "logback-classic", "1.4.0")
+    implementation("org.slf4j", "jul-to-slf4j", "2.0.0")
     implementation(project(":lib"))
 }
 

diff --git a/graalvm-config-dir/jni-config.json b/graalvm-config-dir/jni-config.json
index 5c774beda0642e2359e4a1e6a735f2c082c2e783..cad0e096ea0687124b8d1943e248dfaf38f15f13 100644 (file)
--- a/graalvm-config-dir/jni-config.json
+++ b/graalvm-config-dir/jni-config.json
@@ -36,7 +36,10 @@
 },
 {
   "name":"java.lang.Throwable",
-  "methods":[{"name":"getMessage","parameterTypes":[] }]
+  "methods":[
+    {"name":"getMessage","parameterTypes":[] }, 
+    {"name":"toString","parameterTypes":[] }
+  ]
 },
 {
   "name":"java.lang.UnsatisfiedLinkError",
@@ -187,33 +190,59 @@
   "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
 },
 {
-  "name":"org.sqlite.Collation"
+  "name":"org.sqlite.Collation",
+  "methods":[{"name":"xCompare","parameterTypes":["java.lang.String","java.lang.String"] }]
 },
 {
-  "name":"org.sqlite.Function"
+  "name":"org.sqlite.Function",
+  "fields":[
+    {"name":"args"}, 
+    {"name":"context"}, 
+    {"name":"value"}
+  ],
+  "methods":[{"name":"xFunc","parameterTypes":[] }]
 },
 {
-  "name":"org.sqlite.Function$Aggregate"
+  "name":"org.sqlite.Function$Aggregate",
+  "methods":[
+    {"name":"clone","parameterTypes":[] }, 
+    {"name":"xFinal","parameterTypes":[] }, 
+    {"name":"xStep","parameterTypes":[] }
+  ]
 },
 {
-  "name":"org.sqlite.Function$Window"
+  "name":"org.sqlite.Function$Window",
+  "methods":[
+    {"name":"xInverse","parameterTypes":[] }, 
+    {"name":"xValue","parameterTypes":[] }
+  ]
 },
 {
   "name":"org.sqlite.ProgressHandler"
 },
 {
   "name":"org.sqlite.core.DB",
-  "methods":[{"name":"throwex","parameterTypes":["int"] }]
+  "methods":[
+    {"name":"throwex","parameterTypes":[] }, 
+    {"name":"throwex","parameterTypes":["int"] }
+  ]
 },
 {
-  "name":"org.sqlite.core.DB$ProgressObserver"
+  "name":"org.sqlite.core.DB$ProgressObserver",
+  "methods":[{"name":"progress","parameterTypes":["int","int"] }]
 },
 {
   "name":"org.sqlite.core.NativeDB",
   "fields":[
-    {"name":"colldatalist"}, 
+    {"name":"busyHandler"}, 
+    {"name":"commitListener"}, 
     {"name":"pointer"}, 
-    {"name":"udfdatalist"}
+    {"name":"progressHandler"}, 
+    {"name":"updateListener"}
+  ],
+  "methods":[
+    {"name":"stringToUtf8ByteArray","parameterTypes":["java.lang.String"] }, 
+    {"name":"throwex","parameterTypes":["java.lang.String"] }
   ]
 }
 ]

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 27c879516c9960bd2d3e16f567ae56d4cf987239..81c2deb0a6193eaf767bb35fab4ef948883408ff 100644 (file)
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -2653,6 +2653,7 @@
     {"name":"dataMessage_"}, 
     {"name":"decryptionErrorMessage_"}, 
     {"name":"nullMessage_"}, 
+    {"name":"pniSignatureMessage_"}, 
     {"name":"receiptMessage_"}, 
     {"name":"senderKeyDistributionMessage_"}, 
     {"name":"storyMessage_"}, 
@@ -2855,12 +2856,9 @@
     {"name":"bitField0_"}, 
     {"name":"content_"}, 
     {"name":"destinationUuid_"}, 
-    {"name":"legacyMessage_"}, 
-    {"name":"relay_"}, 
     {"name":"serverGuid_"}, 
     {"name":"serverTimestamp_"}, 
     {"name":"sourceDevice_"}, 
-    {"name":"sourceE164_"}, 
     {"name":"sourceUuid_"}, 
     {"name":"timestamp_"}, 
     {"name":"type_"}, 

diff --git a/graalvm-config-dir/resource-config.json b/graalvm-config-dir/resource-config.json
index 1de22f7671b6942326c40be0422032b46eca8ac8..1356630446908eb40ec34395341bceecfdde7190 100644 (file)
--- a/graalvm-config-dir/resource-config.json
+++ b/graalvm-config-dir/resource-config.json
@@ -13,6 +13,9 @@
     {
       "pattern":"\\QMETA-INF/services/org.freedesktop.dbus.spi.transport.ITransportProvider\\E"
     }, 
+    {
+      "pattern":"\\QMETA-INF/services/org.slf4j.spi.SLF4JServiceProvider\\E"
+    }, 
     {
       "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG\\E"
     }, 

diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
index a6235726d5b4376ff936122d7c8f4061fe8a46b6..855d73f818d9be67bfdcb7ff97c0de716f80f892 100644 (file)
--- a/lib/build.gradle.kts
+++ b/lib/build.gradle.kts
@@ -14,12 +14,12 @@ repositories {
 }
 
 dependencies {
-    implementation("com.github.turasa", "signal-service-java", "2.15.3_unofficial_55")
+    implementation("com.github.turasa", "signal-service-java", "2.15.3_unofficial_56")
     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")
-    implementation("org.slf4j", "slf4j-api", "1.7.36")
-    implementation("org.xerial", "sqlite-jdbc", "3.39.2.0")
+    implementation("org.slf4j", "slf4j-api", "2.0.0")
+    implementation("org.xerial", "sqlite-jdbc", "3.39.2.1")
     implementation("com.zaxxer", "HikariCP", "5.0.1")
 }
 

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
index 95e84f083e720f94c3884b033618620231a751e6..e8b19356e1007a63dfb9680263685832c85222de 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
@@ -122,7 +122,8 @@ public class SendHelper {
         final var result = handleSendMessage(recipientId,
                 (messageSender, address, unidentifiedAccess) -> messageSender.sendReceipt(address,
                         unidentifiedAccess,
-                        receiptMessage));
+                        receiptMessage,
+                        false));
         messageSendLogStore.insertIfPossible(receiptMessage.getWhen(), result, ContentHint.IMPLICIT, false);
         handleSendMessageResult(result);
         return result;
@@ -141,6 +142,7 @@ public class SendHelper {
                         ContentHint.IMPLICIT,
                         message,
                         SignalServiceMessageSender.IndividualSendEvents.EMPTY,
+                        false,
                         false));
     }
 
@@ -602,7 +604,8 @@ public class SendHelper {
                         ContentHint.RESENDABLE,
                         message,
                         SignalServiceMessageSender.IndividualSendEvents.EMPTY,
-                        urgent));
+                        urgent,
+                        false));
         messageSendLogStore.insertIfPossible(message.getTimestamp(), result, ContentHint.RESENDABLE, urgent);
         handleSendMessageResult(result);
         return result;

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
index 3037d7c303c98b948026cb2de892248fef43346a..f3c3a09122b1548f8b83ec59b8789631d25dd544 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
@@ -7,6 +7,7 @@ import org.asamk.signal.manager.groups.GroupId;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.recipients.Contact;
 import org.asamk.signal.manager.storage.recipients.Profile;
+import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 import org.signal.libsignal.protocol.IdentityKey;
 import org.signal.libsignal.protocol.InvalidKeyException;
 import org.signal.libsignal.zkgroup.InvalidInputException;
@@ -100,7 +101,8 @@ public class StorageHelper {
         }
 
         final var contactRecord = record.getContact().get();
-        final var address = contactRecord.getAddress();
+        final var address = new RecipientAddress(contactRecord.getServiceId().uuid(),
+                contactRecord.getNumber().orElse(null));
         final var recipientId = account.getRecipientResolver().resolveRecipient(address);
 
         final var contact = account.getContactStore().getContact(recipientId);

diff --git a/lib/src/main/java/org/asamk/signal/manager/util/MessageCacheUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/MessageCacheUtils.java
index 43badfa6771bbb19d99aeede9aae833e338254d9..ca2dcaaef6e1f5930bdf3b194c4bf937d3bbe1cb 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/util/MessageCacheUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/MessageCacheUtils.java
@@ -45,10 +45,9 @@ public class MessageCacheUtils {
                 content = new byte[contentLen];
                 in.readFully(content);
             }
-            byte[] legacyMessage = null;
             var legacyMessageLen = in.readInt();
             if (legacyMessageLen > 0) {
-                legacyMessage = new byte[legacyMessageLen];
+                byte[] legacyMessage = new byte[legacyMessageLen];
                 in.readFully(legacyMessage);
             }
             long serverReceivedTimestamp = 0;
@@ -75,7 +74,6 @@ public class MessageCacheUtils {
                     addressOptional,
                     sourceDevice,
                     timestamp,
-                    legacyMessage,
                     content,
                     serverReceivedTimestamp,
                     serverDeliveredTimestamp,
@@ -90,7 +88,7 @@ public class MessageCacheUtils {
             try (var out = new DataOutputStream(f)) {
                 out.writeInt(6); // version
                 out.writeInt(envelope.getType());
-                out.writeUTF(envelope.getSourceE164().isPresent() ? envelope.getSourceE164().get() : "");
+                out.writeUTF(""); // legacy number
                 out.writeUTF(envelope.getSourceUuid().isPresent() ? envelope.getSourceUuid().get() : "");
                 out.writeInt(envelope.getSourceDevice());
                 out.writeUTF(envelope.getDestinationUuid() == null ? "" : envelope.getDestinationUuid());
@@ -101,12 +99,7 @@ public class MessageCacheUtils {
                 } else {
                     out.writeInt(0);
                 }
-                if (envelope.hasLegacyMessage()) {
-                    out.writeInt(envelope.getLegacyMessage().length);
-                    out.write(envelope.getLegacyMessage());
-                } else {
-                    out.writeInt(0);
-                }
+                out.writeInt(0); // legacy message
                 out.writeLong(envelope.getServerReceivedTimestamp());
                 var uuid = envelope.getServerGuid();
                 out.writeUTF(uuid == null ? "" : uuid);

diff --git a/src/main/java/org/asamk/signal/LogConfigurator.java b/src/main/java/org/asamk/signal/LogConfigurator.java
index 9271d6b797b38405a138ad8322162735b1f39e65..714ec4a133ec67b9e99007581332bfeba016399e 100644 (file)
--- a/src/main/java/org/asamk/signal/LogConfigurator.java
+++ b/src/main/java/org/asamk/signal/LogConfigurator.java
@@ -29,7 +29,7 @@ public class LogConfigurator extends ContextAwareBase implements Configurator {
         LogConfigurator.logFile = logFile;
     }
 
-    public void configure(LoggerContext lc) {
+    public ExecutionStatus configure(LoggerContext lc) {
         final var rootLogger = lc.getLogger(Logger.ROOT_LOGGER_NAME);
 
         final var defaultLevel = verboseLevel > 1 ? Level.ALL : verboseLevel > 0 ? Level.DEBUG : Level.INFO;
@@ -63,6 +63,7 @@ public class LogConfigurator extends ContextAwareBase implements Configurator {
             final var fileAppender = createLoggingFileAppender(lc, createLayoutWrappingEncoder(fileLayout));
             rootLogger.addAppender(fileAppender);
         }
+        return ExecutionStatus.DO_NOT_INVOKE_NEXT_IF_ANY;
     }
 
     private ConsoleAppender<ILoggingEvent> createLoggingConsoleAppender(