Improve stderr output

diff --git a/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java b/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java
index 529c7c30cdadf564617fe4fccee1c00c4f9a2020..edb67c76a332216e3a48258477acac5096892d77 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java
@@ -43,7 +43,7 @@ public class ListIdentitiesCommand implements LocalCommand {
                     printIdentityFingerprint(m, id);
                 }
             } catch (InvalidNumberException e) {
                     printIdentityFingerprint(m, id);
                 }
             } catch (InvalidNumberException e) {

-                System.out.println("Invalid number: " + e.getMessage());
+                System.err.println("Invalid number: " + e.getMessage());

             }
         }
         return 0;
             }
         }
         return 0;

diff --git a/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java b/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java
index ae84893d9c542a7e1552a67ffd152b939084c63d..d7fa38933130dfeb2ac74598f69737b02c8b438e 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java
@@ -3,11 +3,11 @@ package org.asamk.signal.commands;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 

-import java.io.IOException;
-

 import org.asamk.signal.manager.Manager;
 import org.whispersystems.signalservice.api.util.InvalidNumberException;
 
 import org.asamk.signal.manager.Manager;
 import org.whispersystems.signalservice.api.util.InvalidNumberException;
 

+import java.io.IOException;
+

 public class UpdateContactCommand implements LocalCommand {
 
     @Override
 public class UpdateContactCommand implements LocalCommand {
 
     @Override


@@ -42,7 +42,8 @@ public class UpdateContactCommand implements LocalCommand {
                 m.setExpirationTimer(number, expiration);
             }
         } catch (InvalidNumberException e) {
                 m.setExpirationTimer(number, expiration);
             }
         } catch (InvalidNumberException e) {

-            System.out.println("Invalid contact number: " + e.getMessage());
+            System.err.println("Invalid contact number: " + e.getMessage());
+            return 1;

         } catch (IOException e) {
             System.err.println("Update contact error: " + e.getMessage());
             return 3;
         } catch (IOException e) {
             System.err.println("Update contact error: " + e.getMessage());
             return 3;

diff --git a/src/main/java/org/asamk/signal/manager/Manager.java b/src/main/java/org/asamk/signal/manager/Manager.java
index 7d13eddbc8c7056c5ccc39b79ec28f090a150d92..851b7820ed6f308b5f4eca20014544ae5777ca60 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/src/main/java/org/asamk/signal/manager/Manager.java
@@ -556,9 +556,7 @@ public class Manager implements Closeable {
                 for (ContactTokenDetails contact : contacts) {
                     newE164Members.remove(contact.getNumber());
                 }
                 for (ContactTokenDetails contact : contacts) {
                     newE164Members.remove(contact.getNumber());
                 }

-                System.err.println("Failed to add members " + Util.join(", ", newE164Members) + " to group: Not registered on Signal");
-                System.err.println("Aborting…");
-                System.exit(1);
+                throw new IOException("Failed to add members " + Util.join(", ", newE164Members) + " to group: Not registered on Signal");

             }
 
             g.addMembers(members);
             }
 
             g.addMembers(members);

diff --git a/src/main/java/org/asamk/signal/storage/protocol/JsonPreKeyStore.java b/src/main/java/org/asamk/signal/storage/protocol/JsonPreKeyStore.java
index 16248c02c8fcf2a12f5f0e7debe96dfa6711c11b..d09b5d028249ed10903f0dd252b56c375b115227 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/protocol/JsonPreKeyStore.java
+++ b/src/main/java/org/asamk/signal/storage/protocol/JsonPreKeyStore.java
@@ -70,7 +70,7 @@ class JsonPreKeyStore implements PreKeyStore {
                     try {
                         preKeyMap.put(preKeyId, Base64.decode(preKey.get("record").asText()));
                     } catch (IOException e) {
                     try {
                         preKeyMap.put(preKeyId, Base64.decode(preKey.get("record").asText()));
                     } catch (IOException e) {

-                        System.out.println(String.format("Error while decoding prekey for: %s", preKeyId));
+                        System.err.println(String.format("Error while decoding prekey for: %s", preKeyId));

                     }
                 }
             }
                     }
                 }
             }

diff --git a/src/main/java/org/asamk/signal/storage/protocol/JsonSessionStore.java b/src/main/java/org/asamk/signal/storage/protocol/JsonSessionStore.java
index 5ce99742eedb3b019dc797b4592e253feb523d25..1505f1b0db350db7f83bb70cbbaca69af6ae12ad 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/protocol/JsonSessionStore.java
+++ b/src/main/java/org/asamk/signal/storage/protocol/JsonSessionStore.java
@@ -153,7 +153,7 @@ class JsonSessionStore implements SessionStore {
                         SessionInfo sessionInfo = new SessionInfo(serviceAddress, deviceId, Base64.decode(record));
                         sessionStore.sessions.add(sessionInfo);
                     } catch (IOException e) {
                         SessionInfo sessionInfo = new SessionInfo(serviceAddress, deviceId, Base64.decode(record));
                         sessionStore.sessions.add(sessionInfo);
                     } catch (IOException e) {

-                        System.out.println(String.format("Error while decoding session for: %s", sessionName));
+                        System.err.println(String.format("Error while decoding session for: %s", sessionName));

                     }
                 }
             }
                     }
                 }
             }

diff --git a/src/main/java/org/asamk/signal/storage/protocol/JsonSignedPreKeyStore.java b/src/main/java/org/asamk/signal/storage/protocol/JsonSignedPreKeyStore.java
index edad8e7ec727974193b01f9b33fd5ba6e4e5848e..3927b98d93cf470ae9ee651db1f0e11b1b1ea7fc 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/protocol/JsonSignedPreKeyStore.java
+++ b/src/main/java/org/asamk/signal/storage/protocol/JsonSignedPreKeyStore.java
@@ -87,7 +87,7 @@ class JsonSignedPreKeyStore implements SignedPreKeyStore {
                     try {
                         preKeyMap.put(preKeyId, Base64.decode(preKey.get("record").asText()));
                     } catch (IOException e) {
                     try {
                         preKeyMap.put(preKeyId, Base64.decode(preKey.get("record").asText()));
                     } catch (IOException e) {

-                        System.out.println(String.format("Error while decoding prekey for: %s", preKeyId));
+                        System.err.println(String.format("Error while decoding prekey for: %s", preKeyId));

                     }
                 }
             }
                     }
                 }
             }