From 960bab4f949e563753e2c5a1a895fb7f3588a771 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Fri, 17 Jan 2025 14:06:24 -0500
Subject: [PATCH] Update backup export to remove storySentTimestamp.

---
 .../chat_item_direct_story_reply_01.binproto    | Bin 719 -> 712 bytes
 .../chat_item_direct_story_reply_02.binproto    | Bin 776 -> 769 bytes
 .../chat_item_direct_story_reply_04.binproto    | Bin 742 -> 735 bytes
 .../chat_item_direct_story_reply_05.binproto    | Bin 761 -> 754 bytes
 .../chat_item_direct_story_reply_07.binproto    | Bin 704 -> 697 bytes
 .../chat_item_direct_story_reply_08.binproto    | Bin 681 -> 674 bytes
 .../chat_item_direct_story_reply_10.binproto    | Bin 570 -> 563 bytes
 .../chat_item_direct_story_reply_11.binproto    | Bin 582 -> 575 bytes
 .../chat_item_direct_story_reply_13.binproto    | Bin 579 -> 572 bytes
 .../chat_item_direct_story_reply_14.binproto    | Bin 628 -> 621 bytes
 .../v2/exporters/ChatItemArchiveExporter.kt     |   1 -
 .../v2/importer/ChatItemArchiveImporter.kt      |   2 +-
 app/src/main/protowire/Backup.proto             |   2 +-
 13 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_01.binproto
index 43516451fa69bb5680b29f085cb18a1821cde9b2..7980c7cc92fc27abfb79073945e3046fb018f879 100644
GIT binary patch
delta 42
zcmV+_0M-A`1;_=k`T+#Y0V2th{sA5pssS1i3Iy<<l7J8a7?Pd5k=8OG0h2fams%MQ
Ag#Z8m

delta 49
zcmV-10M7r&1<wVr`T+#f0V2?o{sA5wu>l$p3Iy<<l7J8a81lWm_|P>V0U(l{yph&2
HlQ9C9?AsI~

diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_02.binproto
index b2e22b3222566dfd204b46d677ea5b5f030ef0a7..5254394fdf07c283924ca22d690ae6ec5bf059b9 100644
GIT binary patch
delta 61
zcmeBRYh>H-i;<<3NvUb_KSnW)*NjqvTr3~vPihcgl$bPk&%|p+3Q(bmy#g!}lOaM(
JlbxB40sxSA6{-LL

delta 68
zcmZo<>tNgPi;<;=NvU)4KSnYAPmEH6Tr3~vPihcgl=!rF&yNeH3Q(bmy#g!}pCLj_
Q3g;$0S$fQLvJKNw0CLP5ivR!s

diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_04.binproto
index d067f6314341aece18acd3ddee75926144619fba..170e59a9d41df7cdc9e343621e1dc12d10963ab8 100644
GIT binary patch
delta 42
zcmV+_0M-BI1>Xg*`T+#v0V3d&{sA2o!T}l)3Iy<<l7J8a7?Pd5k=8OG0h2cZuW6tV
A4*&oF

delta 49
zcmV-10M7s41?B~?`T+#$0V3y<{sA2v$pIP>3Iy<<l7J8a81lWm_|P>V0U(l{yph&2
HlQ06W|A!Q;

diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_05.binproto
index f4fef985ae348763ad4e31502deab158b2518476..578fc3f2227e929725f72432e714b55e479c8304 100644
GIT binary patch
delta 61
zcmey#`iXVJFGiMcj7py;|6`QUxWy<X$i?zu{-g#0Mu|yt_e{KIqyQC~*ek#yF&QGn
JG})DD3jpt-7fk>F

delta 68
zcmeyw`jd6TFGiNXj7q;I|6`QUf5<2$$i?zu{-g#0Mu|^*_x!kEssI(5*ek#y@fjk-
Rq;PK1lcmQ@C)+V?0RY|99WDR>

diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_07.binproto
index e54e0c3aca441074d5c63a7379d8c7c3c383247d..97994309d044933aa825ce102530fe197e38c573 100644
GIT binary patch
delta 42
zcmV+_0M-A%1-S*V`T+#J0V2AS{sA8qngJRS3Iy<<l7J8a7?Pd5k=8OG0h2ibhfn$s
AD*ylh

delta 49
zcmV-10M7rp1;7Qc`T+#Q0V2VZ{sA8xp#d5Z3Iy<<l7J8a81lWm_|P>V0U(l{yph&2
HlQIH_;I9+N

diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_08.binproto
index a47942bb4b5d83b5379fe98af3f52601dc0690d4..8113dd24083b7af63ec022201214b47103bf77ef 100644
GIT binary patch
delta 61
zcmZ3<x`=hdFGiMSj7p0q|6>%>=wXx+<YM_Se^P@0qr{}SdnR5pQh*9g>=j^<m<$nO
Jn(WM!1^}Dc6>R_j

delta 68
zcmZ3)x{`InFGiNNj7qB}|6>%>pUfyF$i?zu{-g#0Mu|^*_x!kEssI(5*ek#y@fjk-
Rq;PK1lcmQ@C)+Tk0RVp-8%_WK

diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_10.binproto
index b82372ec1d3102277ba1d12b1901f0e8dd9b1c63..f5410960a7fe69f38de061cfaefa3947b5483e36 100644
GIT binary patch
delta 42
xcmdnRvYBPWFGgkyC9}zY8D*p-r3ATHKFpugAiyXwY3`nh*NhYxg@6JRdjT^E4*viE

delta 49
zcmdnYvWsQIFGgm2CELk=8D$g|qy)KGKFpugAiyZ`Y44sN7fclx6(-HyGx3^{5Kw$#
FF95;96QckC

diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_11.binproto
index 6ab5a7408de644cb288879fc77d0b6a98f7656dd..507049cf4a2c978c8b1a506f64e3b0f60679a7ae 100644
GIT binary patch
delta 77
zcmX@cvY%zcFGg1vB_|Fh0Y-`CpW7c_F!5sJV&PzMVwlCKBPGbi@?rj@2B6%exqBvF
YGg4rL2u<u2V3C*%5n>Vos+rga0K(K6`2YX_

delta 84
zcmdnba*SoeFGe44B~K0}0Y-`CpW7c_F!5sJV&PzMVwlBfEG5Xr@?rj@2B6%hy?cIK
fFjZiL2u<u2V3GI?5n@s}H|fdJW2Qntr4#!A$crE0

diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_13.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_13.binproto
index 10da98f98b51095994df8dc393e3654d80225aa8..af4c85d2f6dccf3aa6dbd470dd398cd288a38790 100644
GIT binary patch
delta 49
zcmX@ivWI2EFGglZCHu*L8RZleqy)KGKFpugAiyXwY3`nh*NhYxg}6V=pSbc-LoZN#
FHvqWo6d?cr

delta 56
zcmV-80LTBl1j7Wd`T+w-B1V(_0UjtP8W9Qv@Sl=^5CItSy}bC)H6Q^XlAXMf)-n<c
O@Sl;X;((3tpOU+2oEXIb

diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_14.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_14.binproto
index a553ac9fef226b655a85705ffb709171665d0735..ce82204454b6a1367f1fef4398f864a66db1f2f1 100644
GIT binary patch
delta 59
zcmeyu@|I=8FGl7frGm+S8O7Bjqy)KGKFpugAiyXwY3`nh*NhYxAwm;-1z02|Lxh+n
IJ24pn0F@aPEdT%j

delta 66
zcmaFM@`Yu?FGl7{rSi#t8O8PDr3ATHKFpugAiyZ`Y44sN7fclxAwm;-1z03LLxh+V
P&P{r<^qA>nYbGNAckCMu

diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ChatItemArchiveExporter.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ChatItemArchiveExporter.kt
index de391bc341..33c781038c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ChatItemArchiveExporter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ChatItemArchiveExporter.kt
@@ -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 {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/importer/ChatItemArchiveImporter.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/importer/ChatItemArchiveImporter.kt
index ce0301b39c..8bdba6d8e6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/importer/ChatItemArchiveImporter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/importer/ChatItemArchiveImporter.kt
@@ -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)
diff --git a/app/src/main/protowire/Backup.proto b/app/src/main/protowire/Backup.proto
index 48a6f248c0..614042dad2 100644
--- a/app/src/main/protowire/Backup.proto
+++ b/app/src/main/protowire/Backup.proto
@@ -461,7 +461,7 @@ message DirectStoryReplyMessage {
   }
 
   repeated Reaction reactions = 3;
-  optional uint64 storySentTimestamp = 4;
+  reserved /*storySentTimestamp*/ 4;
 }
 
 message PaymentNotification {