From 00a6927884b5925e8156dacb18530bfa3af2a0d8 Mon Sep 17 00:00:00 2001 From: Pete Walters Date: Mon, 18 Nov 2024 09:12:00 -0600 Subject: [PATCH] Simplify payment archiving --- Signal.xcodeproj/project.pbxproj | 144 +++++++++--------- .../Messages/Payments/ArchivedPayment.swift | 18 ++- .../MessageBackup/Signal-Message-Backup-Tests | 2 +- 3 files changed, 85 insertions(+), 79 deletions(-) diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index 7a01344726..61c53a8fa3 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -1751,6 +1751,24 @@ C1A0F79D2B9F57340009DC0D /* MessageBackupKeyMaterial.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1A0F79C2B9F57340009DC0D /* MessageBackupKeyMaterial.swift */; }; C1A0F79F2B9F59920009DC0D /* MessageBackupKeyMaterialImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1A0F79E2B9F59920009DC0D /* MessageBackupKeyMaterialImpl.swift */; }; C1BF1F712BA0D7CC0004B112 /* StreamTransform.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1BF1F702BA0D7CC0004B112 /* StreamTransform.swift */; }; + C1C083D02CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_04.binproto in Resources */ = {isa = PBXBuildFile; fileRef = C1C083C62CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_04.binproto */; }; + C1C083D12CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_07.txtproto in Resources */ = {isa = PBXBuildFile; fileRef = C1C083CD2CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_07.txtproto */; }; + C1C083D22CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_08.binproto in Resources */ = {isa = PBXBuildFile; fileRef = C1C083CE2CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_08.binproto */; }; + C1C083D32CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_03.binproto in Resources */ = {isa = PBXBuildFile; fileRef = C1C083C42CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_03.binproto */; }; + C1C083D42CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_05.binproto in Resources */ = {isa = PBXBuildFile; fileRef = C1C083C82CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_05.binproto */; }; + C1C083D52CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_03.txtproto in Resources */ = {isa = PBXBuildFile; fileRef = C1C083C52CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_03.txtproto */; }; + C1C083D62CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_08.txtproto in Resources */ = {isa = PBXBuildFile; fileRef = C1C083CF2CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_08.txtproto */; }; + C1C083D72CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_05.txtproto in Resources */ = {isa = PBXBuildFile; fileRef = C1C083C92CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_05.txtproto */; }; + C1C083D82CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_06.txtproto in Resources */ = {isa = PBXBuildFile; fileRef = C1C083CB2CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_06.txtproto */; }; + C1C083D92CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_07.binproto in Resources */ = {isa = PBXBuildFile; fileRef = C1C083CC2CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_07.binproto */; }; + C1C083DA2CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_02.binproto in Resources */ = {isa = PBXBuildFile; fileRef = C1C083C22CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_02.binproto */; }; + C1C083DB2CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_02.txtproto in Resources */ = {isa = PBXBuildFile; fileRef = C1C083C32CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_02.txtproto */; }; + C1C083DC2CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_04.txtproto in Resources */ = {isa = PBXBuildFile; fileRef = C1C083C72CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_04.txtproto */; }; + C1C083DD2CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_00.binproto in Resources */ = {isa = PBXBuildFile; fileRef = C1C083BE2CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_00.binproto */; }; + C1C083DE2CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_00.txtproto in Resources */ = {isa = PBXBuildFile; fileRef = C1C083BF2CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_00.txtproto */; }; + C1C083DF2CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_01.txtproto in Resources */ = {isa = PBXBuildFile; fileRef = C1C083C12CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_01.txtproto */; }; + C1C083E02CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_01.binproto in Resources */ = {isa = PBXBuildFile; fileRef = C1C083C02CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_01.binproto */; }; + C1C083E12CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_06.binproto in Resources */ = {isa = PBXBuildFile; fileRef = C1C083CA2CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_06.binproto */; }; C1C4AA3329E7038D000CE9D3 /* EditManagerShims.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1C4AA3229E7038D000CE9D3 /* EditManagerShims.swift */; }; C1C7E4FB2BE0419300F196EE /* UploadMetadata.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1C7E4FA2BE0419300F196EE /* UploadMetadata.swift */; }; C1CA5F8E2BE2F21C00D733CA /* MessageBackupDistributionListRecipientArchiver.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1CA5F8D2BE2F21C00D733CA /* MessageBackupDistributionListRecipientArchiver.swift */; }; @@ -2835,7 +2853,6 @@ E1ED82EE2CDEA15600E9BB0D /* chat_item_group_change_chat_update_06.txtproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82A02CDEA15600E9BB0D /* chat_item_group_change_chat_update_06.txtproto */; }; E1ED82EF2CDEA15600E9BB0D /* chat_item_group_change_chat_update_22.binproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82BF2CDEA15600E9BB0D /* chat_item_group_change_chat_update_22.binproto */; }; E1ED82F02CDEA15600E9BB0D /* chat_item_group_change_chat_update_12.binproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82AB2CDEA15600E9BB0D /* chat_item_group_change_chat_update_12.binproto */; }; - E1ED82F12CDEA15600E9BB0D /* chat_item_group_change_chat_update_34.txtproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82D82CDEA15600E9BB0D /* chat_item_group_change_chat_update_34.txtproto */; }; E1ED82F22CDEA15600E9BB0D /* chat_item_group_change_chat_update_19.binproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82B92CDEA15600E9BB0D /* chat_item_group_change_chat_update_19.binproto */; }; E1ED82F32CDEA15600E9BB0D /* chat_item_group_change_chat_update_11.txtproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82AA2CDEA15600E9BB0D /* chat_item_group_change_chat_update_11.txtproto */; }; E1ED82F42CDEA15600E9BB0D /* chat_item_group_change_chat_update_16.txtproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82B42CDEA15600E9BB0D /* chat_item_group_change_chat_update_16.txtproto */; }; @@ -2847,10 +2864,7 @@ E1ED82FA2CDEA15600E9BB0D /* chat_item_group_change_chat_update_14.txtproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82B02CDEA15600E9BB0D /* chat_item_group_change_chat_update_14.txtproto */; }; E1ED82FC2CDEA15600E9BB0D /* chat_item_group_change_chat_update_09.txtproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82A62CDEA15600E9BB0D /* chat_item_group_change_chat_update_09.txtproto */; }; E1ED82FD2CDEA15600E9BB0D /* chat_item_group_change_chat_update_09.binproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82A52CDEA15600E9BB0D /* chat_item_group_change_chat_update_09.binproto */; }; - E1ED82FE2CDEA15600E9BB0D /* chat_item_group_change_chat_update_35.txtproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82DA2CDEA15600E9BB0D /* chat_item_group_change_chat_update_35.txtproto */; }; - E1ED82FF2CDEA15600E9BB0D /* chat_item_group_change_chat_update_43.binproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82E92CDEA15600E9BB0D /* chat_item_group_change_chat_update_43.binproto */; }; E1ED83002CDEA15600E9BB0D /* chat_item_group_change_chat_update_07.binproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82A12CDEA15600E9BB0D /* chat_item_group_change_chat_update_07.binproto */; }; - E1ED83022CDEA15600E9BB0D /* chat_item_group_change_chat_update_39.binproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82E12CDEA15600E9BB0D /* chat_item_group_change_chat_update_39.binproto */; }; E1ED83032CDEA15600E9BB0D /* chat_item_group_change_chat_update_01.txtproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82962CDEA15600E9BB0D /* chat_item_group_change_chat_update_01.txtproto */; }; E1ED83042CDEA15600E9BB0D /* chat_item_group_change_chat_update_07.txtproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82A22CDEA15600E9BB0D /* chat_item_group_change_chat_update_07.txtproto */; }; E1ED83052CDEA15600E9BB0D /* chat_item_group_change_chat_update_11.binproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82A92CDEA15600E9BB0D /* chat_item_group_change_chat_update_11.binproto */; }; @@ -2861,18 +2875,11 @@ E1ED830A2CDEA15600E9BB0D /* chat_item_group_change_chat_update_05.binproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED829D2CDEA15600E9BB0D /* chat_item_group_change_chat_update_05.binproto */; }; E1ED830B2CDEA15600E9BB0D /* chat_item_group_change_chat_update_18.txtproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82B82CDEA15600E9BB0D /* chat_item_group_change_chat_update_18.txtproto */; }; E1ED830C2CDEA15600E9BB0D /* chat_item_group_change_chat_update_32.binproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82D32CDEA15600E9BB0D /* chat_item_group_change_chat_update_32.binproto */; }; - E1ED830E2CDEA15600E9BB0D /* chat_item_group_change_chat_update_40.binproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82E32CDEA15600E9BB0D /* chat_item_group_change_chat_update_40.binproto */; }; - E1ED830F2CDEA15600E9BB0D /* chat_item_group_change_chat_update_41.binproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82E52CDEA15600E9BB0D /* chat_item_group_change_chat_update_41.binproto */; }; E1ED83102CDEA15600E9BB0D /* chat_item_group_change_chat_update_05.txtproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED829E2CDEA15600E9BB0D /* chat_item_group_change_chat_update_05.txtproto */; }; E1ED83112CDEA15600E9BB0D /* chat_item_group_change_chat_update_31.binproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82D12CDEA15600E9BB0D /* chat_item_group_change_chat_update_31.binproto */; }; - E1ED83122CDEA15600E9BB0D /* chat_item_group_change_chat_update_39.txtproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82E22CDEA15600E9BB0D /* chat_item_group_change_chat_update_39.txtproto */; }; E1ED83132CDEA15600E9BB0D /* chat_item_group_change_chat_update_23.binproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82C12CDEA15600E9BB0D /* chat_item_group_change_chat_update_23.binproto */; }; - E1ED83142CDEA15600E9BB0D /* chat_item_group_change_chat_update_40.txtproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82E42CDEA15600E9BB0D /* chat_item_group_change_chat_update_40.txtproto */; }; E1ED83152CDEA15600E9BB0D /* chat_item_group_change_chat_update_03.txtproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED829A2CDEA15600E9BB0D /* chat_item_group_change_chat_update_03.txtproto */; }; - E1ED83162CDEA15600E9BB0D /* chat_item_group_change_chat_update_38.txtproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82E02CDEA15600E9BB0D /* chat_item_group_change_chat_update_38.txtproto */; }; - E1ED83172CDEA15600E9BB0D /* chat_item_group_change_chat_update_34.binproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82D72CDEA15600E9BB0D /* chat_item_group_change_chat_update_34.binproto */; }; E1ED83182CDEA15600E9BB0D /* chat_item_group_change_chat_update_29.txtproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82CE2CDEA15600E9BB0D /* chat_item_group_change_chat_update_29.txtproto */; }; - E1ED83192CDEA15600E9BB0D /* chat_item_group_change_chat_update_44.binproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82EB2CDEA15600E9BB0D /* chat_item_group_change_chat_update_44.binproto */; }; E1ED831A2CDEA15600E9BB0D /* chat_item_group_change_chat_update_20.binproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82BB2CDEA15600E9BB0D /* chat_item_group_change_chat_update_20.binproto */; }; E1ED831B2CDEA15600E9BB0D /* chat_item_group_change_chat_update_30.txtproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82D02CDEA15600E9BB0D /* chat_item_group_change_chat_update_30.txtproto */; }; E1ED831C2CDEA15600E9BB0D /* chat_item_group_change_chat_update_31.txtproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82D22CDEA15600E9BB0D /* chat_item_group_change_chat_update_31.txtproto */; }; @@ -2884,7 +2891,6 @@ E1ED83222CDEA15600E9BB0D /* chat_item_group_change_chat_update_15.binproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82B12CDEA15600E9BB0D /* chat_item_group_change_chat_update_15.binproto */; }; E1ED83232CDEA15600E9BB0D /* chat_item_group_change_chat_update_29.binproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82CD2CDEA15600E9BB0D /* chat_item_group_change_chat_update_29.binproto */; }; E1ED83242CDEA15600E9BB0D /* chat_item_group_change_chat_update_28.txtproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82CC2CDEA15600E9BB0D /* chat_item_group_change_chat_update_28.txtproto */; }; - E1ED83252CDEA15600E9BB0D /* chat_item_group_change_chat_update_42.txtproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82E82CDEA15600E9BB0D /* chat_item_group_change_chat_update_42.txtproto */; }; E1ED83262CDEA15600E9BB0D /* chat_item_group_change_chat_update_27.binproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82C92CDEA15600E9BB0D /* chat_item_group_change_chat_update_27.binproto */; }; E1ED83272CDEA15600E9BB0D /* chat_item_group_change_chat_update_25.txtproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82C62CDEA15600E9BB0D /* chat_item_group_change_chat_update_25.txtproto */; }; E1ED83292CDEA15600E9BB0D /* chat_item_group_change_chat_update_26.txtproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82C82CDEA15600E9BB0D /* chat_item_group_change_chat_update_26.txtproto */; }; @@ -2903,19 +2909,13 @@ E1ED83362CDEA15600E9BB0D /* chat_item_group_change_chat_update_22.txtproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82C02CDEA15600E9BB0D /* chat_item_group_change_chat_update_22.txtproto */; }; E1ED83372CDEA15600E9BB0D /* chat_item_group_change_chat_update_30.binproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82CF2CDEA15600E9BB0D /* chat_item_group_change_chat_update_30.binproto */; }; E1ED83382CDEA15600E9BB0D /* chat_item_group_change_chat_update_24.txtproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82C42CDEA15600E9BB0D /* chat_item_group_change_chat_update_24.txtproto */; }; - E1ED83392CDEA15600E9BB0D /* chat_item_group_change_chat_update_38.binproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82DF2CDEA15600E9BB0D /* chat_item_group_change_chat_update_38.binproto */; }; E1ED833A2CDEA15600E9BB0D /* chat_item_group_change_chat_update_33.txtproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82D62CDEA15600E9BB0D /* chat_item_group_change_chat_update_33.txtproto */; }; - E1ED833B2CDEA15600E9BB0D /* chat_item_group_change_chat_update_42.binproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82E72CDEA15600E9BB0D /* chat_item_group_change_chat_update_42.binproto */; }; E1ED833C2CDEA15600E9BB0D /* chat_item_group_change_chat_update_25.binproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82C52CDEA15600E9BB0D /* chat_item_group_change_chat_update_25.binproto */; }; - E1ED833D2CDEA15600E9BB0D /* chat_item_group_change_chat_update_43.txtproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82EA2CDEA15600E9BB0D /* chat_item_group_change_chat_update_43.txtproto */; }; - E1ED833E2CDEA15600E9BB0D /* chat_item_group_change_chat_update_44.txtproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82EC2CDEA15600E9BB0D /* chat_item_group_change_chat_update_44.txtproto */; }; E1ED833F2CDEA15600E9BB0D /* chat_item_group_change_chat_update_16.binproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82B32CDEA15600E9BB0D /* chat_item_group_change_chat_update_16.binproto */; }; E1ED83402CDEA15600E9BB0D /* chat_item_group_change_chat_update_04.txtproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED829C2CDEA15600E9BB0D /* chat_item_group_change_chat_update_04.txtproto */; }; E1ED83412CDEA15600E9BB0D /* chat_item_group_change_chat_update_03.binproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82992CDEA15600E9BB0D /* chat_item_group_change_chat_update_03.binproto */; }; E1ED83422CDEA15600E9BB0D /* chat_item_group_change_chat_update_26.binproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82C72CDEA15600E9BB0D /* chat_item_group_change_chat_update_26.binproto */; }; - E1ED83432CDEA15600E9BB0D /* chat_item_group_change_chat_update_35.binproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82D92CDEA15600E9BB0D /* chat_item_group_change_chat_update_35.binproto */; }; E1ED83442CDEA15600E9BB0D /* chat_item_group_change_chat_update_13.binproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82AD2CDEA15600E9BB0D /* chat_item_group_change_chat_update_13.binproto */; }; - E1ED83452CDEA15600E9BB0D /* chat_item_group_change_chat_update_41.txtproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82E62CDEA15600E9BB0D /* chat_item_group_change_chat_update_41.txtproto */; }; E1ED83462CDEA15600E9BB0D /* chat_item_group_change_chat_update_24.binproto in Resources */ = {isa = PBXBuildFile; fileRef = E1ED82C32CDEA15600E9BB0D /* chat_item_group_change_chat_update_24.binproto */; }; E44AD4E624E98F440035D7B8 /* PhotoCaptureDismiss.swift in Sources */ = {isa = PBXBuildFile; fileRef = E44AD4E524E98F430035D7B8 /* PhotoCaptureDismiss.swift */; }; E75DD3E02810CDBD00E32C36 /* SubscriptionModelsTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = E75DD3DF2810CDBD00E32C36 /* SubscriptionModelsTest.swift */; }; @@ -5583,6 +5583,24 @@ C1A0F79E2B9F59920009DC0D /* MessageBackupKeyMaterialImpl.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageBackupKeyMaterialImpl.swift; sourceTree = ""; }; C1BD5FA792ACABB4855877BD /* Pods-SignalUI.app store release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SignalUI.app store release.xcconfig"; path = "Target Support Files/Pods-SignalUI/Pods-SignalUI.app store release.xcconfig"; sourceTree = ""; }; C1BF1F702BA0D7CC0004B112 /* StreamTransform.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StreamTransform.swift; sourceTree = ""; }; + C1C083BE2CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_00.binproto */ = {isa = PBXFileReference; lastKnownFileType = file; path = chat_item_group_change_chat_multiple_update_00.binproto; sourceTree = ""; }; + C1C083BF2CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_00.txtproto */ = {isa = PBXFileReference; lastKnownFileType = text; path = chat_item_group_change_chat_multiple_update_00.txtproto; sourceTree = ""; }; + C1C083C02CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_01.binproto */ = {isa = PBXFileReference; lastKnownFileType = file; path = chat_item_group_change_chat_multiple_update_01.binproto; sourceTree = ""; }; + C1C083C12CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_01.txtproto */ = {isa = PBXFileReference; lastKnownFileType = text; path = chat_item_group_change_chat_multiple_update_01.txtproto; sourceTree = ""; }; + C1C083C22CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_02.binproto */ = {isa = PBXFileReference; lastKnownFileType = file; path = chat_item_group_change_chat_multiple_update_02.binproto; sourceTree = ""; }; + C1C083C32CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_02.txtproto */ = {isa = PBXFileReference; lastKnownFileType = text; path = chat_item_group_change_chat_multiple_update_02.txtproto; sourceTree = ""; }; + C1C083C42CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_03.binproto */ = {isa = PBXFileReference; lastKnownFileType = file; path = chat_item_group_change_chat_multiple_update_03.binproto; sourceTree = ""; }; + C1C083C52CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_03.txtproto */ = {isa = PBXFileReference; lastKnownFileType = text; path = chat_item_group_change_chat_multiple_update_03.txtproto; sourceTree = ""; }; + C1C083C62CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_04.binproto */ = {isa = PBXFileReference; lastKnownFileType = file; path = chat_item_group_change_chat_multiple_update_04.binproto; sourceTree = ""; }; + C1C083C72CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_04.txtproto */ = {isa = PBXFileReference; lastKnownFileType = text; path = chat_item_group_change_chat_multiple_update_04.txtproto; sourceTree = ""; }; + C1C083C82CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_05.binproto */ = {isa = PBXFileReference; lastKnownFileType = file; path = chat_item_group_change_chat_multiple_update_05.binproto; sourceTree = ""; }; + C1C083C92CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_05.txtproto */ = {isa = PBXFileReference; lastKnownFileType = text; path = chat_item_group_change_chat_multiple_update_05.txtproto; sourceTree = ""; }; + C1C083CA2CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_06.binproto */ = {isa = PBXFileReference; lastKnownFileType = file; path = chat_item_group_change_chat_multiple_update_06.binproto; sourceTree = ""; }; + C1C083CB2CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_06.txtproto */ = {isa = PBXFileReference; lastKnownFileType = text; path = chat_item_group_change_chat_multiple_update_06.txtproto; sourceTree = ""; }; + C1C083CC2CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_07.binproto */ = {isa = PBXFileReference; lastKnownFileType = file; path = chat_item_group_change_chat_multiple_update_07.binproto; sourceTree = ""; }; + C1C083CD2CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_07.txtproto */ = {isa = PBXFileReference; lastKnownFileType = text; path = chat_item_group_change_chat_multiple_update_07.txtproto; sourceTree = ""; }; + C1C083CE2CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_08.binproto */ = {isa = PBXFileReference; lastKnownFileType = file; path = chat_item_group_change_chat_multiple_update_08.binproto; sourceTree = ""; }; + C1C083CF2CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_08.txtproto */ = {isa = PBXFileReference; lastKnownFileType = text; path = chat_item_group_change_chat_multiple_update_08.txtproto; sourceTree = ""; }; C1C4AA3229E7038D000CE9D3 /* EditManagerShims.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditManagerShims.swift; sourceTree = ""; }; C1C7E4FA2BE0419300F196EE /* UploadMetadata.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UploadMetadata.swift; sourceTree = ""; }; C1CA5F8D2BE2F21C00D733CA /* MessageBackupDistributionListRecipientArchiver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageBackupDistributionListRecipientArchiver.swift; sourceTree = ""; }; @@ -6753,24 +6771,6 @@ E1ED82D42CDEA15600E9BB0D /* chat_item_group_change_chat_update_32.txtproto */ = {isa = PBXFileReference; lastKnownFileType = text; path = chat_item_group_change_chat_update_32.txtproto; sourceTree = ""; }; E1ED82D52CDEA15600E9BB0D /* chat_item_group_change_chat_update_33.binproto */ = {isa = PBXFileReference; lastKnownFileType = file; path = chat_item_group_change_chat_update_33.binproto; sourceTree = ""; }; E1ED82D62CDEA15600E9BB0D /* chat_item_group_change_chat_update_33.txtproto */ = {isa = PBXFileReference; lastKnownFileType = text; path = chat_item_group_change_chat_update_33.txtproto; sourceTree = ""; }; - E1ED82D72CDEA15600E9BB0D /* chat_item_group_change_chat_update_34.binproto */ = {isa = PBXFileReference; lastKnownFileType = file; path = chat_item_group_change_chat_update_34.binproto; sourceTree = ""; }; - E1ED82D82CDEA15600E9BB0D /* chat_item_group_change_chat_update_34.txtproto */ = {isa = PBXFileReference; lastKnownFileType = text; path = chat_item_group_change_chat_update_34.txtproto; sourceTree = ""; }; - E1ED82D92CDEA15600E9BB0D /* chat_item_group_change_chat_update_35.binproto */ = {isa = PBXFileReference; lastKnownFileType = file; path = chat_item_group_change_chat_update_35.binproto; sourceTree = ""; }; - E1ED82DA2CDEA15600E9BB0D /* chat_item_group_change_chat_update_35.txtproto */ = {isa = PBXFileReference; lastKnownFileType = text; path = chat_item_group_change_chat_update_35.txtproto; sourceTree = ""; }; - E1ED82DF2CDEA15600E9BB0D /* chat_item_group_change_chat_update_38.binproto */ = {isa = PBXFileReference; lastKnownFileType = file; path = chat_item_group_change_chat_update_38.binproto; sourceTree = ""; }; - E1ED82E02CDEA15600E9BB0D /* chat_item_group_change_chat_update_38.txtproto */ = {isa = PBXFileReference; lastKnownFileType = text; path = chat_item_group_change_chat_update_38.txtproto; sourceTree = ""; }; - E1ED82E12CDEA15600E9BB0D /* chat_item_group_change_chat_update_39.binproto */ = {isa = PBXFileReference; lastKnownFileType = file; path = chat_item_group_change_chat_update_39.binproto; sourceTree = ""; }; - E1ED82E22CDEA15600E9BB0D /* chat_item_group_change_chat_update_39.txtproto */ = {isa = PBXFileReference; lastKnownFileType = text; path = chat_item_group_change_chat_update_39.txtproto; sourceTree = ""; }; - E1ED82E32CDEA15600E9BB0D /* chat_item_group_change_chat_update_40.binproto */ = {isa = PBXFileReference; lastKnownFileType = file; path = chat_item_group_change_chat_update_40.binproto; sourceTree = ""; }; - E1ED82E42CDEA15600E9BB0D /* chat_item_group_change_chat_update_40.txtproto */ = {isa = PBXFileReference; lastKnownFileType = text; path = chat_item_group_change_chat_update_40.txtproto; sourceTree = ""; }; - E1ED82E52CDEA15600E9BB0D /* chat_item_group_change_chat_update_41.binproto */ = {isa = PBXFileReference; lastKnownFileType = file; path = chat_item_group_change_chat_update_41.binproto; sourceTree = ""; }; - E1ED82E62CDEA15600E9BB0D /* chat_item_group_change_chat_update_41.txtproto */ = {isa = PBXFileReference; lastKnownFileType = text; path = chat_item_group_change_chat_update_41.txtproto; sourceTree = ""; }; - E1ED82E72CDEA15600E9BB0D /* chat_item_group_change_chat_update_42.binproto */ = {isa = PBXFileReference; lastKnownFileType = file; path = chat_item_group_change_chat_update_42.binproto; sourceTree = ""; }; - E1ED82E82CDEA15600E9BB0D /* chat_item_group_change_chat_update_42.txtproto */ = {isa = PBXFileReference; lastKnownFileType = text; path = chat_item_group_change_chat_update_42.txtproto; sourceTree = ""; }; - E1ED82E92CDEA15600E9BB0D /* chat_item_group_change_chat_update_43.binproto */ = {isa = PBXFileReference; lastKnownFileType = file; path = chat_item_group_change_chat_update_43.binproto; sourceTree = ""; }; - E1ED82EA2CDEA15600E9BB0D /* chat_item_group_change_chat_update_43.txtproto */ = {isa = PBXFileReference; lastKnownFileType = text; path = chat_item_group_change_chat_update_43.txtproto; sourceTree = ""; }; - E1ED82EB2CDEA15600E9BB0D /* chat_item_group_change_chat_update_44.binproto */ = {isa = PBXFileReference; lastKnownFileType = file; path = chat_item_group_change_chat_update_44.binproto; sourceTree = ""; }; - E1ED82EC2CDEA15600E9BB0D /* chat_item_group_change_chat_update_44.txtproto */ = {isa = PBXFileReference; lastKnownFileType = text; path = chat_item_group_change_chat_update_44.txtproto; sourceTree = ""; }; E44AD4E524E98F430035D7B8 /* PhotoCaptureDismiss.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhotoCaptureDismiss.swift; sourceTree = ""; }; E75DD3DF2810CDBD00E32C36 /* SubscriptionModelsTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SubscriptionModelsTest.swift; sourceTree = ""; }; E7D7C93E28B580AC003F043B /* Bundle+OWS.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Bundle+OWS.swift"; sourceTree = ""; }; @@ -11587,6 +11587,24 @@ D90AA1342CC9616A00021CB0 /* chat_item_group_call_update_06.txtproto */, D90AA1352CC9616A00021CB0 /* chat_item_group_call_update_07.binproto */, D90AA1362CC9616A00021CB0 /* chat_item_group_call_update_07.txtproto */, + C1C083BE2CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_00.binproto */, + C1C083BF2CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_00.txtproto */, + C1C083C02CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_01.binproto */, + C1C083C12CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_01.txtproto */, + C1C083C22CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_02.binproto */, + C1C083C32CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_02.txtproto */, + C1C083C42CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_03.binproto */, + C1C083C52CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_03.txtproto */, + C1C083C62CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_04.binproto */, + C1C083C72CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_04.txtproto */, + C1C083C82CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_05.binproto */, + C1C083C92CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_05.txtproto */, + C1C083CA2CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_06.binproto */, + C1C083CB2CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_06.txtproto */, + C1C083CC2CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_07.binproto */, + C1C083CD2CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_07.txtproto */, + C1C083CE2CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_08.binproto */, + C1C083CF2CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_08.txtproto */, E1ED82932CDEA15600E9BB0D /* chat_item_group_change_chat_update_00.binproto */, E1ED82942CDEA15600E9BB0D /* chat_item_group_change_chat_update_00.txtproto */, E1ED82952CDEA15600E9BB0D /* chat_item_group_change_chat_update_01.binproto */, @@ -11655,24 +11673,6 @@ E1ED82D42CDEA15600E9BB0D /* chat_item_group_change_chat_update_32.txtproto */, E1ED82D52CDEA15600E9BB0D /* chat_item_group_change_chat_update_33.binproto */, E1ED82D62CDEA15600E9BB0D /* chat_item_group_change_chat_update_33.txtproto */, - E1ED82D72CDEA15600E9BB0D /* chat_item_group_change_chat_update_34.binproto */, - E1ED82D82CDEA15600E9BB0D /* chat_item_group_change_chat_update_34.txtproto */, - E1ED82D92CDEA15600E9BB0D /* chat_item_group_change_chat_update_35.binproto */, - E1ED82DA2CDEA15600E9BB0D /* chat_item_group_change_chat_update_35.txtproto */, - E1ED82DF2CDEA15600E9BB0D /* chat_item_group_change_chat_update_38.binproto */, - E1ED82E02CDEA15600E9BB0D /* chat_item_group_change_chat_update_38.txtproto */, - E1ED82E12CDEA15600E9BB0D /* chat_item_group_change_chat_update_39.binproto */, - E1ED82E22CDEA15600E9BB0D /* chat_item_group_change_chat_update_39.txtproto */, - E1ED82E32CDEA15600E9BB0D /* chat_item_group_change_chat_update_40.binproto */, - E1ED82E42CDEA15600E9BB0D /* chat_item_group_change_chat_update_40.txtproto */, - E1ED82E52CDEA15600E9BB0D /* chat_item_group_change_chat_update_41.binproto */, - E1ED82E62CDEA15600E9BB0D /* chat_item_group_change_chat_update_41.txtproto */, - E1ED82E72CDEA15600E9BB0D /* chat_item_group_change_chat_update_42.binproto */, - E1ED82E82CDEA15600E9BB0D /* chat_item_group_change_chat_update_42.txtproto */, - E1ED82E92CDEA15600E9BB0D /* chat_item_group_change_chat_update_43.binproto */, - E1ED82EA2CDEA15600E9BB0D /* chat_item_group_change_chat_update_43.txtproto */, - E1ED82EB2CDEA15600E9BB0D /* chat_item_group_change_chat_update_44.binproto */, - E1ED82EC2CDEA15600E9BB0D /* chat_item_group_change_chat_update_44.txtproto */, D90AA1372CC9616A00021CB0 /* chat_item_individual_call_update_00.binproto */, D90AA1382CC9616A00021CB0 /* chat_item_individual_call_update_00.txtproto */, D90AA1392CC9616A00021CB0 /* chat_item_individual_call_update_01.binproto */, @@ -15192,6 +15192,24 @@ D90AA5232CC9616B00021CB0 /* chat_item_group_call_update_06.txtproto in Resources */, D90AA5712CC9616B00021CB0 /* chat_item_group_call_update_07.binproto in Resources */, D90AA5B72CC9616B00021CB0 /* chat_item_group_call_update_07.txtproto in Resources */, + C1C083DD2CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_00.binproto in Resources */, + C1C083DE2CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_00.txtproto in Resources */, + C1C083E02CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_01.binproto in Resources */, + C1C083DF2CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_01.txtproto in Resources */, + C1C083DA2CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_02.binproto in Resources */, + C1C083DB2CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_02.txtproto in Resources */, + C1C083D32CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_03.binproto in Resources */, + C1C083D52CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_03.txtproto in Resources */, + C1C083D02CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_04.binproto in Resources */, + C1C083DC2CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_04.txtproto in Resources */, + C1C083D42CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_05.binproto in Resources */, + C1C083D72CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_05.txtproto in Resources */, + C1C083E12CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_06.binproto in Resources */, + C1C083D82CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_06.txtproto in Resources */, + C1C083D92CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_07.binproto in Resources */, + C1C083D12CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_07.txtproto in Resources */, + C1C083D22CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_08.binproto in Resources */, + C1C083D62CEB81BF00C07D76 /* chat_item_group_change_chat_multiple_update_08.txtproto in Resources */, E1ED83322CDEA15600E9BB0D /* chat_item_group_change_chat_update_00.binproto in Resources */, E1ED83212CDEA15600E9BB0D /* chat_item_group_change_chat_update_00.txtproto in Resources */, E1ED832C2CDEA15600E9BB0D /* chat_item_group_change_chat_update_01.binproto in Resources */, @@ -15260,24 +15278,6 @@ E1ED83092CDEA15600E9BB0D /* chat_item_group_change_chat_update_32.txtproto in Resources */, E1ED82F82CDEA15600E9BB0D /* chat_item_group_change_chat_update_33.binproto in Resources */, E1ED833A2CDEA15600E9BB0D /* chat_item_group_change_chat_update_33.txtproto in Resources */, - E1ED83172CDEA15600E9BB0D /* chat_item_group_change_chat_update_34.binproto in Resources */, - E1ED82F12CDEA15600E9BB0D /* chat_item_group_change_chat_update_34.txtproto in Resources */, - E1ED83432CDEA15600E9BB0D /* chat_item_group_change_chat_update_35.binproto in Resources */, - E1ED82FE2CDEA15600E9BB0D /* chat_item_group_change_chat_update_35.txtproto in Resources */, - E1ED83392CDEA15600E9BB0D /* chat_item_group_change_chat_update_38.binproto in Resources */, - E1ED83162CDEA15600E9BB0D /* chat_item_group_change_chat_update_38.txtproto in Resources */, - E1ED83022CDEA15600E9BB0D /* chat_item_group_change_chat_update_39.binproto in Resources */, - E1ED83122CDEA15600E9BB0D /* chat_item_group_change_chat_update_39.txtproto in Resources */, - E1ED830E2CDEA15600E9BB0D /* chat_item_group_change_chat_update_40.binproto in Resources */, - E1ED83142CDEA15600E9BB0D /* chat_item_group_change_chat_update_40.txtproto in Resources */, - E1ED830F2CDEA15600E9BB0D /* chat_item_group_change_chat_update_41.binproto in Resources */, - E1ED83452CDEA15600E9BB0D /* chat_item_group_change_chat_update_41.txtproto in Resources */, - E1ED833B2CDEA15600E9BB0D /* chat_item_group_change_chat_update_42.binproto in Resources */, - E1ED83252CDEA15600E9BB0D /* chat_item_group_change_chat_update_42.txtproto in Resources */, - E1ED82FF2CDEA15600E9BB0D /* chat_item_group_change_chat_update_43.binproto in Resources */, - E1ED833D2CDEA15600E9BB0D /* chat_item_group_change_chat_update_43.txtproto in Resources */, - E1ED83192CDEA15600E9BB0D /* chat_item_group_change_chat_update_44.binproto in Resources */, - E1ED833E2CDEA15600E9BB0D /* chat_item_group_change_chat_update_44.txtproto in Resources */, D90AA60F2CC9616B00021CB0 /* chat_item_individual_call_update_00.binproto in Resources */, D90AA5972CC9616B00021CB0 /* chat_item_individual_call_update_00.txtproto in Resources */, D90AA5032CC9616B00021CB0 /* chat_item_individual_call_update_01.binproto in Resources */, diff --git a/SignalServiceKit/Messages/Payments/ArchivedPayment.swift b/SignalServiceKit/Messages/Payments/ArchivedPayment.swift index 5833580f75..2fc0649089 100644 --- a/SignalServiceKit/Messages/Payments/ArchivedPayment.swift +++ b/SignalServiceKit/Messages/Payments/ArchivedPayment.swift @@ -150,11 +150,17 @@ extension ArchivedPayment { transaction.status = success var identification = BackupProto_PaymentNotification.TransactionDetails.MobileCoinTxoIdentification() - if let keyImages = mobileCoinIdentification?.keyImages { - identification.keyImages = keyImages - } - if let publicKey = mobileCoinIdentification?.publicKey { - identification.publicKey = publicKey + switch direction { + case .incoming: + if let publicKey = mobileCoinIdentification?.publicKey { + identification.publicKey = publicKey + } + case .outgoing: + if let keyImages = mobileCoinIdentification?.keyImages { + identification.keyImages = keyImages + } + case .unknown: + owsFailDebug("Direction of payment not specified.") } transaction.mobileCoinIdentification = identification @@ -186,7 +192,7 @@ extension TSPaymentModel { identifier = nil } else { identifier = ArchivedPayment.TransactionIdentifier( - publicKey: mcOutputPublicKeys, + publicKey: nil, keyImages: mcSpentKeyImages ) } diff --git a/SignalServiceKit/tests/MessageBackup/Signal-Message-Backup-Tests b/SignalServiceKit/tests/MessageBackup/Signal-Message-Backup-Tests index 8e12c23b37..fcd73d8389 160000 --- a/SignalServiceKit/tests/MessageBackup/Signal-Message-Backup-Tests +++ b/SignalServiceKit/tests/MessageBackup/Signal-Message-Backup-Tests @@ -1 +1 @@ -Subproject commit 8e12c23b37c7f463eea54d2edbc3b3f591a766ee +Subproject commit fcd73d838997294dc2d27b536cd1112ab33c4ee0