From 2c5a70cc47301bf0f049eb2633976460d3ced1b7 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 9 Aug 2020 15:11:09 +0200
Subject: [PATCH] Improve stderr output

---
 .../org/asamk/signal/commands/ListIdentitiesCommand.java   | 2 +-
 .../org/asamk/signal/commands/UpdateContactCommand.java    | 7 ++++---
 src/main/java/org/asamk/signal/manager/Manager.java        | 4 +---
 .../org/asamk/signal/storage/protocol/JsonPreKeyStore.java | 2 +-
 .../asamk/signal/storage/protocol/JsonSessionStore.java    | 2 +-
 .../signal/storage/protocol/JsonSignedPreKeyStore.java     | 2 +-
 6 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java b/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java
index 529c7c30..edb67c76 100644
--- 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) {
-                System.out.println("Invalid number: " + e.getMessage());
+                System.err.println("Invalid number: " + e.getMessage());
             }
         }
         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 ae84893d..d7fa3893 100644
--- 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 java.io.IOException;
-
 import org.asamk.signal.manager.Manager;
 import org.whispersystems.signalservice.api.util.InvalidNumberException;
 
+import java.io.IOException;
+
 public class UpdateContactCommand implements LocalCommand {
 
     @Override
@@ -42,7 +42,8 @@ public class UpdateContactCommand implements LocalCommand {
                 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;
diff --git a/src/main/java/org/asamk/signal/manager/Manager.java b/src/main/java/org/asamk/signal/manager/Manager.java
index 7d13eddb..851b7820 100644
--- 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());
                 }
-                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);
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 16248c02..d09b5d02 100644
--- 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) {
-                        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 5ce99742..1505f1b0 100644
--- 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) {
-                        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 edad8e7e..3927b98d 100644
--- 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) {
-                        System.out.println(String.format("Error while decoding prekey for: %s", preKeyId));
+                        System.err.println(String.format("Error while decoding prekey for: %s", preKeyId));
                     }
                 }
             }
-- 
2.50.1