Merge branch 'dev' into just-prefs

oxen-io · Jul 18, 2024 · 268644e · 268644e
2 parents 0d901ef + e2a40dd
commit 268644e
Show file tree

Hide file tree

Showing 240 changed files with 495,468 additions and 297,714 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -31,8 +31,8 @@ configurations.all {
     exclude module: "commons-logging"
 }
 
-def canonicalVersionCode = 373
-def canonicalVersionName = "1.18.4"
+def canonicalVersionCode = 374
+def canonicalVersionName = "1.18.5"
 
 def postFixSize = 10
 def abiPostFix = ['armeabi-v7a' : 1,
@@ -271,7 +271,7 @@ dependencies {
     if (project.hasProperty('huawei')) huaweiImplementation 'com.huawei.hms:push:6.7.0.300'
     implementation 'com.google.android.exoplayer:exoplayer-core:2.9.1'
     implementation 'com.google.android.exoplayer:exoplayer-ui:2.9.1'
-    implementation 'org.conscrypt:conscrypt-android:2.0.0'
+    implementation 'org.conscrypt:conscrypt-android:2.5.2'
     implementation 'org.signal:aesgcmprovider:0.0.3'
     implementation 'org.webrtc:google-webrtc:1.0.32006'
     implementation "me.leolin:ShortcutBadger:1.1.16"
@@ -322,6 +322,7 @@ dependencies {
     implementation "com.google.protobuf:protobuf-java:$protobufVersion"
     implementation "com.fasterxml.jackson.core:jackson-databind:$jacksonDatabindVersion"
     implementation "com.squareup.okhttp3:okhttp:$okhttpVersion"
+    implementation "com.squareup.phrase:phrase:$phraseVersion"
     implementation 'app.cash.copper:copper-flow:1.0.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"

diff --git a/app/src/androidTest/java/network/loki/messenger/SodiumUtilitiesTest.kt b/app/src/androidTest/java/network/loki/messenger/SodiumUtilitiesTest.kt
@@ -136,29 +136,29 @@ class SodiumUtilitiesTest {
     }
 
     @Test
-    fun sessionIdSuccess() {
-        val result = SodiumUtilities.sessionId("05$publicKey", "15$blindedPublicKey", serverPublicKey)
+    fun accountIdSuccess() {
+        val result = SodiumUtilities.accountId("05$publicKey", "15$blindedPublicKey", serverPublicKey)
 
         assertTrue(result)
     }
 
     @Test
-    fun sessionIdFailureInvalidAccountId() {
-        val result = SodiumUtilities.sessionId("AB$publicKey", "15$blindedPublicKey", serverPublicKey)
+    fun accountIdFailureInvalidAccountId() {
+        val result = SodiumUtilities.accountId("AB$publicKey", "15$blindedPublicKey", serverPublicKey)
 
         assertFalse(result)
     }
 
     @Test
-    fun sessionIdFailureInvalidBlindedId() {
-        val result = SodiumUtilities.sessionId("05$publicKey", "AB$blindedPublicKey", serverPublicKey)
+    fun accountIdFailureInvalidBlindedId() {
+        val result = SodiumUtilities.accountId("05$publicKey", "AB$blindedPublicKey", serverPublicKey)
 
         assertFalse(result)
     }
 
     @Test
-    fun sessionIdFailureBlindingFactor() {
-        val result = SodiumUtilities.sessionId("05$publicKey", "15$blindedPublicKey", "Test")
+    fun accountIdFailureBlindingFactor() {
+        val result = SodiumUtilities.accountId("05$publicKey", "15$blindedPublicKey", "Test")
 
         assertFalse(result)
     }

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -125,7 +125,7 @@
         <activity
             android:name="org.thoughtcrime.securesms.home.HomeActivity"
             android:screenOrientation="portrait"
-            android:launchMode="singleTask"
+            android:launchMode="standard"
             android:theme="@style/Theme.Session.DayNight.NoActionBar" />
         <activity
             android:name="org.thoughtcrime.securesms.messagerequests.MessageRequestsActivity"