Use SignalServiceAddress in more places

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

diff --git a/src/main/java/org/asamk/signal/JsonGroupInfo.java b/src/main/java/org/asamk/signal/JsonGroupInfo.java
index 073ad3ff7fbc0dbc85bf7564c25fe02dfb183594..5678b8961b7a19289857fcaa28eb55548212055d 100644 (file)
--- a/src/main/java/org/asamk/signal/JsonGroupInfo.java
+++ b/src/main/java/org/asamk/signal/JsonGroupInfo.java
@@ -1,8 +1,10 @@
 package org.asamk.signal;
 
 import org.whispersystems.signalservice.api.messages.SignalServiceGroup;
-import org.whispersystems.signalservice.internal.util.Base64;
+import org.whispersystems.signalservice.api.push.SignalServiceAddress;
+import org.whispersystems.util.Base64;
 
+import java.util.ArrayList;
 import java.util.List;
 
 class JsonGroupInfo {
@@ -15,7 +17,10 @@ class JsonGroupInfo {
     JsonGroupInfo(SignalServiceGroup groupInfo) {
         this.groupId = Base64.encodeBytes(groupInfo.getGroupId());
         if (groupInfo.getMembers().isPresent()) {
-            this.members = groupInfo.getMembers().get();
+            this.members = new ArrayList<>(groupInfo.getMembers().get().size());
+            for (SignalServiceAddress address : groupInfo.getMembers().get()) {
+                this.members.add(address.getNumber().get());
+            }
         }
         if (groupInfo.getName().isPresent()) {
             this.name = groupInfo.getName().get();