Refactor receive api

[signal-cli] / lib / src / main / java / org / asamk / signal / manager / helper / SendHelper.java

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
index 6c0fb2e9cbde4d3974679f00e7370d0317f6ab39..dc912634b11530ed91134ad123aa20966e30f553 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
@@ -153,7 +153,7 @@ public class SendHelper {
         try {
             messageSender.sendReceipt(address, unidentifiedAccessHelper.getAccessFor(recipientId), receiptMessage);
         } catch (org.whispersystems.signalservice.api.crypto.UntrustedIdentityException e) {
-            throw new UntrustedIdentityException(address);
+            throw new UntrustedIdentityException(account.getRecipientStore().resolveRecipientAddress(recipientId));
         }
     }
 
@@ -172,7 +172,7 @@ public class SendHelper {
                     groupId.transform(GroupId::serialize),
                     errorMessage);
         } catch (org.whispersystems.signalservice.api.crypto.UntrustedIdentityException e) {
-            throw new UntrustedIdentityException(address);
+            throw new UntrustedIdentityException(account.getRecipientStore().resolveRecipientAddress(recipientId));
         }
     }
 
@@ -229,7 +229,7 @@ public class SendHelper {
                 messageSender.sendTyping(newAddress, unidentifiedAccessHelper.getAccessFor(newRecipientId), message);
             }
         } catch (org.whispersystems.signalservice.api.crypto.UntrustedIdentityException e) {
-            throw new UntrustedIdentityException(address);
+            throw new UntrustedIdentityException(account.getRecipientStore().resolveRecipientAddress(recipientId));
         }
     }