marvin.weiler/signal-cli-with-http-logging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update dependencies

Browse Source
This commit is contained in:
AsamK 2024-02-01 17:54:26 +01:00
parent 3be1c24b1b
commit 7fb263fdf0
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle.kts
View File

@ -3,7 +3,7 @@ plugins {
application application
eclipse eclipse
`check-lib-versions` `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" version = "0.12.8-SNAPSHOT"

4
lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
View File

@ -180,6 +180,7 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
? local.getSystemFamilyName().orElse("") ? local.getSystemFamilyName().orElse("")
: remote.getSystemFamilyName().orElse(""); : remote.getSystemFamilyName().orElse("");
final var systemNickname = remote.getSystemNickname().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( final var mergedBuilder = new SignalContactRecord.Builder(remote.getId().getRaw(), aci, unknownFields).setE164(
e164) e164)
@ -200,7 +201,8 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
.setMuteUntil(muteUntil) .setMuteUntil(muteUntil)
.setHideStory(hideStory) .setHideStory(hideStory)
.setUnregisteredTimestamp(unregisteredTimestamp) .setUnregisteredTimestamp(unregisteredTimestamp)
.setHidden(hidden); .setHidden(hidden)
.setPniSignatureVerified(pniSignatureVerified);
final var merged = mergedBuilder.build(); final var merged = mergedBuilder.build();
final var matchesRemote = doProtosMatch(merged, remote); final var matchesRemote = doProtosMatch(merged, remote);

4
settings.gradle.kts
View File

@ -15,8 +15,8 @@ dependencyResolutionManagement {
library("slf4j.jul", "org.slf4j", "jul-to-slf4j").versionRef("slf4j") library("slf4j.jul", "org.slf4j", "jul-to-slf4j").versionRef("slf4j")
library("logback", "ch.qos.logback", "logback-classic").version("1.4.14") 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("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_94")
library("sqlite", "org.xerial", "sqlite-jdbc").version("3.45.0.0") library("sqlite", "org.xerial", "sqlite-jdbc").version("3.45.1.0")
library("hikari", "com.zaxxer", "HikariCP").version("5.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.jupiter", "org.junit.jupiter", "junit-jupiter").version("5.10.1")
library("junit.launcher", "org.junit.platform", "junit-platform-launcher").version("1.10.1") library("junit.launcher", "org.junit.platform", "junit-platform-launcher").version("1.10.1")

2
src/main/java/org/asamk/signal/BaseConfig.java
View File

@ -5,7 +5,7 @@ public class BaseConfig {
public static final String PROJECT_NAME = BaseConfig.class.getPackage().getImplementationTitle(); public static final String PROJECT_NAME = BaseConfig.class.getPackage().getImplementationTitle();
public static final String PROJECT_VERSION = BaseConfig.class.getPackage().getImplementationVersion(); 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 static final String USER_AGENT_SIGNAL_CLI = PROJECT_NAME == null
? "signal-cli" ? "signal-cli"
: PROJECT_NAME + "/" + PROJECT_VERSION; : PROJECT_NAME + "/" + PROJECT_VERSION;