From 3f7d8c60b9dc48d4aa9d81e065c0cf189af4d070 Mon Sep 17 00:00:00 2001 From: AsamK Date: Wed, 19 Oct 2022 17:51:12 +0200 Subject: [PATCH] Add workaround for #1045 --- .../signal/manager/helper/IncomingMessageHandler.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java index 69ad65f7..80cf7687 100644 --- a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java +++ b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java @@ -144,7 +144,14 @@ public final class IncomingMessageHandler { } else { final var senderProfile = context.getProfileHelper().getRecipientProfile(sender); final var selfProfile = context.getProfileHelper().getSelfProfile(); - final var serviceId = ServiceId.parseOrNull(e.getSender()); + var serviceId = ServiceId.parseOrNull(e.getSender()); + if (serviceId == null) { + // Workaround for libsignal-client issue #492 + serviceId = account.getRecipientAddressResolver() + .resolveRecipientAddress(sender) + .serviceId() + .orElse(null); + } if (serviceId != null) { final var isSelf = sender.equals(account.getSelfRecipientId()) && e.getSenderDevice() == account.getDeviceId(); -- 2.50.1