Request message resend if incoming message can't be decrypted

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

diff --git a/lib/src/main/java/org/asamk/signal/manager/Manager.java b/lib/src/main/java/org/asamk/signal/manager/Manager.java
index a7a691cc4ce4a93ecfad4e64963eafad43c78ae5..0570037964adf38d4a3ee957ee09282f7adb9ac7 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java
@@ -40,6 +40,7 @@ import org.asamk.signal.manager.helper.GroupHelper;
 import org.asamk.signal.manager.helper.GroupV2Helper;
 import org.asamk.signal.manager.helper.IncomingMessageHandler;
 import org.asamk.signal.manager.helper.PinHelper;
+import org.asamk.signal.manager.helper.PreKeyHelper;
 import org.asamk.signal.manager.helper.ProfileHelper;
 import org.asamk.signal.manager.helper.SendHelper;
 import org.asamk.signal.manager.helper.StorageHelper;
@@ -62,14 +63,11 @@ import org.asamk.signal.manager.util.Utils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.libsignal.IdentityKey;
-import org.whispersystems.libsignal.IdentityKeyPair;
 import org.whispersystems.libsignal.InvalidKeyException;
 import org.whispersystems.libsignal.ecc.ECPublicKey;
 import org.whispersystems.libsignal.fingerprint.Fingerprint;
 import org.whispersystems.libsignal.fingerprint.FingerprintParsingException;
 import org.whispersystems.libsignal.fingerprint.FingerprintVersionMismatchException;
-import org.whispersystems.libsignal.state.PreKeyRecord;
-import org.whispersystems.libsignal.state.SignedPreKeyRecord;
 import org.whispersystems.libsignal.util.Pair;
 import org.whispersystems.libsignal.util.guava.Optional;
 import org.whispersystems.signalservice.api.SignalSessionLock;
@@ -141,6 +139,7 @@ public class Manager implements Closeable {
     private final GroupHelper groupHelper;
     private final ContactHelper contactHelper;
     private final IncomingMessageHandler incomingMessageHandler;
+    private final PreKeyHelper preKeyHelper;
 
     private final Context context;
     private boolean hasCaughtUpWithOldMessages = false;
@@ -219,6 +218,7 @@ public class Manager implements Closeable {
                 groupHelper,
                 avatarStore,
                 this::resolveSignalServiceAddress);
+        preKeyHelper = new PreKeyHelper(account, dependencies);
 
         this.context = new Context(account,
                 dependencies,
@@ -227,7 +227,8 @@ public class Manager implements Closeable {
                 groupHelper,
                 syncHelper,
                 profileHelper,
-                storageHelper);
+                storageHelper,
+                preKeyHelper);
         var jobExecutor = new JobExecutor(context);
 
         this.incomingMessageHandler = new IncomingMessageHandler(account,
@@ -238,6 +239,7 @@ public class Manager implements Closeable {
                 contactHelper,
                 attachmentHelper,
                 syncHelper,
+                this::getRecipientProfile,
                 jobExecutor);
     }
 
@@ -249,10 +251,6 @@ public class Manager implements Closeable {
         return account.getSelfRecipientId();
     }
 
-    private IdentityKeyPair getIdentityKeyPair() {
-        return account.getIdentityKeyPair();
-    }
-
     public int getDeviceId() {
         return account.getDeviceId();
     }
@@ -309,9 +307,7 @@ public class Manager implements Closeable {
                         days);
             }
         }
-        if (dependencies.getAccountManager().getPreKeysCount() < ServiceConfig.PREKEY_MINIMUM_COUNT) {
-            refreshPreKeys();
-        }
+        preKeyHelper.refreshPreKeysIfNecessary();
         if (account.getUuid() == null) {
             account.setUuid(dependencies.getAccountManager().getOwnUuid());
         }
@@ -405,6 +401,10 @@ public class Manager implements Closeable {
         account.setRegistered(false);
     }
 
+    public void submitRateLimitRecaptchaChallenge(String challenge, String captcha) throws IOException {
+        dependencies.getAccountManager().submitRateLimitRecaptchaChallenge(challenge, captcha);
+    }
+
     public List<Device> getLinkedDevices() throws IOException {
         var devices = dependencies.getAccountManager().getDevices();
         account.setMultiDevice(devices.size() > 1);
@@ -435,7 +435,7 @@ public class Manager implements Closeable {
     }
 
     private void addDevice(String deviceIdentifier, ECPublicKey deviceKey) throws IOException, InvalidKeyException {
-        var identityKeyPair = getIdentityKeyPair();
+        var identityKeyPair = account.getIdentityKeyPair();
         var verificationCode = dependencies.getAccountManager().getNewDeviceVerificationCode();
 
         dependencies.getAccountManager()
@@ -468,29 +468,7 @@ public class Manager implements Closeable {
     }
 
     void refreshPreKeys() throws IOException {
-        var oneTimePreKeys = generatePreKeys();
-        final var identityKeyPair = getIdentityKeyPair();
-        var signedPreKeyRecord = generateSignedPreKey(identityKeyPair);
-
-        dependencies.getAccountManager().setPreKeys(identityKeyPair.getPublicKey(), signedPreKeyRecord, oneTimePreKeys);
-    }
-
-    private List<PreKeyRecord> generatePreKeys() {
-        final var offset = account.getPreKeyIdOffset();
-
-        var records = KeyUtils.generatePreKeyRecords(offset, ServiceConfig.PREKEY_BATCH_SIZE);
-        account.addPreKeys(records);
-
-        return records;
-    }
-
-    private SignedPreKeyRecord generateSignedPreKey(IdentityKeyPair identityKeyPair) {
-        final var signedPreKeyId = account.getNextSignedPreKeyId();
-
-        var record = KeyUtils.generateSignedPreKeyRecord(identityKeyPair, signedPreKeyId);
-        account.addSignedPreKey(record);
-
-        return record;
+        preKeyHelper.refreshPreKeys();
     }
 
     public Profile getRecipientProfile(RecipientId recipientId) {
@@ -899,11 +877,11 @@ public class Manager implements Closeable {
                     // store message on disk, before acknowledging receipt to the server
                     cachedMessage[0] = account.getMessageCache().cacheMessage(envelope1, recipientId);
                 });
-                logger.debug("New message received from server");
                 if (result.isPresent()) {
                     envelope = result.get();
+                    logger.debug("New message received from server");
                 } else {
-                    // Received indicator that server queue is empty
+                    logger.debug("Received indicator that server queue is empty");
                     handleQueuedActions(queuedActions);
                     queuedActions.clear();
 
@@ -1171,7 +1149,7 @@ public class Manager implements Closeable {
     ) {
         return Utils.computeSafetyNumber(capabilities.isUuid(),
                 account.getSelfAddress(),
-                getIdentityKeyPair().getPublicKey(),
+                account.getIdentityKeyPair().getPublicKey(),
                 theirAddress,
                 theirIdentityKey);
     }