webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-08-29 10:30:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update dependencies

Browse source
This commit is contained in:
AsamK 2022-09-02 22:33:48 +02:00
parent c7aa9834a9
commit 2e8e81a926
9 changed files with 61 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/build.gradle.kts
View file

@ -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")
}

7
lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
View file

@ -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;

4
lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
View file

@ -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);

13
lib/src/main/java/org/asamk/signal/manager/util/MessageCacheUtils.java
View file

@ -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);