Add backupsSubscriberData, use to set optimizeOnDeviceStorage

Author: sashaweiss-signal

src/main/kotlin/tests/AccountDataTestCase.kt

@@ -40,10 +40,24 @@ object AccountDataTestCase : TestCase("account_data") {
         color = someEnum(AccountData.UsernameLink.Color::class.java, excluding = AccountData.UsernameLink.Color.UNKNOWN)
       )
     }.nullable()
-
     val usernameLink = some(usernameLinkGenerator)
     val username = some(Generators.usernames())
 
+    val backupsSubscriberDataGenerator: Generator<AccountData.IAPSubscriberData?> = Generators.permutation<AccountData.IAPSubscriberData?> {
+      val (purchaseToken, originalTransactionId) = oneOf(
+        Generators.nonEmptyStrings() as Generator<Any?>,
+        Generators.longs(lower = 1) as Generator<Any?>
+      )
+
+      frames += AccountData.IAPSubscriberData(
+        subscriberId = someBytes(32).toByteString(),
+        purchaseToken = someOneOf(purchaseToken),
+        originalTransactionId = someOneOf(originalTransactionId)
+      )
+    }.nullable()
+    val backupsSubscriberData = some(backupsSubscriberDataGenerator)
+    val optimizeOnDeviceStorage = someBoolean()
+
     frames += Frame(
       account = AccountData(
         profileKey = someBytes(32).toByteString(),
@@ -64,14 +78,6 @@ object AccountDataTestCase : TestCase("account_data") {
             manuallyCancelled = someBoolean()
           )
         },
-        // TODO Currently in flux, unclear if this is even needed anymore
-//        backupsSubscriberData = someNullablePermutation {
-//          frames += AccountData.SubscriberData(
-//            subscriberId = someBytes(32).toByteString(),
-//            currencyCode = some(Generators.list("USD", "EUR", "GBP")),
-//            manuallyCancelled = someBoolean()
-//          )
-//        },
         accountSettings = AccountData.AccountSettings(
           readReceipts = someBoolean(),
           sealedSenderIndicators = someBoolean(),
@@ -118,8 +124,14 @@ object AccountDataTestCase : TestCase("account_data") {
               )
             )
           ),
-          optimizeOnDeviceStorage = someBoolean()
-        )
+          // This setting is only available if we are subscribed to Backups.
+          optimizeOnDeviceStorage = if (backupsSubscriberData != null) {
+            optimizeOnDeviceStorage
+          } else {
+            false
+          }
+        ),
+        backupsSubscriberData = backupsSubscriberData
       )
     )
 

test-cases/account_data_00.binproto

@@ -14,18 +14,18 @@ Frame {
       customChatColors = [
         CustomChatColor {
           id = 1
-          solid = -7820003
+          solid = -7295395
         },
         CustomChatColor {
           id = 2
-          solid = -1309265
+          solid = -5112496
         },
         CustomChatColor {
           gradient = Gradient {
-            angle = 159
+            angle = 239
             colors = [
-              -5726839,
-              -4759389
+              -577122,
+              -6739874
             ]
             positions = [
               0.0,
@@ -43,20 +43,19 @@ Frame {
       keepMutedChatsArchived = true
       linkPreviews = true
       notDiscoverableByPhoneNumber = true
-      optimizeOnDeviceStorage = true
       phoneNumberSharingMode = PhoneNumberSharingMode.EVERYBODY
       preferContactAvatars = true
       readReceipts = true
       sealedSenderIndicators = true
       storiesDisabled = true
       storyViewReceiptsEnabled = true
       typingIndicators = true
-      universalExpireTimerSeconds = 314441250
+      universalExpireTimerSeconds = 6518363
     }
     avatarUrlPath = ""
     familyName = ""
     givenName = ""
-    profileKey = <46d547630e64d7294f139f80950d8ea9f18dbe1090e3527a69f4f6360b7e939b>
+    profileKey = <ba7d509eae665c54f4c8fe4c6906b3bc1dd6ad80d35172d511d6299d176b795a>
     svrPin = "1234"
   }
 }

test-cases/account_data_00.txtproto

@@ -14,18 +14,18 @@ Frame {
       customChatColors = [
         CustomChatColor {
           id = 1
-          solid = -4506046
+          solid = -6364780
         },
         CustomChatColor {
           id = 2
-          solid = -298204
+          solid = -8932443
         },
         CustomChatColor {
           gradient = Gradient {
-            angle = 181
+            angle = 335
             colors = [
-              -12250776,
-              -2367362
+              -5320582,
+              -10997243
             ]
             positions = [
               0.0,
@@ -50,17 +50,21 @@ Frame {
         }
       }
       phoneNumberSharingMode = PhoneNumberSharingMode.NOBODY
-      universalExpireTimerSeconds = 1776497293
+      universalExpireTimerSeconds = 708390689
+    }
+    avatarUrlPath = "https://signal.org/CfVdHWJ"
+    backupsSubscriberData = IAPSubscriberData {
+      purchaseToken = "HLOokMZPmjwqTJ"
+      subscriberId = <7ba7623758493e1bb0268c5da867e8b454754359d4337a3cc4f08757f22b6799>
     }
-    avatarUrlPath = "https://signal.org/PMVYoUEqXx"
     donationSubscriberData = SubscriberData {
       currencyCode = "USD"
       manuallyCancelled = true
-      subscriberId = <98749f3fd268ebfe4cb7634ea9ab33f68328b1520712b5adab5ce2a61c11f4a5>
+      subscriberId = <0cc51a91522bafdb5ea278fda6c9d64b759ef2a75d430cc52c50e0151c6530fd>
     }
-    familyName = "Gallegos"
-    givenName = "Kristen"
-    profileKey = <46d547630e64d7294f139f80950d8ea9f18dbe1090e3527a69f4f6360b7e939b>
+    familyName = "Roberts"
+    givenName = "Candice"
+    profileKey = <ba7d509eae665c54f4c8fe4c6906b3bc1dd6ad80d35172d511d6299d176b795a>
     svrPin = "123456"
     username = "emery.8742"
     usernameLink = UsernameLink {

test-cases/account_data_01.binproto

@@ -14,18 +14,18 @@ Frame {
       customChatColors = [
         CustomChatColor {
           id = 1
-          solid = -6607516
+          solid = -7668588
         },
         CustomChatColor {
           id = 2
-          solid = -3877931
+          solid = -5756433
         },
         CustomChatColor {
           gradient = Gradient {
-            angle = 347
+            angle = 165
             colors = [
-              -1570527,
-              -12481143
+              -8820984,
+              -792050
             ]
             positions = [
               0.0,
@@ -64,16 +64,20 @@ Frame {
       storiesDisabled = true
       storyViewReceiptsEnabled = true
       typingIndicators = true
-      universalExpireTimerSeconds = 844099452
+      universalExpireTimerSeconds = 1049338212
+    }
+    avatarUrlPath = "https://signal.org/taPHwAvo"
+    backupsSubscriberData = IAPSubscriberData {
+      purchaseToken = "PMVYoUEqXx"
+      subscriberId = <cd2f910df566824710636ce8af1b499244fc7b251b65c6d3f9de9f64c5fbf0ff>
     }
-    avatarUrlPath = "https://signal.org/DXOZYcESWutf"
     donationSubscriberData = SubscriberData {
       currencyCode = "EUR"
-      subscriberId = <36327e78d6bf0ffb1ec67707ad43f2d167963887aa1d063c8db57633fa5483f3>
+      subscriberId = <0e366ee6b4982ddc1b1b12d3edc997f4505b2d0c464633445cb1f9a68a644847>
     }
-    familyName = "Kramer"
-    givenName = "Janelle"
-    profileKey = <46d547630e64d7294f139f80950d8ea9f18dbe1090e3527a69f4f6360b7e939b>
+    familyName = "Hyde"
+    givenName = "Evan"
+    profileKey = <ba7d509eae665c54f4c8fe4c6906b3bc1dd6ad80d35172d511d6299d176b795a>
     svrPin = "abcdefg"
     username = "sabrina.06"
     usernameLink = UsernameLink {

test-cases/account_data_01.txtproto

@@ -14,18 +14,18 @@ Frame {
       customChatColors = [
         CustomChatColor {
           id = 1
-          solid = -7820003
+          solid = -7295395
         },
         CustomChatColor {
           id = 2
-          solid = -1309265
+          solid = -5112496
         },
         CustomChatColor {
           gradient = Gradient {
-            angle = 159
+            angle = 239
             colors = [
-              -5726839,
-              -4759389
+              -577122,
+              -6739874
             ]
             positions = [
               0.0,
@@ -52,17 +52,20 @@ Frame {
         }
       }
       phoneNumberSharingMode = PhoneNumberSharingMode.NOBODY
-      universalExpireTimerSeconds = 314441250
+      universalExpireTimerSeconds = 6518363
     }
     avatarUrlPath = ""
+    backupsSubscriberData = IAPSubscriberData {
+      subscriberId = <1a96e707c00259c7264eb5417dfb20d9de3b2c342e2771dbc69f3f56cf981fd6>
+    }
     donationSubscriberData = SubscriberData {
       currencyCode = "GBP"
       manuallyCancelled = true
-      subscriberId = <af4b15d212e5d730c3c226dc221e8fec3522a5e4cd2f910df566824710636ce8>
+      subscriberId = <ea8e9fff77a691f7effe2df539419f38d11a00b7a2c95354552e30c89a57440e>
     }
-    familyName = "Woods"
-    givenName = "Mavis"
-    profileKey = <46d547630e64d7294f139f80950d8ea9f18dbe1090e3527a69f4f6360b7e939b>
+    familyName = "Snow"
+    givenName = "Jasmine"
+    profileKey = <ba7d509eae665c54f4c8fe4c6906b3bc1dd6ad80d35172d511d6299d176b795a>
     svrPin = "안녕하세요, 세계"
     username = "ryan.8012"
     usernameLink = UsernameLink {