From de8ddb2a2bdbfb26c33e105cbc6fddc53db650af Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 2 Oct 2022 17:24:20 +0200
Subject: [PATCH] Update dependencies

---
 build.gradle.kts                                     | 10 +++++-----
 graalvm-config-dir/reflect-config.json               |  1 +
 lib/build.gradle.kts                                 |  6 +++---
 .../asamk/signal/manager/util/MessageCacheUtils.java | 12 +++++++++---
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 81303932..e904e2c6 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     application
     eclipse
     `check-lib-versions`
-    id("org.graalvm.buildtools.native") version "0.9.13"
+    id("org.graalvm.buildtools.native") version "0.9.14"
 }
 
 version = "0.10.11"
@@ -35,10 +35,10 @@ dependencies {
     implementation("org.bouncycastle", "bcprov-jdk15on", "1.70")
     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", "2.0.0")
-    implementation("ch.qos.logback", "logback-classic", "1.4.0")
-    implementation("org.slf4j", "jul-to-slf4j", "2.0.0")
+    implementation("com.github.hypfvieh", "dbus-java-transport-native-unixsocket", "4.2.1")
+    implementation("org.slf4j", "slf4j-api", "2.0.3")
+    implementation("ch.qos.logback", "logback-classic", "1.4.1")
+    implementation("org.slf4j", "jul-to-slf4j", "2.0.3")
     implementation(project(":lib"))
 }
 
diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 42affda0..c520d678 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -2904,6 +2904,7 @@
     {"name":"serverTimestamp_"}, 
     {"name":"sourceDevice_"}, 
     {"name":"sourceUuid_"}, 
+    {"name":"story_"}, 
     {"name":"timestamp_"}, 
     {"name":"type_"}, 
     {"name":"urgent_"}
diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
index cf3c98cb..9e35a790 100644
--- 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_57")
+    implementation("com.github.turasa", "signal-service-java", "2.15.3_unofficial_58")
     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", "2.0.0")
-    implementation("org.xerial", "sqlite-jdbc", "3.39.2.1")
+    implementation("org.slf4j", "slf4j-api", "2.0.3")
+    implementation("org.xerial", "sqlite-jdbc", "3.39.3.0")
     implementation("com.zaxxer", "HikariCP", "5.0.1")
 }
 
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 ca2dcaae..7e8ebea5 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/MessageCacheUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/MessageCacheUtils.java
@@ -19,7 +19,7 @@ public class MessageCacheUtils {
         try (var f = new FileInputStream(file)) {
             var in = new DataInputStream(f);
             var version = in.readInt();
-            if (version > 6) {
+            if (version > 7) {
                 // Unsupported envelope version
                 return null;
             }
@@ -67,6 +67,10 @@ public class MessageCacheUtils {
             if (version >= 6) {
                 isUrgent = in.readBoolean();
             }
+            boolean isStory = true;
+            if (version >= 7) {
+                isStory = in.readBoolean();
+            }
             Optional<SignalServiceAddress> addressOptional = sourceServiceId == null
                     ? Optional.empty()
                     : Optional.of(new SignalServiceAddress(sourceServiceId, source));
@@ -79,14 +83,15 @@ public class MessageCacheUtils {
                     serverDeliveredTimestamp,
                     uuid,
                     destinationUuid == null ? UuidUtil.UNKNOWN_UUID.toString() : destinationUuid,
-                    isUrgent);
+                    isUrgent,
+                    isStory);
         }
     }
 
     public static void storeEnvelope(SignalServiceEnvelope envelope, File file) throws IOException {
         try (var f = new FileOutputStream(file)) {
             try (var out = new DataOutputStream(f)) {
-                out.writeInt(6); // version
+                out.writeInt(7); // version
                 out.writeInt(envelope.getType());
                 out.writeUTF(""); // legacy number
                 out.writeUTF(envelope.getSourceUuid().isPresent() ? envelope.getSourceUuid().get() : "");
@@ -105,6 +110,7 @@ public class MessageCacheUtils {
                 out.writeUTF(uuid == null ? "" : uuid);
                 out.writeLong(envelope.getServerDeliveredTimestamp());
                 out.writeBoolean(envelope.isUrgent());
+                out.writeBoolean(envelope.isStory());
             }
         }
     }
-- 
2.50.1