Make send behavior more deterministic if there are unregistered recipients

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

diff --git a/lib/src/main/java/org/asamk/signal/manager/UntrustedIdentityException.java b/lib/src/main/java/org/asamk/signal/manager/UntrustedIdentityException.java
index 3b90b9e4e27ff3b6c6523f0c970ffad8e36ffd66..318afd264395be20a533ed2ed0bba5e0c87ea22a 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/UntrustedIdentityException.java
+++ b/lib/src/main/java/org/asamk/signal/manager/UntrustedIdentityException.java
@@ -1,27 +1,23 @@
 package org.asamk.signal.manager;
 
-import org.whispersystems.signalservice.api.push.SignalServiceAddress;
+import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 
 public class UntrustedIdentityException extends Exception {
 
-    private final SignalServiceAddress sender;
-    private final Integer senderDevice;
+    private final RecipientAddress sender;
+    private final int senderDevice;
 
-    public UntrustedIdentityException(final SignalServiceAddress sender) {
-        this(sender, null);
-    }
-
-    public UntrustedIdentityException(final SignalServiceAddress sender, final Integer senderDevice) {
+    public UntrustedIdentityException(final RecipientAddress sender, final int senderDevice) {
         super("Untrusted identity: " + sender.getIdentifier());
         this.sender = sender;
         this.senderDevice = senderDevice;
     }
 
-    public SignalServiceAddress getSender() {
+    public RecipientAddress getSender() {
         return sender;
     }
 
-    public Integer getSenderDevice() {
+    public int getSenderDevice() {
         return senderDevice;
     }
 }