Update backup validator with LocatorInfo

Author: akonradi-signal

RELEASE_NOTES.md

@@ -1,2 +1,4 @@
 v0.73.1
 
+- Backups: the now-deprecated remote content locator fields are ignored and the new FilePointer.locator_info field must
+  be set.

rust/message-backup/src/backup/account_data.rs

@@ -123,6 +123,7 @@ pub struct AccountSettings<M: Method + ReferencedTypes> {
     pub preferred_reaction_emoji: M::Value<Vec<String>>,
     pub default_chat_style: M::Value<Option<ChatStyle<M>>>,
     pub custom_chat_colors: CustomColorMap<M>,
+    pub optimize_on_device_storage: M::Value<bool>,
 }
 
 #[derive(Copy, Clone, Debug, PartialEq, serde::Serialize)]
@@ -361,6 +362,7 @@ impl<M: Method + ReferencedTypes, C: ReportUnusualTimestamp>
             preferredReactionEmoji,
             defaultChatStyle,
             customChatColors,
+            optimizeOnDeviceStorage,
             special_fields: _,
         } = value;
 
@@ -403,6 +405,7 @@ impl<M: Method + ReferencedTypes, C: ReportUnusualTimestamp>
             has_completed_username_onboarding: M::value(hasCompletedUsernameOnboarding),
             preferred_reaction_emoji: M::value(preferredReactionEmoji),
             universal_expire_timer: M::value(universal_expire_timer),
+            optimize_on_device_storage: M::value(optimizeOnDeviceStorage),
         })
     }
 }
@@ -460,6 +463,7 @@ mod test {
                     special_fields: Default::default(),
                 })
                 .into(),
+                optimizeOnDeviceStorage: true,
                 ..Default::default()
             }
         }
@@ -536,6 +540,7 @@ mod test {
                     universal_expire_timer: None,
                     preferred_reaction_emoji: vec![],
                     custom_chat_colors: CustomColorMap::from_proto_test_data(),
+                    optimize_on_device_storage: true,
                 },
                 avatar_url_path: "".to_string(),
                 backup_subscription: Some(IapSubscriberData {

rust/message-backup/src/backup/chat/chat_style.rs

@@ -583,7 +583,7 @@ mod test {
     #[test_case(|x| x.set_wallpaperPhoto(proto::FilePointer::test_data()) => Ok(()); "wallpaper photo")]
     #[test_case(
         |x| x.set_wallpaperPhoto(proto::FilePointer::default()) =>
-        Err(ChatStyleError::WallpaperPhoto(FilePointerError::NoLocator));
+        Err(ChatStyleError::WallpaperPhoto(FilePointerError::NoLocatorInfo));
         "invalid wallpaper photo"
     )]
     #[test_case(

rust/message-backup/src/backup/chat/contact_message.rs

@@ -264,7 +264,7 @@ mod test {
     #[test_case(
         |x| x.contact.as_mut().unwrap().avatar = Some(proto::FilePointer::default()).into() =>
         Err(ChatItemError::ContactAttachment(ContactAttachmentError::Avatar(
-            FilePointerError::NoLocator
+            FilePointerError::NoLocatorInfo
         )));
         "with invalid avatar"
     )]

rust/message-backup/src/backup/chat/link.rs

@@ -92,7 +92,7 @@ mod test {
     #[test_case(|x| x.title = None => Ok(()); "no title")]
     #[test_case(|x| x.title = Some("".into()) => Ok(()); "empty title")]
     #[test_case(|x| x.image = None.into() => Ok(()); "no image")]
-    #[test_case(|x| x.image = Some(proto::FilePointer::default()).into() => Err(LinkPreviewError::Image(FilePointerError::NoLocator)); "invalid image")]
+    #[test_case(|x| x.image = Some(proto::FilePointer::default()).into() => Err(LinkPreviewError::Image(FilePointerError::NoLocatorInfo)); "invalid image")]
     #[test_case(|x| x.description = None => Ok(()); "no description")]
     #[test_case(|x| x.description = Some("".into()) => Ok(()); "empty description")]
     #[test_case(

rust/message-backup/src/backup/chat/story_reply.rs

@@ -157,7 +157,7 @@ mod test {
         "invalid text"
     )]
     #[test_case(|x| x.mut_textReply().longText = Some(proto::FilePointer::test_data()).into() => Ok(()); "long text")]
-    #[test_case(|x| x.mut_textReply().longText = Some(Default::default()).into() => Err(DirectStoryReplyError::LongText(FilePointerError::NoLocator)); "invalid long text")]
+    #[test_case(|x| x.mut_textReply().longText = Some(Default::default()).into() => Err(DirectStoryReplyError::LongText(FilePointerError::NoLocatorInfo)); "invalid long text")]
     #[test_case(|x| *x.mut_emoji() = "".into() => Err(DirectStoryReplyError::EmptyEmoji); "empty emoji")]
     #[test_case(|x| *x.mut_emoji() = "x".into() => Ok(()); "valid emoji")]
     #[test_case(|x| x.reactions.clear() => Ok(()); "no reactions")]

rust/message-backup/src/backup/expected_serialized_backup.json

@@ -52,7 +52,8 @@
             "color": 4279383126
           }
         }
-      }
+      },
+      "optimize_on_device_storage": true
     },
     "avatar_url_path": "",
     "donation_subscription": null,