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

Update backup export to remove storySentTimestamp.

Browse source
This commit is contained in:
Greyson Parrelli 2025-01-17 14:06:24 -05:00
parent 69c4026f4d
commit 960bab4f94
13 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_01.binproto
View file

Binary file not shown.

BIN
app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_02.binproto
View file

Binary file not shown.

BIN
app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_04.binproto
View file

Binary file not shown.

BIN
app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_05.binproto
View file

Binary file not shown.

BIN
app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_07.binproto
View file

Binary file not shown.

BIN
app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_08.binproto
View file

Binary file not shown.

BIN
app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_10.binproto
View file

Binary file not shown.

BIN
app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_11.binproto
View file

Binary file not shown.

BIN
app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_13.binproto
View file

Binary file not shown.

BIN
app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_14.binproto
View file

Binary file not shown.

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

@ -866,7 +866,6 @@ private fun BackupMessageRecord.toRemoteDirectStoryReplyMessage(mediaArchiveEnab
val isReaction = MessageTypes.isStoryReaction(this.type)
return DirectStoryReplyMessage(
storySentTimestamp = this.parentStoryId.takeUnless { it == MessageTable.PARENT_STORY_MISSING_ID },
emoji = if (isReaction) {
this.body
} else {

2
app/src/main/java/org/thoughtcrime/securesms/backup/v2/importer/ChatItemArchiveImporter.kt
View file

@ -877,7 +877,7 @@ class ChatItemArchiveImporter(
}
private fun ContentValues.addDirectStoryReply(directStoryReply: DirectStoryReplyMessage) {
put(MessageTable.PARENT_STORY_ID, directStoryReply.storySentTimestamp?.takeUnless { it == 0L } ?: MessageTable.PARENT_STORY_MISSING_ID)
put(MessageTable.PARENT_STORY_ID, MessageTable.PARENT_STORY_MISSING_ID)
if (directStoryReply.emoji != null) {
put(MessageTable.BODY, directStoryReply.emoji)

2
app/src/main/protowire/Backup.proto
View file

@ -461,7 +461,7 @@ message DirectStoryReplyMessage {
}
repeated Reaction reactions = 3;
optional uint64 storySentTimestamp = 4;
reserved /*storySentTimestamp*/ 4;
}
message PaymentNotification {