Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-07-07 14:35:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix request to join approved message not showing up.

Browse Source
This commit is contained in:
Cody Henthorne
2025-12-17 12:23:58 -05:00
committed by jeffrey-signal
parent 286ae25ac5
commit 942c155723
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/GroupStatePatcher.java
+8 -5
View File
@@ -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);
}
libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupUtil.java
+2 -2
View File
@@ -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;
}