webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-08-28 18:10:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix NPR when loading an inactive group

Browse source 
Fixes #1786
This commit is contained in:
AsamK 2025-06-08 14:48:25 +02:00
parent 0257344940
commit 6b60a6d5a5
2 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
View file

@ -551,6 +551,9 @@ public class GroupHelper {
while (true) { while (true) {
final var page = context.getGroupV2Helper() final var page = context.getGroupV2Helper()
.getDecryptedGroupHistoryPage(groupSecretParams, fromRevision, sendEndorsementsExpirationMs); .getDecryptedGroupHistoryPage(groupSecretParams, fromRevision, sendEndorsementsExpirationMs);
if (page == null) {
break;
}
page.getChangeLogs() page.getChangeLogs()
.stream() .stream()
.map(DecryptedGroupChangeLog::getChange) .map(DecryptedGroupChangeLog::getChange)

3
lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java
View file

@ -44,6 +44,7 @@ import org.whispersystems.signalservice.api.push.ServiceId.PNI;
import org.whispersystems.signalservice.api.push.SignalServiceAddress; import org.whispersystems.signalservice.api.push.SignalServiceAddress;
import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException; import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException;
import org.whispersystems.signalservice.api.util.UuidUtil; import org.whispersystems.signalservice.api.util.UuidUtil;
import org.whispersystems.signalservice.internal.push.exceptions.NotInGroupException;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
@ -119,6 +120,8 @@ class GroupV2Helper {
groupsV2AuthorizationString, groupsV2AuthorizationString,
false, false,
sendEndorsementsExpirationMs); sendEndorsementsExpirationMs);
} catch (NotInGroupException e) {
throw new NotAGroupMemberException(GroupUtils.getGroupIdV2(groupSecretParams), null);
} catch (NonSuccessfulResponseCodeException e) { } catch (NonSuccessfulResponseCodeException e) {
if (e.code == 403) { if (e.code == 403) {
throw new NotAGroupMemberException(GroupUtils.getGroupIdV2(groupSecretParams), null); throw new NotAGroupMemberException(GroupUtils.getGroupIdV2(groupSecretParams), null);