Fix exceptions to work over dbus

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

diff --git a/src/main/java/org/asamk/textsecure/Main.java b/src/main/java/org/asamk/textsecure/Main.java
index 265059f70d9a705a81ce75361912756767f6e61c..7213a945211398409cb3607933764c3cc4a5c6c0 100644 (file)
--- a/src/main/java/org/asamk/textsecure/Main.java
+++ b/src/main/java/org/asamk/textsecure/Main.java
@@ -180,7 +180,7 @@ public class Main {
                         } catch (GroupNotFoundException e) {
                             handleGroupNotFoundException(e);
                         } catch (AttachmentInvalidException e) {
-                            System.err.println("Failed to add attachment (\"" + e.getAttachment() + "\"): " + e.getMessage());
+                            System.err.println("Failed to add attachment: " + e.getMessage());
                             System.err.println("Aborting sending.");
                             System.exit(1);
                         }
@@ -259,7 +259,7 @@ public class Main {
                     } catch (IOException e) {
                         handleIOException(e);
                     } catch (AttachmentInvalidException e) {
-                        System.err.println("Failed to add avatar attachment (\"" + e.getAttachment() + ") for group\": " + e.getMessage());
+                        System.err.println("Failed to add avatar attachment for group\": " + e.getMessage());
                         System.err.println("Aborting sending.");
                         System.exit(1);
                     } catch (GroupNotFoundException e) {
@@ -288,8 +288,8 @@ public class Main {
                                 busType = DBusConnection.SESSION;
                             }
                             conn = DBusConnection.getConnection(busType);
-                            conn.requestBusName(TEXTSECURE_BUSNAME);
                             conn.exportObject(TEXTSECURE_OBJECTPATH, m);
+                            conn.requestBusName(TEXTSECURE_BUSNAME);
                         } catch (DBusException e) {
                             e.printStackTrace();
                             System.exit(3);
@@ -319,7 +319,7 @@ public class Main {
     }
 
     private static void handleGroupNotFoundException(GroupNotFoundException e) {
-        System.err.println("Failed to send to group \"" + Base64.encodeBytes(e.getGroupId()) + "\": Unknown group");
+        System.err.println("Failed to send to group: " + e.getMessage());
         System.err.println("Aborting sending.");
         System.exit(1);
     }