diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_11.binproto deleted file mode 100644 index db7e0b3799..0000000000 Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_11.binproto and /dev/null differ diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_12.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_12.binproto deleted file mode 100644 index dc7659378c..0000000000 Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_12.binproto and /dev/null differ diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_13.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_13.binproto deleted file mode 100644 index dbfb1720f0..0000000000 Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_13.binproto and /dev/null differ diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_15.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_15.binproto deleted file mode 100644 index 878a6469b0..0000000000 Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_15.binproto and /dev/null differ diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_16.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_16.binproto deleted file mode 100644 index e377bb2e9f..0000000000 Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_16.binproto and /dev/null differ diff --git a/app/src/androidTest/assets/backupTests/chat_item_view_once_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_view_once_01.binproto index 6ac02c3c2b..145133d508 100644 Binary files a/app/src/androidTest/assets/backupTests/chat_item_view_once_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_view_once_01.binproto differ diff --git a/app/src/androidTest/assets/backupTests/chat_item_view_once_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_view_once_02.binproto index 6b9c6c41e9..c2565ab068 100644 Binary files a/app/src/androidTest/assets/backupTests/chat_item_view_once_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_view_once_02.binproto differ diff --git a/app/src/androidTest/assets/backupTests/chat_item_view_once_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_view_once_03.binproto index a746ab2c55..5e28770043 100644 Binary files a/app/src/androidTest/assets/backupTests/chat_item_view_once_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_view_once_03.binproto differ diff --git a/app/src/androidTest/assets/backupTests/chat_item_view_once_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_view_once_04.binproto index 2c3078e5d6..5def6ed01d 100644 Binary files a/app/src/androidTest/assets/backupTests/chat_item_view_once_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_view_once_04.binproto differ diff --git a/app/src/androidTest/assets/backupTests/chat_item_view_once_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_view_once_05.binproto index e5fd1c18c9..6b48b5e274 100644 Binary files a/app/src/androidTest/assets/backupTests/chat_item_view_once_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_view_once_05.binproto differ diff --git a/app/src/androidTest/assets/backupTests/chat_item_view_once_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_view_once_06.binproto index 36f1322dae..a0a4508ca0 100644 Binary files a/app/src/androidTest/assets/backupTests/chat_item_view_once_06.binproto and b/app/src/androidTest/assets/backupTests/chat_item_view_once_06.binproto differ diff --git a/app/src/androidTest/assets/backupTests/chat_item_view_once_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_view_once_08.binproto index 7335c9daea..2bc0b9b74d 100644 Binary files a/app/src/androidTest/assets/backupTests/chat_item_view_once_08.binproto and b/app/src/androidTest/assets/backupTests/chat_item_view_once_08.binproto differ diff --git a/app/src/androidTest/assets/backupTests/chat_item_view_once_09.binproto b/app/src/androidTest/assets/backupTests/chat_item_view_once_09.binproto index 4da0245bf5..a455c9c78c 100644 Binary files a/app/src/androidTest/assets/backupTests/chat_item_view_once_09.binproto and b/app/src/androidTest/assets/backupTests/chat_item_view_once_09.binproto differ diff --git a/app/src/androidTest/assets/backupTests/chat_item_view_once_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_view_once_10.binproto index e692d13f5d..4778083886 100644 Binary files a/app/src/androidTest/assets/backupTests/chat_item_view_once_10.binproto and b/app/src/androidTest/assets/backupTests/chat_item_view_once_10.binproto differ diff --git a/app/src/androidTest/assets/backupTests/chat_item_view_once_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_view_once_11.binproto index c585ec3046..f1c8f7bbc9 100644 Binary files a/app/src/androidTest/assets/backupTests/chat_item_view_once_11.binproto and b/app/src/androidTest/assets/backupTests/chat_item_view_once_11.binproto differ diff --git a/app/src/androidTest/assets/backupTests/chat_item_view_once_12.binproto b/app/src/androidTest/assets/backupTests/chat_item_view_once_12.binproto index 3ce64aab77..ddb309a625 100644 Binary files a/app/src/androidTest/assets/backupTests/chat_item_view_once_12.binproto and b/app/src/androidTest/assets/backupTests/chat_item_view_once_12.binproto differ diff --git a/app/src/androidTest/assets/backupTests/chat_item_view_once_13.binproto b/app/src/androidTest/assets/backupTests/chat_item_view_once_13.binproto deleted file mode 100644 index 3ad6d1c8c7..0000000000 Binary files a/app/src/androidTest/assets/backupTests/chat_item_view_once_13.binproto and /dev/null differ diff --git a/app/src/androidTest/assets/backupTests/chat_item_view_once_14.binproto b/app/src/androidTest/assets/backupTests/chat_item_view_once_14.binproto deleted file mode 100644 index d25ad113ea..0000000000 Binary files a/app/src/androidTest/assets/backupTests/chat_item_view_once_14.binproto and /dev/null differ diff --git a/app/src/androidTest/assets/backupTests/recipient_contacts_12.binproto b/app/src/androidTest/assets/backupTests/recipient_contacts_12.binproto deleted file mode 100644 index 54f2c65af2..0000000000 Binary files a/app/src/androidTest/assets/backupTests/recipient_contacts_12.binproto and /dev/null differ diff --git a/app/src/androidTest/assets/backupTests/recipient_groups_12.binproto b/app/src/androidTest/assets/backupTests/recipient_groups_12.binproto deleted file mode 100644 index dadf23f2ce..0000000000 Binary files a/app/src/androidTest/assets/backupTests/recipient_groups_12.binproto and /dev/null differ diff --git a/app/src/androidTest/assets/backupTests/recipient_self_12.binproto b/app/src/androidTest/assets/backupTests/recipient_self_12.binproto deleted file mode 100644 index 3afa1f6d97..0000000000 Binary files a/app/src/androidTest/assets/backupTests/recipient_self_12.binproto and /dev/null differ diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/AccountDataArchiveProcessor.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/AccountDataArchiveProcessor.kt index 7853cd3051..800973b5df 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/AccountDataArchiveProcessor.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/AccountDataArchiveProcessor.kt @@ -115,7 +115,7 @@ object AccountDataArchiveProcessor { ) ), donationSubscriberData = donationSubscriber?.toSubscriberData(signalStore.inAppPaymentValues.isDonationSubscriptionManuallyCancelled()), - backupsSubscriberData = backupSubscriberRecord?.takeIf { SignalStore.backup.backupTier == MessageBackupTier.PAID }?.toIAPSubscriberData() + backupsSubscriberData = backupSubscriberRecord?.toIAPSubscriberData() ) ) )