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

Fix thread merge update archive NPE.

Browse source
This commit is contained in:
Cody Henthorne 2024-12-05 15:23:03 -05:00 • committed by Greyson Parrelli
parent 8996e3b0a7
commit faa4208209
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ChatItemArchiveExporter.kt
View file

@ -233,7 +233,7 @@ class ChatItemArchiveExporter(
}
MessageTypes.isThreadMergeType(record.type) -> {
builder.updateMessage = record.toRemoteThreadMergeUpdate()
builder.updateMessage = record.toRemoteThreadMergeUpdate() ?: continue
}
MessageTypes.isGroupV2(record.type) && MessageTypes.isGroupUpdate(record.type) -> {
@ -488,19 +488,20 @@ private fun BackupMessageRecord.toRemoteSessionSwitchoverUpdate(): ChatUpdateMes
)
}
private fun BackupMessageRecord.toRemoteThreadMergeUpdate(): ChatUpdateMessage {
private fun BackupMessageRecord.toRemoteThreadMergeUpdate(): ChatUpdateMessage? {
if (this.body == null) {
return ChatUpdateMessage(threadMerge = ThreadMergeChatUpdate())
return null
}
return ChatUpdateMessage(
threadMerge = try {
val event = ThreadMergeEvent.ADAPTER.decode(Base64.decodeOrThrow(this.body))
ThreadMergeChatUpdate(event.previousE164.e164ToLong()!!)
} catch (e: IOException) {
ThreadMergeChatUpdate()
try {
val e164 = ThreadMergeEvent.ADAPTER.decode(Base64.decodeOrThrow(this.body)).previousE164.e164ToLong()
if (e164 != null) {
return ChatUpdateMessage(threadMerge = ThreadMergeChatUpdate(e164))
}
)
} catch (_: IOException) {
}
return null
}
private fun BackupMessageRecord.toRemoteGroupUpdate(): ChatUpdateMessage? {