Improve logging for provisioning

diff --git a/src/main/java/org/asamk/signal/manager/ProvisioningManager.java b/src/main/java/org/asamk/signal/manager/ProvisioningManager.java
index 0648c0d38b6b500e8101ace2e6aeb27192248dad..6b8a37977204721102e308f560102fd66ea773b3 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/ProvisioningManager.java
+++ b/src/main/java/org/asamk/signal/manager/ProvisioningManager.java
@@ -20,6 +20,8 @@ import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.util.KeyUtils;
 import org.signal.zkgroup.InvalidInputException;
 import org.signal.zkgroup.profiles.ProfileKey;
 import org.asamk.signal.manager.util.KeyUtils;
 import org.signal.zkgroup.InvalidInputException;
 import org.signal.zkgroup.profiles.ProfileKey;

+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 import org.whispersystems.libsignal.IdentityKeyPair;
 import org.whispersystems.libsignal.InvalidKeyException;
 import org.whispersystems.libsignal.util.KeyHelper;
 import org.whispersystems.libsignal.IdentityKeyPair;
 import org.whispersystems.libsignal.InvalidKeyException;
 import org.whispersystems.libsignal.util.KeyHelper;


@@ -38,6 +40,8 @@ import java.util.concurrent.TimeoutException;
 
 public class ProvisioningManager {
 
 
 public class ProvisioningManager {
 

+    private final static Logger logger = LoggerFactory.getLogger(Manager.class);
+

     private final PathConfig pathConfig;
     private final SignalServiceConfiguration serviceConfiguration;
     private final String userAgent;
     private final PathConfig pathConfig;
     private final SignalServiceConfiguration serviceConfiguration;
     private final String userAgent;


@@ -117,12 +121,22 @@ public class ProvisioningManager {
 
             try (Manager m = new Manager(account, pathConfig, serviceConfiguration, userAgent)) {
 
 
             try (Manager m = new Manager(account, pathConfig, serviceConfiguration, userAgent)) {
 

-                m.refreshPreKeys();
-
-                m.requestSyncGroups();
-                m.requestSyncContacts();
-                m.requestSyncBlocked();
-                m.requestSyncConfiguration();
+                try {
+                    m.refreshPreKeys();
+                } catch (Exception e) {
+                    logger.error("Failed to refresh prekeys.");
+                    throw e;
+                }
+
+                try {
+                    m.requestSyncGroups();
+                    m.requestSyncContacts();
+                    m.requestSyncBlocked();
+                    m.requestSyncConfiguration();
+                } catch (Exception e) {
+                    logger.error("Failed to request sync messages from linked device.");
+                    throw e;
+                }

 
                 m.close(false);
             }
 
                 m.close(false);
             }

diff --git a/src/main/java/org/asamk/signal/manager/RegistrationManager.java b/src/main/java/org/asamk/signal/manager/RegistrationManager.java
index e740bb914cf1f36c5a39f203e85517d5c269062a..b3df9376adee40f9e1ba69dd302836d9fee8f018 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/RegistrationManager.java
+++ b/src/main/java/org/asamk/signal/manager/RegistrationManager.java
@@ -112,7 +112,6 @@ public class RegistrationManager implements AutoCloseable {
             accountManager.requestSmsVerificationCode(false, Optional.fromNullable(captcha), Optional.absent());
         }
 
             accountManager.requestSmsVerificationCode(false, Optional.fromNullable(captcha), Optional.absent());
         }
 

-        account.setRegistered(false);

         account.save();
     }
 
         account.save();
     }