Use safety numbers with ACI by default

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java
index b9281889dab84a8a1a313e7a1f2fd5e3615e39c8..975d517923e6e69c2f1dca10ac8b665cf2da4032 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java
@@ -57,33 +57,28 @@ public class IdentityHelper {
     }
 
     public String computeSafetyNumber(ServiceId serviceId, IdentityKey theirIdentityKey) {
     }
 
     public String computeSafetyNumber(ServiceId serviceId, IdentityKey theirIdentityKey) {

-        final var fingerprint = computeSafetyNumberFingerprint(serviceId, theirIdentityKey, false);
+        final var fingerprint = computeSafetyNumberFingerprint(serviceId, theirIdentityKey);

         return fingerprint == null ? null : fingerprint.getDisplayableFingerprint().getDisplayText();
     }
 
     public ScannableFingerprint computeSafetyNumberForScanning(ServiceId serviceId, IdentityKey theirIdentityKey) {
         return fingerprint == null ? null : fingerprint.getDisplayableFingerprint().getDisplayText();
     }
 
     public ScannableFingerprint computeSafetyNumberForScanning(ServiceId serviceId, IdentityKey theirIdentityKey) {

-        var fingerprint = computeSafetyNumberFingerprint(serviceId, theirIdentityKey, false);
-        if (fingerprint == null) {
-            fingerprint = computeSafetyNumberFingerprint(serviceId, theirIdentityKey, true);
-        }
+        var fingerprint = computeSafetyNumberFingerprint(serviceId, theirIdentityKey);

         return fingerprint == null ? null : fingerprint.getScannableFingerprint();
     }
 
     private Fingerprint computeSafetyNumberFingerprint(
         return fingerprint == null ? null : fingerprint.getScannableFingerprint();
     }
 
     private Fingerprint computeSafetyNumberFingerprint(

-            final ServiceId serviceId, final IdentityKey theirIdentityKey, boolean useServiceId
+            final ServiceId serviceId, final IdentityKey theirIdentityKey

     ) {
     ) {

-        final var recipientId = account.getRecipientResolver().resolveRecipient(serviceId);
-        final var address = account.getRecipientAddressResolver().resolveRecipientAddress(recipientId);
-
-        if (useServiceId) {
-            if (serviceId.isUnknown()) {
-                return null;
-            }
+        if (!serviceId.isUnknown()) {

             return Utils.computeSafetyNumberForUuid(account.getAci(),
                     account.getAciIdentityKeyPair().getPublicKey(),
                     serviceId,
                     theirIdentityKey);
         }
             return Utils.computeSafetyNumberForUuid(account.getAci(),
                     account.getAciIdentityKeyPair().getPublicKey(),
                     serviceId,
                     theirIdentityKey);
         }

+
+        final var recipientId = account.getRecipientResolver().resolveRecipient(serviceId);
+        final var address = account.getRecipientAddressResolver().resolveRecipientAddress(recipientId);
+

         if (address.number().isEmpty()) {
             return null;
         }
         if (address.number().isEmpty()) {
             return null;
         }