From: Pim Otte <otte.pim@gmail.com>
Date: Tue, 21 Feb 2017 08:48:58 +0000 (+0100)
Subject: Whitespace and output formatting fixes
X-Git-Tag: v0.5.6~21
X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/5845dad7690da09c696649544a1f396b0a01f080

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 a0059824..b18b2e0a 100644
--- 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();
+                    boolean detailed = ns.getBoolean("detailed");
     
                     for (GroupInfo group : groups) {
-                        printGroup(group, ns.getBoolean("detailed"));
+                        printGroup(group, detailed);
                     }
                     break;
                 case "listIdentities":
@@ -640,13 +641,12 @@ public class Main {
     }
     
     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) {
-            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 2b2d1d70..a50cb481 100644
--- 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() {
-    	return groupStore.getGroups();
+        return groupStore.getGroups();
     }
 
     @Override