nik/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli.git synced 2026-01-26 18:53:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update libsignal-service

Browse Source
This commit is contained in:
AsamK 2025-11-02 18:50:24 +01:00
parent d27aea2220
commit 91701f609a
5 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle/libs.versions.toml
View File

@ -11,7 +11,7 @@ slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
slf4j-jul = { module = "org.slf4j:jul-to-slf4j", version.ref = "slf4j" }
logback = "ch.qos.logback:logback-classic:1.5.20"
signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_132"
signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_133"
sqlite = "org.xerial:sqlite-jdbc:3.50.3.0"
hikari = "com.zaxxer:HikariCP:7.0.2"
junit-jupiter-bom = { module = "org.junit:junit-bom", version.ref = "junit" }

2
lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
View File

@ -154,7 +154,7 @@ public class SyncHelper {
try {
try (OutputStream fos = new FileOutputStream(contactsFile)) {
var out = new DeviceContactsOutputStream(fos);
var out = new DeviceContactsOutputStream(fos, false);
for (var contactPair : account.getContactStore().getContacts()) {
final var recipientId = contactPair.first();
final var contact = contactPair.second();

3
lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
View File

@ -328,7 +328,8 @@ public class SignalDependencies {
Optional.empty(),
executor,
ServiceConfig.MAX_ENVELOPE_SIZE,
() -> true));
() -> true,
false));
}
public List<SecureValueRecovery> getSecureValueRecovery() {

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

@ -178,8 +178,10 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
: remote.profileKey;
final var mergedBuilder = remote.newBuilder()
.aci(local.aci.isEmpty() ? remote.aci : local.aci)
.aciBinary(firstNonEmpty(local.aciBinary, remote.aciBinary))
.e164(e164)
.pni(pni)
.pniBinary(pni.isEmpty() ? ByteString.EMPTY : PNI.parseOrThrow(pni).toByteStringWithoutPrefix())
.givenName(profileGivenName)
.familyName(profileFamilyName)
.systemGivenName(account.isPrimaryDevice() ? local.systemGivenName : remote.systemGivenName)
@ -335,9 +337,16 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
public int compare(SignalContactRecord lhsRecord, SignalContactRecord rhsRecord) {
final var lhs = lhsRecord.getProto();
final var rhs = rhsRecord.getProto();
if ((!lhs.aci.isEmpty() && Objects.equals(lhs.aci, rhs.aci)) || (
if ((
(!lhs.aci.isEmpty() && Objects.equals(lhs.aci, rhs.aci)) || (
lhs.aciBinary.size() != 0 && Objects.equals(lhs.aciBinary, rhs.aciBinary)
)
) || (
!lhs.e164.isEmpty() && Objects.equals(lhs.e164, rhs.e164)
) || (!lhs.pni.isEmpty() && Objects.equals(lhs.pni, rhs.pni))) {
) || (
(!lhs.pni.isEmpty() && Objects.equals(lhs.pni, rhs.pni) && lhs.pniBinary == rhs.pniBinary)
|| (lhs.pniBinary.size() != 0 && Objects.equals(lhs.pniBinary, rhs.pniBinary))
)) {
return 0;
} else {
return 1;

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

@ -8,7 +8,7 @@ public class BaseConfig {
public static final String PROJECT_VERSION = BaseConfig.class.getPackage().getImplementationVersion();
static final String USER_AGENT_SIGNAL_ANDROID = Optional.ofNullable(System.getenv("SIGNAL_CLI_USER_AGENT"))
.orElse("Signal-Android/7.62.0");
.orElse("Signal-Android/7.63.2");
static final String USER_AGENT_SIGNAL_CLI = PROJECT_NAME == null
? "signal-cli"
: PROJECT_NAME + "/" + PROJECT_VERSION;