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

Update libsignal-service-java

Browse Source
This commit is contained in:
AsamK 2024-01-14 11:42:48 +01:00
parent 30e8e36635
commit be9efb9a25
5 changed files with 37 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
View File

@ -716,7 +716,6 @@ public record MessageEnvelope(
Optional<Busy> busy, Optional<Busy> busy,
List<IceUpdate> iceUpdate, List<IceUpdate> iceUpdate,
Optional<Opaque> opaque, Optional<Opaque> opaque,
boolean isMultiRing,
boolean isUrgent boolean isUrgent
) { ) {
@ -732,17 +731,13 @@ public record MessageEnvelope(
.map(m -> m.stream().map(IceUpdate::from).toList()) .map(m -> m.stream().map(IceUpdate::from).toList())
.orElse(List.of()), .orElse(List.of()),
callMessage.getOpaqueMessage().map(Opaque::from), callMessage.getOpaqueMessage().map(Opaque::from),
callMessage.isMultiRing(),
callMessage.isUrgent()); callMessage.isUrgent());
} }
public record Offer(long id, String sdp, Type type, byte[] opaque) { public record Offer(long id, Type type, byte[] opaque) {
static Offer from(OfferMessage offerMessage) { static Offer from(OfferMessage offerMessage) {
return new Offer(offerMessage.getId(), return new Offer(offerMessage.getId(), Type.from(offerMessage.getType()), offerMessage.getOpaque());
offerMessage.getSdp(),
Type.from(offerMessage.getType()),
offerMessage.getOpaque());
} }
public enum Type { public enum Type {
@ -758,10 +753,10 @@ public record MessageEnvelope(
} }
} }
public record Answer(long id, String sdp, byte[] opaque) { public record Answer(long id, byte[] opaque) {
static Answer from(AnswerMessage answerMessage) { static Answer from(AnswerMessage answerMessage) {
return new Answer(answerMessage.getId(), answerMessage.getSdp(), answerMessage.getOpaque()); return new Answer(answerMessage.getId(), answerMessage.getOpaque());
} }
} }
@ -799,10 +794,10 @@ public record MessageEnvelope(
} }
} }
public record IceUpdate(long id, String sdp, byte[] opaque) { public record IceUpdate(long id, byte[] opaque) {
static IceUpdate from(IceUpdateMessage iceUpdateMessage) { static IceUpdate from(IceUpdateMessage iceUpdateMessage) {
return new IceUpdate(iceUpdateMessage.getId(), iceUpdateMessage.getSdp(), iceUpdateMessage.getOpaque()); return new IceUpdate(iceUpdateMessage.getId(), iceUpdateMessage.getOpaque());
} }
} }

30
lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
View File

@ -320,7 +320,11 @@ public class AccountHelper {
if (currentUsername != null) { if (currentUsername != null) {
final var currentNickname = currentUsername.substring(0, currentUsername.indexOf('.')); final var currentNickname = currentUsername.substring(0, currentUsername.indexOf('.'));
if (currentNickname.equals(nickname)) { if (currentNickname.equals(nickname)) {
refreshCurrentUsername(); try {
refreshCurrentUsername();
} catch (IOException | BaseUsernameException e) {
logger.warn("[reserveUsername] Failed to refresh current username, trying to claim new username");
}
return; return;
} }
} }
@ -341,11 +345,11 @@ public class AccountHelper {
logger.debug("[reserveUsername] Successfully reserved username."); logger.debug("[reserveUsername] Successfully reserved username.");
final var username = candidates.get(hashIndex); final var username = candidates.get(hashIndex);
dependencies.getAccountManager().confirmUsername(username.getUsername(), response); final var linkComponents = dependencies.getAccountManager().confirmUsernameAndCreateNewLink(username);
account.setUsername(username.getUsername()); account.setUsername(username.getUsername());
account.setUsernameLink(linkComponents);
account.getRecipientStore().resolveSelfRecipientTrusted(account.getSelfRecipientAddress()); account.getRecipientStore().resolveSelfRecipientTrusted(account.getSelfRecipientAddress());
logger.debug("[confirmUsername] Successfully confirmed username."); logger.debug("[confirmUsername] Successfully confirmed username.");
tryToSetUsernameLink(username);
} }
public void refreshCurrentUsername() throws IOException, BaseUsernameException { public void refreshCurrentUsername() throws IOException, BaseUsernameException {
@ -386,12 +390,20 @@ public class AccountHelper {
} }
private void tryReserveConfirmUsername(final Username username) throws IOException { private void tryReserveConfirmUsername(final Username username) throws IOException {
final var response = dependencies.getAccountManager() final var usernameLink = account.getUsernameLink();
.reserveUsername(List.of(Base64.encodeUrlSafeWithoutPadding(username.getHash())));
logger.debug("[reserveUsername] Successfully reserved existing username."); if (usernameLink == null) {
dependencies.getAccountManager().confirmUsername(username.getUsername(), response); dependencies.getAccountManager()
logger.debug("[confirmUsername] Successfully confirmed existing username."); .reserveUsername(List.of(Base64.encodeUrlSafeWithoutPadding(username.getHash())));
tryToSetUsernameLink(username); logger.debug("[reserveUsername] Successfully reserved existing username.");
final var linkComponents = dependencies.getAccountManager().confirmUsernameAndCreateNewLink(username);
account.setUsernameLink(linkComponents);
logger.debug("[confirmUsername] Successfully confirmed existing username.");
} else {
final var linkComponents = dependencies.getAccountManager().reclaimUsernameAndLink(username, usernameLink);
account.setUsernameLink(linkComponents);
logger.debug("[confirmUsername] Successfully reclaimed existing username and link.");
}
} }
private void tryToSetUsernameLink(Username username) { private void tryToSetUsernameLink(Username username) {

3
settings.gradle.kts
View File

@ -15,8 +15,7 @@ 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_92")
library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_91")
library("sqlite", "org.xerial", "sqlite-jdbc").version("3.44.1.0") library("sqlite", "org.xerial", "sqlite-jdbc").version("3.44.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")

6
src/main/java/org/asamk/signal/ReceiveMessageHandler.java
View File

@ -273,7 +273,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
} }
if (callMessage.answer().isPresent()) { if (callMessage.answer().isPresent()) {
var answerMessage = callMessage.answer().get(); var answerMessage = callMessage.answer().get();
writer.println("Answer message: {}, sdp: {})", answerMessage.id(), answerMessage.sdp()); writer.println("Answer message: {}, opaque length: {})", answerMessage.id(), answerMessage.opaque().length);
} }
if (callMessage.busy().isPresent()) { if (callMessage.busy().isPresent()) {
var busyMessage = callMessage.busy().get(); var busyMessage = callMessage.busy().get();
@ -287,12 +287,12 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
writer.println("Ice update messages:"); writer.println("Ice update messages:");
var iceUpdateMessages = callMessage.iceUpdate(); var iceUpdateMessages = callMessage.iceUpdate();
for (var iceUpdateMessage : iceUpdateMessages) { for (var iceUpdateMessage : iceUpdateMessages) {
writer.println("- {}, sdp: {}", iceUpdateMessage.id(), iceUpdateMessage.sdp()); writer.println("- {}, opaque length: {}", iceUpdateMessage.id(), iceUpdateMessage.opaque().length);
} }
} }
if (callMessage.offer().isPresent()) { if (callMessage.offer().isPresent()) {
var offerMessage = callMessage.offer().get(); var offerMessage = callMessage.offer().get();
writer.println("Offer message: {}, sdp: {}", offerMessage.id(), offerMessage.sdp()); writer.println("Offer message: {}, opaque length: {}", offerMessage.id(), offerMessage.opaque().length);
} }
if (callMessage.opaque().isPresent()) { if (callMessage.opaque().isPresent()) {
final var opaqueMessage = callMessage.opaque().get(); final var opaqueMessage = callMessage.opaque().get();

17
src/main/java/org/asamk/signal/json/JsonCallMessage.java
View File

@ -23,20 +23,17 @@ record JsonCallMessage(
callMessage.iceUpdate().stream().map(IceUpdate::from).toList()); callMessage.iceUpdate().stream().map(IceUpdate::from).toList());
} }
record Offer(long id, String sdp, String type, String opaque) { record Offer(long id, String type, String opaque) {
public static Offer from(final MessageEnvelope.Call.Offer offer) { public static Offer from(final MessageEnvelope.Call.Offer offer) {
return new Offer(offer.id(), return new Offer(offer.id(), offer.type().name(), Base64.getEncoder().encodeToString(offer.opaque()));
offer.sdp(),
offer.type().name(),
Base64.getEncoder().encodeToString(offer.opaque()));
} }
} }
public record Answer(long id, String sdp, String opaque) { public record Answer(long id, String opaque) {
public static Answer from(final MessageEnvelope.Call.Answer answer) { public static Answer from(final MessageEnvelope.Call.Answer answer) {
return new Answer(answer.id(), answer.sdp(), Base64.getEncoder().encodeToString(answer.opaque())); return new Answer(answer.id(), Base64.getEncoder().encodeToString(answer.opaque()));
} }
} }
@ -54,12 +51,10 @@ record JsonCallMessage(
} }
} }
public record IceUpdate(long id, String sdp, String opaque) { public record IceUpdate(long id, String opaque) {
public static IceUpdate from(final MessageEnvelope.Call.IceUpdate iceUpdate) { public static IceUpdate from(final MessageEnvelope.Call.IceUpdate iceUpdate) {
return new IceUpdate(iceUpdate.id(), return new IceUpdate(iceUpdate.id(), Base64.getEncoder().encodeToString(iceUpdate.opaque()));
iceUpdate.sdp(),
Base64.getEncoder().encodeToString(iceUpdate.opaque()));
} }
} }
} }