From 7fb263fdf0eccd5fcd77819bc5cfe2f77e8a975b Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 1 Feb 2024 17:54:26 +0100
Subject: [PATCH 1/1] Update dependencies

---
 build.gradle.kts                                              | 2 +-
 .../signal/manager/syncStorage/ContactRecordProcessor.java    | 4 +++-
 settings.gradle.kts                                           | 4 ++--
 src/main/java/org/asamk/signal/BaseConfig.java                | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index b0a37747..cc9b6ceb 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.28"
+    id("org.graalvm.buildtools.native") version "0.10.0"
 }
 
 version = "0.12.8-SNAPSHOT"
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
index 7598b5ea..5bae64c8 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
@@ -180,6 +180,7 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
                 ? local.getSystemFamilyName().orElse("")
                 : remote.getSystemFamilyName().orElse("");
         final var systemNickname = remote.getSystemNickname().orElse("");
+        final var pniSignatureVerified = remote.isPniSignatureVerified() || local.isPniSignatureVerified();
 
         final var mergedBuilder = new SignalContactRecord.Builder(remote.getId().getRaw(), aci, unknownFields).setE164(
                         e164)
@@ -200,7 +201,8 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
                 .setMuteUntil(muteUntil)
                 .setHideStory(hideStory)
                 .setUnregisteredTimestamp(unregisteredTimestamp)
-                .setHidden(hidden);
+                .setHidden(hidden)
+                .setPniSignatureVerified(pniSignatureVerified);
         final var merged = mergedBuilder.build();
 
         final var matchesRemote = doProtosMatch(merged, remote);
diff --git a/settings.gradle.kts b/settings.gradle.kts
index d34fe85c..e28f8eaf 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -15,8 +15,8 @@ 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_93")
-            library("sqlite", "org.xerial", "sqlite-jdbc").version("3.45.0.0")
+            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_94")
+            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.1")
             library("junit.launcher", "org.junit.platform", "junit-platform-launcher").version("1.10.1")
diff --git a/src/main/java/org/asamk/signal/BaseConfig.java b/src/main/java/org/asamk/signal/BaseConfig.java
index 648f19d0..406c3fb1 100644
--- a/src/main/java/org/asamk/signal/BaseConfig.java
+++ b/src/main/java/org/asamk/signal/BaseConfig.java
@@ -5,7 +5,7 @@ public class BaseConfig {
     public static final String PROJECT_NAME = BaseConfig.class.getPackage().getImplementationTitle();
     public static final String PROJECT_VERSION = BaseConfig.class.getPackage().getImplementationVersion();
 
-    static final String USER_AGENT_SIGNAL_ANDROID = "Signal-Android/6.39.1";
+    static final String USER_AGENT_SIGNAL_ANDROID = "Signal-Android/6.46.0";
     static final String USER_AGENT_SIGNAL_CLI = PROJECT_NAME == null
             ? "signal-cli"
             : PROJECT_NAME + "/" + PROJECT_VERSION;
-- 
2.51.0