diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/GroupStatePatcher.java b/app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/GroupStatePatcher.java index 4c143eaf98..fd4372df1a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/GroupStatePatcher.java +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/GroupStatePatcher.java @@ -84,11 +84,14 @@ final class GroupStatePatcher { } if (stateChain.getLatestState() == null && entry.getGroup() != null && current != null && current.isPlaceholderGroup) { - DecryptedGroup previousState = entry.getGroup().newBuilder() - .title(current.title) - .avatar(current.avatar) - .description(current.description) - .build(); + DecryptedGroup previousState = entry.getGroup() + .newBuilder() + .title(current.title) + .avatar(current.avatar) + .description(current.description) + .pendingMembers(current.pendingMembers) + .requestingMembers(current.requestingMembers) + .build(); stateChain.push(previousState, null); } diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupUtil.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupUtil.java index 983630862b..227ae5349d 100644 --- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupUtil.java +++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupUtil.java @@ -532,7 +532,7 @@ public final class DecryptedGroupUtil { int index = indexOfAciInRequestingList(requestingMembers, removedMember); if (index == -1) { - Log.w(TAG, "Deleted member on change not found in group"); + Log.w(TAG, "Deleted requesting member on change not found in group"); continue; } @@ -549,7 +549,7 @@ public final class DecryptedGroupUtil { int index = indexOfAciInRequestingList(requestingMembers, approvedMember.aciBytes); if (index == -1) { - Log.w(TAG, "Deleted member on change not found in group"); + Log.w(TAG, "Promote member on change not found in group"); continue; }