Merge branch 'molly-6.24'

mollyim · Jun 29, 2023 · 2c726c9 · 2c726c9
2 parents 91a0613 + a5fef87
commit 2c726c9
Show file tree

Hide file tree

Showing 219 changed files with 21,490 additions and 19,627 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -56,8 +56,8 @@ ext {
     MAPS_API_KEY = getEnv('CI_MAPS_API_KEY') ?: mapsApiKey
 }
 
-def canonicalVersionCode = 1278
-def canonicalVersionName = "6.23.5"
+def canonicalVersionCode = 1283
+def canonicalVersionName = "6.24.4"
 def mollyRevision = 0
 
 def postFixSize = 100
@@ -421,6 +421,7 @@ dependencies {
     implementation libs.androidx.gridlayout
     implementation libs.androidx.exifinterface
     implementation libs.androidx.compose.rxjava3
+    implementation libs.androidx.compose.runtime.livedata
     implementation libs.androidx.constraintlayout
     implementation libs.androidx.multidex
     implementation libs.androidx.navigation.fragment.ktx

diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/jobs/PreKeysSyncJobTest.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/jobs/PreKeysSyncJobTest.kt
@@ -21,8 +21,8 @@ import org.thoughtcrime.securesms.testing.assertIsNot
 import org.thoughtcrime.securesms.testing.parsedRequestBody
 import org.thoughtcrime.securesms.testing.success
 import org.whispersystems.signalservice.api.push.SignedPreKeyEntity
+import org.whispersystems.signalservice.internal.push.OneTimePreKeyCounts
 import org.whispersystems.signalservice.internal.push.PreKeyState
-import org.whispersystems.signalservice.internal.push.PreKeyStatus
 
 @RunWith(AndroidJUnit4::class)
 class PreKeysSyncJobTest {
@@ -106,8 +106,8 @@ class PreKeysSyncJobTest {
     val currentPniKeyId = pniPreKeyMeta.activeSignedPreKeyId
 
     InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
-      Get("/v2/keys?identity=aci") { MockResponse().success(PreKeyStatus(100)) },
-      Get("/v2/keys?identity=pni") { MockResponse().success(PreKeyStatus(100)) }
+      Get("/v2/keys?identity=aci") { MockResponse().success(OneTimePreKeyCounts(100, 100)) },
+      Get("/v2/keys?identity=pni") { MockResponse().success(OneTimePreKeyCounts(100, 100)) }
     )
 
     // WHEN
@@ -133,7 +133,7 @@ class PreKeysSyncJobTest {
     val currentPniKeyId = pniPreKeyMeta.activeSignedPreKeyId
 
     InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
-      Get("/v2/keys?identity=aci") { MockResponse().success(PreKeyStatus(100)) },
+      Get("/v2/keys?identity=aci") { MockResponse().success(OneTimePreKeyCounts(100, 100)) },
       Put("/v2/keys/signed?identity=pni") { MockResponse().success() }
     )
 
@@ -157,15 +157,15 @@ class PreKeysSyncJobTest {
     val currentAciKeyId = aciPreKeyMeta.activeSignedPreKeyId
     val currentPniKeyId = pniPreKeyMeta.activeSignedPreKeyId
 
-    val currentNextAciPreKeyId = aciPreKeyMeta.nextOneTimePreKeyId
-    val currentNextPniPreKeyId = pniPreKeyMeta.nextOneTimePreKeyId
+    val currentNextAciPreKeyId = aciPreKeyMeta.nextEcOneTimePreKeyId
+    val currentNextPniPreKeyId = pniPreKeyMeta.nextEcOneTimePreKeyId
 
     lateinit var aciPreKeyStateRequest: PreKeyState
     lateinit var pniPreKeyStateRequest: PreKeyState
 
     InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
-      Get("/v2/keys?identity=aci") { MockResponse().success(PreKeyStatus(5)) },
-      Get("/v2/keys?identity=pni") { MockResponse().success(PreKeyStatus(5)) },
+      Get("/v2/keys?identity=aci") { MockResponse().success(OneTimePreKeyCounts(5, 5)) },
+      Get("/v2/keys?identity=pni") { MockResponse().success(OneTimePreKeyCounts(5, 5)) },
       Put("/v2/keys/?identity=aci") { r ->
         aciPreKeyStateRequest = r.parsedRequestBody()
         MockResponse().success()
@@ -184,8 +184,8 @@ class PreKeysSyncJobTest {
     aciPreKeyMeta.activeSignedPreKeyId assertIsNot currentAciKeyId
     pniPreKeyMeta.activeSignedPreKeyId assertIsNot currentPniKeyId
 
-    aciPreKeyMeta.nextOneTimePreKeyId assertIsNot currentNextAciPreKeyId
-    pniPreKeyMeta.nextOneTimePreKeyId assertIsNot currentNextPniPreKeyId
+    aciPreKeyMeta.nextEcOneTimePreKeyId assertIsNot currentNextAciPreKeyId
+    pniPreKeyMeta.nextEcOneTimePreKeyId assertIsNot currentNextPniPreKeyId
 
     ApplicationDependencies.getProtocolStore().aci().identityKeyPair.publicKey.let { aciIdentityKey ->
       aciPreKeyStateRequest.identityKey assertIs aciIdentityKey

diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/BobClient.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/BobClient.kt
@@ -32,6 +32,7 @@ import org.whispersystems.signalservice.api.push.DistributionId
 import org.whispersystems.signalservice.api.push.ServiceId
 import org.whispersystems.signalservice.api.push.SignalServiceAddress
 import org.whispersystems.signalservice.internal.push.SignalServiceProtos
+import java.lang.UnsupportedOperationException
 import java.util.Optional
 import java.util.UUID
 import java.util.concurrent.locks.ReentrantLock
@@ -168,6 +169,10 @@ class BobClient(val serviceId: ServiceId, val e164: String, val identityKeyPair:
     override fun getSenderKeySharedWith(distributionId: DistributionId?): MutableSet<SignalProtocolAddress> = throw UnsupportedOperationException()
     override fun markSenderKeySharedWith(distributionId: DistributionId?, addresses: MutableCollection<SignalProtocolAddress>?) = throw UnsupportedOperationException()
     override fun clearSenderKeySharedWith(addresses: MutableCollection<SignalProtocolAddress>?) = throw UnsupportedOperationException()
+    override fun storeLastResortKyberPreKey(kyberPreKeyId: Int, kyberPreKeyRecord: KyberPreKeyRecord) = throw UnsupportedOperationException()
+    override fun removeKyberPreKey(kyberPreKeyId: Int) = throw UnsupportedOperationException()
+    override fun loadLastResortKyberPreKeys(): List<KyberPreKeyRecord> = throw UnsupportedOperationException()
+
     override fun isMultiDevice(): Boolean = throw UnsupportedOperationException()
   }
 }
diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/SignalActivityRule.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/SignalActivityRule.kt
@@ -34,7 +34,6 @@ import org.whispersystems.signalservice.api.push.SignalServiceAddress
 import org.whispersystems.signalservice.internal.ServiceResponse
 import org.whispersystems.signalservice.internal.ServiceResponseProcessor
 import org.whispersystems.signalservice.internal.push.VerifyAccountResponse
-import java.lang.IllegalArgumentException
 import java.util.UUID
 
 /**
@@ -85,6 +84,7 @@ class SignalActivityRule(private val othersCount: Int = 4) : ExternalResource()
         password = Util.getSecret(18),
         registrationId = registrationRepository.registrationId,
         profileKey = registrationRepository.getProfileKey("+15555550101"),
+        preKeyCollections = RegistrationRepository.generatePreKeys()!!,
         fcmToken = null,
         pniRegistrationId = registrationRepository.pniRegistrationId,
         recoveryPassword = "asdfasdfasdfasdf"

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -563,10 +563,13 @@
 
         <intent-filter android:autoVerify="true">
             <action android:name="android.intent.action.VIEW" />
+
             <category android:name="android.intent.category.DEFAULT" />
             <category android:name="android.intent.category.BROWSABLE" />
-            <data android:scheme="https"
-                android:host="signal.link" />
+
+            <data android:scheme="sgnl" />
+            <data android:scheme="https" />
+            <data android:host="signal.link" />
         </intent-filter>
     </activity>