empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix NPE in group change message processing.

Browse source
This commit is contained in:
Cody Henthorne 2023-09-24 21:20:54 -04:00
parent cc6c724ee8
commit d7314ec2a4
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/messages/SignalServiceProtoUtil.kt
View file

@ -6,6 +6,7 @@ import okio.ByteString
import org.signal.core.util.orNull
import org.signal.libsignal.protocol.message.DecryptionErrorMessage
import org.signal.libsignal.zkgroup.groups.GroupMasterKey
import org.signal.storageservice.protos.groups.local.DecryptedGroupChange
import org.thoughtcrime.securesms.attachments.Attachment
import org.thoughtcrime.securesms.attachments.PointerAttachment
import org.thoughtcrime.securesms.database.model.StoryType
@ -32,6 +33,9 @@ import kotlin.time.Duration.Companion.seconds
object SignalServiceProtoUtil {
@JvmStatic
val emptyGroupChange: DecryptedGroupChange by lazy { DecryptedGroupChange() }
/** Contains some user data that affects the conversation */
val DataMessage.hasRenderableContent: Boolean
get() {

5
app/src/main/java/org/thoughtcrime/securesms/mms/MessageGroupContext.java
View file

@ -11,6 +11,7 @@ import org.signal.storageservice.protos.groups.local.DecryptedGroup;
import org.signal.storageservice.protos.groups.local.DecryptedGroupChange;
import org.signal.storageservice.protos.groups.local.DecryptedMember;
import org.thoughtcrime.securesms.database.model.databaseprotos.DecryptedGroupV2Context;
import org.thoughtcrime.securesms.messages.SignalServiceProtoUtil;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.recipients.RecipientId;
import org.thoughtcrime.securesms.util.Base64;
@ -161,12 +162,12 @@ public final class MessageGroupContext {
}
public @NonNull DecryptedGroupChange getChange() {
return decryptedGroupV2Context.change;
return decryptedGroupV2Context.change != null ? decryptedGroupV2Context.change : SignalServiceProtoUtil.getEmptyGroupChange();
}
public @NonNull List<? extends ServiceId> getAllActivePendingAndRemovedMembers() {
DecryptedGroup groupState = decryptedGroupV2Context.groupState;
DecryptedGroupChange groupChange = decryptedGroupV2Context.change;
DecryptedGroupChange groupChange = getChange();
return Stream.of(DecryptedGroupUtil.toAciList(groupState.members),
DecryptedGroupUtil.pendingToServiceIdList(groupState.pendingMembers),