backups: Pull the latest backups proto in and update the tests

Author: moiseev-signal

RELEASE_NOTES.md

@@ -1,2 +1,3 @@
 v0.86.4
 
+backups: Support latest backup.proto definitions

rust/message-backup/benches/generation/mod.rs

@@ -102,6 +102,17 @@ pub fn generate_frames(
             hasCompletedUsernameOnboarding: true,
             phoneNumberSharingMode: proto::account_data::PhoneNumberSharingMode::EVERYBODY.into(),
             defaultSentMediaQuality: proto::account_data::SentMediaQuality::STANDARD.into(),
+            appTheme: proto::account_data::AppTheme::SYSTEM.into(),
+            callsUseLessDataSetting: proto::account_data::CallsUseLessDataSetting::MOBILE_DATA_ONLY
+                .into(),
+            ..Default::default()
+        })
+        .into(),
+        androidSpecificSettings: Some(proto::account_data::AndroidSpecificSettings {
+            useSystemEmoji: true,
+            screenshotSecurity: true,
+            navigationBarSize:
+                proto::account_data::android_specific_settings::NavigationBarSize::COMPACT.into(),
             ..Default::default()
         })
         .into(),

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

@@ -112,6 +112,8 @@ pub enum IapSubscriptionId {
     M::Value<SentMediaQuality>: PartialEq,
     M::Value<Option<AutoDownloadSettings>>: PartialEq,
     M::Value<Option<Duration>>: PartialEq,
+    M::Value<AppTheme>: PartialEq,
+    M::Value<CallsUseLessDataSetting>: PartialEq,
 ))]
 pub struct AccountSettings<M: Method + ReferencedTypes> {
     pub phone_number_sharing: M::Value<PhoneSharing>,
@@ -135,11 +137,12 @@ pub struct AccountSettings<M: Method + ReferencedTypes> {
     pub custom_chat_colors: CustomColorMap<M>,
     pub optimize_on_device_storage: M::Value<bool>,
     pub backup_level: M::Value<Option<BackupLevel>>,
-    pub show_sealed_sender_indicators: M::Value<bool>,
     pub default_sent_media_quality: M::Value<SentMediaQuality>,
     pub auto_download_settings: M::Value<Option<AutoDownloadSettings>>,
     pub screen_lock_timeout: M::Value<Option<Duration>>,
     pub pin_reminders: M::Value<Option<bool>>,
+    pub app_theme: M::Value<AppTheme>,
+    pub calls_use_less_data_setting: M::Value<CallsUseLessDataSetting>,
 }
 
 #[derive(Copy, Clone, Debug, PartialEq, serde::Serialize)]
@@ -154,11 +157,18 @@ pub enum SentMediaQuality {
     High,
 }
 
+#[derive(Copy, Clone, Debug, PartialEq, serde::Serialize)]
+pub enum NavigationBarSize {
+    Normal,
+    Compact,
+}
+
 #[derive(Debug, serde::Serialize)]
 #[cfg_attr(test, derive(PartialEq))]
 pub struct AndroidSpecificSettings {
     pub use_system_emoji: bool,
     pub screenshot_security: bool,
+    pub navigation_bar_size: NavigationBarSize,
 }
 
 #[derive(Copy, Clone, Debug, PartialEq, serde::Serialize)]
@@ -178,6 +188,20 @@ pub struct AutoDownloadSettings {
     pub documents: AutoDownloadOption,
 }
 
+#[derive(Copy, Clone, Debug, PartialEq, serde::Serialize)]
+pub enum AppTheme {
+    System,
+    Light,
+    Dark,
+}
+
+#[derive(Copy, Clone, Debug, PartialEq, serde::Serialize)]
+pub enum CallsUseLessDataSetting {
+    Never,
+    MobileDataOnly,
+    WifiAndMobileData,
+}
+
 #[derive(Debug, displaydoc::Display, thiserror::Error)]
 #[cfg_attr(test, derive(PartialEq))]
 pub enum AccountDataError {
@@ -211,6 +235,12 @@ pub enum AccountDataError {
     UnknownSentMediaQuality,
     /// auto download option is UNKNOWN
     UnknownAutoDownloadOption,
+    /// navigation bar size in Android specific settings is UNKNOWN
+    UnknownAndroidNavigationBarSize,
+    /// app theme is UNKNOWN
+    UnknownAppTheme,
+    /// calls use less data setting is UNKNOWN
+    UnknownCallsUseLessDataSetting,
 }
 
 #[derive(Debug, displaydoc::Display, thiserror::Error)]
@@ -278,7 +308,8 @@ impl<M: Method + ReferencedTypes, C: ReportUnusualTimestamp> TryIntoWith<Account
 
         let android_specific_settings = androidSpecificSettings
             .into_option()
-            .map(AndroidSpecificSettings::from);
+            .map(AndroidSpecificSettings::try_from)
+            .transpose()?;
 
         Ok(AccountData {
             profile_key: M::value(profile_key),
@@ -426,11 +457,12 @@ impl<M: Method + ReferencedTypes, C: ReportUnusualTimestamp> TryIntoWith<Account
             customChatColors,
             optimizeOnDeviceStorage,
             backupTier,
-            showSealedSenderIndicators,
             defaultSentMediaQuality,
             autoDownloadSettings,
             screenLockTimeoutMinutes,
             pinReminders,
+            appTheme,
+            callsUseLessDataSetting,
             special_fields: _,
         } = self;
 
@@ -482,6 +514,26 @@ impl<M: Method + ReferencedTypes, C: ReportUnusualTimestamp> TryIntoWith<Account
         let screen_lock_timeout =
             screenLockTimeoutMinutes.map(|mins| Duration::from_mins(mins as u64));
 
+        use proto::account_data::AppTheme as AppThemeProto;
+        let app_theme = match appTheme.enum_value_or_default() {
+            AppThemeProto::UNKNOWN_APP_THEME => {
+                return Err(AccountDataError::UnknownAppTheme);
+            }
+            AppThemeProto::SYSTEM => AppTheme::System,
+            AppThemeProto::LIGHT => AppTheme::Light,
+            AppThemeProto::DARK => AppTheme::Dark,
+        };
+
+        use proto::account_data::CallsUseLessDataSetting as CallDataProto;
+        let calls_use_less_data_setting = match callsUseLessDataSetting.enum_value_or_default() {
+            CallDataProto::UNKNOWN_CALL_DATA_SETTING => {
+                return Err(AccountDataError::UnknownCallsUseLessDataSetting);
+            }
+            CallDataProto::NEVER => CallsUseLessDataSetting::Never,
+            CallDataProto::MOBILE_DATA_ONLY => CallsUseLessDataSetting::MobileDataOnly,
+            CallDataProto::WIFI_AND_MOBILE_DATA => CallsUseLessDataSetting::WifiAndMobileData,
+        };
+
         Ok(AccountSettings {
             phone_number_sharing: M::value(phone_number_sharing),
             default_chat_style: M::value(default_chat_style),
@@ -505,10 +557,11 @@ impl<M: Method + ReferencedTypes, C: ReportUnusualTimestamp> TryIntoWith<Account
             optimize_on_device_storage: M::value(optimizeOnDeviceStorage),
             backup_level: M::value(backup_level),
             auto_download_settings: M::value(auto_download_settings),
-            show_sealed_sender_indicators: M::value(showSealedSenderIndicators),
             pin_reminders: M::value(pinReminders),
             default_sent_media_quality: M::value(default_sent_media_quality),
             screen_lock_timeout: M::value(screen_lock_timeout),
+            app_theme: M::value(app_theme),
+            calls_use_less_data_setting: M::value(calls_use_less_data_setting),
         })
     }
 }
@@ -554,18 +607,30 @@ impl TryFrom<proto::account_data::AutoDownloadSettings> for AutoDownloadSettings
     }
 }
 
-impl From<proto::account_data::AndroidSpecificSettings> for AndroidSpecificSettings {
-    fn from(value: proto::account_data::AndroidSpecificSettings) -> Self {
+impl TryFrom<proto::account_data::AndroidSpecificSettings> for AndroidSpecificSettings {
+    type Error = AccountDataError;
+
+    fn try_from(value: proto::account_data::AndroidSpecificSettings) -> Result<Self, Self::Error> {
         use proto::account_data::AndroidSpecificSettings as SettingsProto;
         let SettingsProto {
             useSystemEmoji,
             screenshotSecurity,
+            navigationBarSize,
             special_fields: _,
         } = value;
-        Self {
+        use proto::account_data::android_specific_settings::NavigationBarSize as BarSizeProto;
+        let navigation_bar_size = match navigationBarSize.enum_value_or_default() {
+            BarSizeProto::UNKNOWN_BAR_SIZE => {
+                return Err(AccountDataError::UnknownAndroidNavigationBarSize);
+            }
+            BarSizeProto::NORMAL => NavigationBarSize::Normal,
+            BarSizeProto::COMPACT => NavigationBarSize::Compact,
+        };
+        Ok(Self {
             use_system_emoji: useSystemEmoji,
             screenshot_security: screenshotSecurity,
-        }
+            navigation_bar_size,
+        })
     }
 }
 
@@ -629,6 +694,9 @@ mod test {
                     .into(),
                 screenLockTimeoutMinutes: Some(42),
                 defaultSentMediaQuality: proto::account_data::SentMediaQuality::STANDARD.into(),
+                appTheme: proto::account_data::AppTheme::SYSTEM.into(),
+                callsUseLessDataSetting:
+                    proto::account_data::CallsUseLessDataSetting::MOBILE_DATA_ONLY.into(),
                 ..Default::default()
             }
         }
@@ -659,14 +727,19 @@ mod test {
             Self {
                 useSystemEmoji: true,
                 screenshotSecurity: false,
+                navigationBarSize:
+                    proto::account_data::android_specific_settings::NavigationBarSize::COMPACT
+                        .into(),
                 ..Default::default()
             }
         }
     }
 
     impl AndroidSpecificSettings {
         pub(crate) fn from_proto_test_data() -> Self {
-            proto::account_data::AndroidSpecificSettings::test_data().into()
+            proto::account_data::AndroidSpecificSettings::test_data()
+                .try_into()
+                .expect("valid data")
         }
     }
 
@@ -744,10 +817,11 @@ mod test {
                     optimize_on_device_storage: false,
                     backup_level: Some(BackupLevel::Paid),
                     auto_download_settings: Some(AutoDownloadSettings::from_proto_test_data()),
-                    show_sealed_sender_indicators: false,
                     pin_reminders: None,
                     default_sent_media_quality: SentMediaQuality::Standard,
                     screen_lock_timeout: Some(Duration::from_mins(42)),
+                    app_theme: AppTheme::System,
+                    calls_use_less_data_setting: CallsUseLessDataSetting::MobileDataOnly,
                 },
                 avatar_url_path: "".to_string(),
                 backup_subscription: Some(IapSubscriberData {

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

@@ -55,7 +55,6 @@
       },
       "optimize_on_device_storage": false,
       "backup_level": 201,
-      "show_sealed_sender_indicators": false,
       "default_sent_media_quality": "Standard",
       "auto_download_settings": {
         "images": "Never",
@@ -64,7 +63,9 @@
         "documents": "WifiAndCellular"
       },
       "screen_lock_timeout": 2520000,
-      "pin_reminders": null
+      "pin_reminders": null,
+      "app_theme": "System",
+      "calls_use_less_data_setting": "MobileDataOnly"
     },
     "avatar_url_path": "",
     "donation_subscription": null,
@@ -77,7 +78,8 @@
     "svr_pin": "",
     "android_specific_settings": {
       "use_system_emoji": true,
-      "screenshot_security": false
+      "screenshot_security": false,
+      "navigation_bar_size": "Compact"
     },
     "bio_text": "",
     "bio_emoji": ""

rust/message-backup/src/proto/backup.proto

@@ -88,6 +88,20 @@ message AccountData {
     AutoDownloadOption documents = 4;
   }
 
+  enum AppTheme {
+    UNKNOWN_APP_THEME = 0; // Interpret as "System"
+    SYSTEM = 1;
+    LIGHT = 2;
+    DARK = 3;
+  }
+
+  enum CallsUseLessDataSetting {
+    UNKNOWN_CALL_DATA_SETTING = 0; // Interpret as "Never"
+    NEVER = 1;
+    MOBILE_DATA_ONLY = 2;
+    WIFI_AND_MOBILE_DATA = 3;
+  }
+
   message AccountSettings {
     bool readReceipts = 1;
     bool sealedSenderIndicators = 2;
@@ -111,12 +125,14 @@ message AccountData {
     bool optimizeOnDeviceStorage = 20;
     // See zkgroup for integer particular values. Unset if backups are not enabled.
     optional uint64 backupTier = 21;
-    bool showSealedSenderIndicators = 22;
+    reserved /* showSealedSenderIndicators */ 22;
     SentMediaQuality defaultSentMediaQuality = 23;
     AutoDownloadSettings autoDownloadSettings = 24;
     reserved /* wifiAutoDownloadSettings */ 25;
     optional uint32 screenLockTimeoutMinutes = 26; // If unset, consider screen lock to be disabled.
     optional bool pinReminders = 27; // If unset, consider pin reminders to be enabled.
+    AppTheme appTheme = 28;  // If unset, treat the same as "Unknown" case
+    CallsUseLessDataSetting callsUseLessDataSetting = 29;  // If unset, treat the same as "Unknown" case
   }
 
   message SubscriberData {
@@ -138,8 +154,15 @@ message AccountData {
   }
 
   message AndroidSpecificSettings {
+    enum NavigationBarSize {
+      UNKNOWN_BAR_SIZE = 0; // Intepret as "Normal"
+      NORMAL = 1;
+      COMPACT = 2;
+    }
+
     bool useSystemEmoji = 1;
     bool screenshotSecurity = 2;
+    NavigationBarSize navigationBarSize = 3; // If unset, treat the same as "Unknown" case
   }
 
   bytes profileKey = 1;

rust/message-backup/src/scramble.rs

@@ -303,12 +303,13 @@ impl Visit<Scrambler> for proto::account_data::AccountSettings {
             customChatColors,
             optimizeOnDeviceStorage: _,
             backupTier: _,
-            special_fields: _,
-            showSealedSenderIndicators: _,
+            appTheme: _,
+            callsUseLessDataSetting: _,
             defaultSentMediaQuality: _,
             autoDownloadSettings: _,
             screenLockTimeoutMinutes: _,
             pinReminders: _,
+            special_fields: _,
         } = self;
 
         defaultChatStyle.accept(visitor);

rust/message-backup/tests/res/canonical-backup.binproto

@@ -41,11 +41,12 @@
       "custom_chat_colors": {},
       "optimize_on_device_storage": false,
       "backup_level": null,
-      "show_sealed_sender_indicators": false,
       "default_sent_media_quality": "Standard",
       "auto_download_settings": null,
       "screen_lock_timeout": null,
-      "pin_reminders": null
+      "pin_reminders": null,
+      "app_theme": "System",
+      "calls_use_less_data_setting": "MobileDataOnly"
     },
     "avatar_url_path": "",
     "donation_subscription": {
@@ -55,7 +56,11 @@
     },
     "backup_subscription": null,
     "svr_pin": "",
-    "android_specific_settings": null,
+    "android_specific_settings": {
+      "use_system_emoji": true,
+      "screenshot_security": true,
+      "navigation_bar_size": "Normal"
+    },
     "bio_text": "",
     "bio_emoji": ""
   },

rust/message-backup/tests/res/canonical-backup.expected.json

@@ -41,11 +41,12 @@
       "custom_chat_colors": {},
       "optimize_on_device_storage": false,
       "backup_level": null,
-      "show_sealed_sender_indicators": false,
       "default_sent_media_quality": "Standard",
       "auto_download_settings": null,
       "screen_lock_timeout": null,
-      "pin_reminders": null
+      "pin_reminders": null,
+      "app_theme": "System",
+      "calls_use_less_data_setting": "MobileDataOnly"
     },
     "avatar_url_path": "",
     "donation_subscription": {
@@ -55,7 +56,11 @@
     },
     "backup_subscription": null,
     "svr_pin": "",
-    "android_specific_settings": null,
+    "android_specific_settings": {
+      "use_system_emoji": true,
+      "screenshot_security": true,
+      "navigation_bar_size": "Normal"
+    },
     "bio_text": "",
     "bio_emoji": ""
   },