Whitespace and output formatting fixes

diff --git a/src/main/java/org/asamk/signal/Main.java b/src/main/java/org/asamk/signal/Main.java
index a0059824638d86e23742bd1be4919875a9c54aa2..b18b2e0a5667a09a61260469c4be5eab5c5c1087 100644 (file)
--- a/src/main/java/org/asamk/signal/Main.java
+++ b/src/main/java/org/asamk/signal/Main.java
@@ -503,9 +503,10 @@ public class Main {
                     }
     
                     List<GroupInfo> groups = m.getGroups();
                     }
     
                     List<GroupInfo> groups = m.getGroups();

+                    boolean detailed = ns.getBoolean("detailed");

     
                     for (GroupInfo group : groups) {
     
                     for (GroupInfo group : groups) {

-                        printGroup(group, ns.getBoolean("detailed"));
+                        printGroup(group, detailed);

                     }
                     break;
                 case "listIdentities":
                     }
                     break;
                 case "listIdentities":


@@ -640,13 +641,12 @@ public class Main {
     }
     
     private static void printGroup(GroupInfo group, boolean detailed) {
     }
     
     private static void printGroup(GroupInfo group, boolean detailed) {

-        System.out.println(String.format("Group id: %s\n Group name: %s \n active: %s",
-                Base64.encodeBytes(group.groupId), group.name, group.active));

         if (detailed) {
         if (detailed) {

-            System.out.println(" Members:");
-            for (String member : group.members) {
-                System.out.println("  " + member);
-            }
+            System.out.println(String.format("Id: %s Name: %s  Active: %s Members: %s",
+                    Base64.encodeBytes(group.groupId), group.name, group.active, group.members));
+        } else {
+            System.out.println(String.format("Id: %s Name: %s  Active: %s", Base64.encodeBytes(group.groupId),
+                    group.name, group.active));

         }
     }
 
         }
     }
 

diff --git a/src/main/java/org/asamk/signal/Manager.java b/src/main/java/org/asamk/signal/Manager.java
index 2b2d1d70d4c37d699eab31f061260b8985e44a49..a50cb481b5521b0c4c291c9ea44a70d06aae53ef 100644 (file)
--- a/src/main/java/org/asamk/signal/Manager.java
+++ b/src/main/java/org/asamk/signal/Manager.java
@@ -582,7 +582,7 @@ class Manager implements Signal {
     }
     
     public List<GroupInfo> getGroups() {
     }
     
     public List<GroupInfo> getGroups() {

-       return groupStore.getGroups();
+        return groupStore.getGroups();

     }
 
     @Override
     }
 
     @Override