Improve behavior, when authorization fails

[signal-cli] / src / main / java / org / asamk / signal / Main.java

diff --git a/src/main/java/org/asamk/signal/Main.java b/src/main/java/org/asamk/signal/Main.java
index 81065c778c894afca0c43f004f6842214ff55b61..5e37bf3b539be19cc00c7a4dfb0841cbf96a74f9 100644 (file)
--- a/src/main/java/org/asamk/signal/Main.java
+++ b/src/main/java/org/asamk/signal/Main.java
@@ -38,6 +38,7 @@ import org.asamk.signal.util.SecurityProvider;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.freedesktop.dbus.DBusConnection;
 import org.freedesktop.dbus.exceptions.DBusException;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.freedesktop.dbus.DBusConnection;
 import org.freedesktop.dbus.exceptions.DBusException;

+import org.whispersystems.signalservice.api.push.exceptions.AuthorizationFailedException;

 import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
 
 import java.io.File;
 import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
 
 import java.io.File;


@@ -105,6 +106,12 @@ public class Main {
                 ts = m;
                 try {
                     m.init();
                 ts = m;
                 try {
                     m.init();

+                } catch (AuthorizationFailedException e) {
+                    if (!"register".equals(ns.getString("command"))) {
+                        // Register command should still be possible, if current authorization fails
+                        System.err.println("Authorization failed, was the number registered elsewhere?");
+                        return 2;
+                    }

                 } catch (Exception e) {
                     System.err.println("Error loading state file: " + e.getMessage());
                     return 2;
                 } catch (Exception e) {
                     System.err.println("Error loading state file: " + e.getMessage());
                     return 2;