]> nmode's Git Repositories - signal-cli/blobdiff - lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
Update libsignal-service
[signal-cli] / lib / src / main / java / org / asamk / signal / manager / helper / GroupHelper.java
index 8f7b28695816e5d02c713d4ee6a6df84fd3885db..c0ca3871dded13ab06cc29b0775efe244e3dc346 100644 (file)
@@ -38,7 +38,7 @@ import org.signal.storageservice.protos.groups.local.DecryptedGroupChange;
 import org.signal.storageservice.protos.groups.local.DecryptedGroupJoinInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.signalservice.api.groupsv2.DecryptedGroupHistoryEntry;
+import org.whispersystems.signalservice.api.groupsv2.DecryptedGroupChangeLog;
 import org.whispersystems.signalservice.api.groupsv2.GroupLinkNotActiveException;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentStream;
@@ -482,11 +482,10 @@ public class GroupHelper {
         final var newProfileKeys = new HashMap<RecipientId, ProfileKey>();
         while (true) {
             final var page = context.getGroupV2Helper().getDecryptedGroupHistoryPage(groupSecretParams, fromRevision);
-            page.getResults()
+            page.getChangeLogs()
                     .stream()
-                    .map(DecryptedGroupHistoryEntry::getChange)
-                    .filter(Optional::isPresent)
-                    .map(Optional::get)
+                    .map(DecryptedGroupChangeLog::getChange)
+                    .filter(Objects::nonNull)
                     .map(context.getGroupV2Helper()::getAuthoritativeProfileKeyFromChange)
                     .filter(Objects::nonNull)
                     .forEach(p -> {
@@ -495,7 +494,7 @@ public class GroupHelper {
                         final var recipientId = account.getRecipientResolver().resolveRecipient(serviceId);
                         newProfileKeys.put(recipientId, profileKey);
                     });
-            if (!page.getPagingData().hasMorePages()) {
+            if (!page.getPagingData().getHasMorePages()) {
                 break;
             }
             fromRevision = page.getPagingData().getNextPageRevision();