Merge branch 'molly-6.45'

mollyim · Feb 1, 2024 · b9f9e97 · b9f9e97
2 parents 6b03d8f + 43aa79e
commit b9f9e97
Show file tree

Hide file tree

Showing 300 changed files with 9,836 additions and 4,829 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -19,8 +19,8 @@ apply {
   from("fix-profm.gradle")
 }
 
-val canonicalVersionCode = 1377
-val canonicalVersionName = "6.44.3"
+val canonicalVersionCode = 1380
+val canonicalVersionName = "6.45.2"
 val mollyRevision = 1
 
 val postFixSize = 100
@@ -411,7 +411,6 @@ dependencies {
   implementation(project(":qr"))
   implementation(project(":sticky-header-grid"))
   implementation(project(":photoview"))
-  implementation(project(":glide-webp"))
   implementation(project(":core-ui"))
 
   implementation(libs.androidx.fragment.ktx)

diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/backup/v2/BackupTest.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/backup/v2/BackupTest.kt
@@ -255,7 +255,7 @@ class BackupTest {
       SignalStore.donationsValues().setSubscriber(Subscriber(SubscriberId.generate(), "USD"))
       SignalStore.donationsValues().setDisplayBadgesOnProfile(false)
 
-      SignalStore.phoneNumberPrivacy().phoneNumberListingMode = PhoneNumberPrivacyValues.PhoneNumberListingMode.UNLISTED
+      SignalStore.phoneNumberPrivacy().phoneNumberDiscoverabilityMode = PhoneNumberPrivacyValues.PhoneNumberDiscoverabilityMode.NOT_DISCOVERABLE
       SignalStore.phoneNumberPrivacy().phoneNumberSharingMode = PhoneNumberPrivacyValues.PhoneNumberSharingMode.NOBODY
 
       SignalStore.settings().isLinkPreviewsEnabled = false

diff --git a/...Test/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShapeTest.kt b/...Test/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShapeTest.kt
@@ -211,6 +211,7 @@ class V2ConversationItemShapeTest {
     override val searchQuery: String? = null
     override val glideRequests: GlideRequests = mockk()
     override val isParentInScroll: Boolean = false
+    override fun getChatColorsData(): ChatColorsDrawable.ChatColorsData = ChatColorsDrawable.ChatColorsData(null, null)
 
     override fun onStartExpirationTimeout(messageRecord: MessageRecord) = Unit
 

diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/database/GroupTableTest.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/database/GroupTableTest.kt
@@ -7,7 +7,7 @@ import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
-import org.signal.core.util.delete
+import org.signal.core.util.deleteAll
 import org.signal.core.util.readToList
 import org.signal.core.util.requireLong
 import org.signal.core.util.withinTransaction
@@ -33,8 +33,8 @@ class GroupTableTest {
   fun setUp() {
     groupTable = SignalDatabase.groups
 
-    groupTable.writableDatabase.delete(GroupTable.TABLE_NAME).run()
-    groupTable.writableDatabase.delete(GroupTable.MembershipTable.TABLE_NAME).run()
+    groupTable.writableDatabase.deleteAll(GroupTable.TABLE_NAME)
+    groupTable.writableDatabase.deleteAll(GroupTable.MembershipTable.TABLE_NAME)
   }
 
   @Test

diff --git a/...c/androidTest/java/org/thoughtcrime/securesms/profiles/manage/UsernameEditFragmentTest.kt b/...c/androidTest/java/org/thoughtcrime/securesms/profiles/manage/UsernameEditFragmentTest.kt
@@ -59,7 +59,7 @@ class UsernameEditFragmentTest {
 
   @Test
   fun testUsernameCreationInRegistration() {
-    val scenario = createScenario(true)
+    val scenario = createScenario(UsernameEditMode.REGISTRATION)
 
     scenario.moveToState(Lifecycle.State.RESUMED)
 
@@ -77,7 +77,7 @@ class UsernameEditFragmentTest {
   @Ignore("Flakey espresso test.")
   @Test
   fun testUsernameCreationOutsideOfRegistration() {
-    val scenario = createScenario()
+    val scenario = createScenario(UsernameEditMode.NORMAL)
 
     scenario.moveToState(Lifecycle.State.RESUMED)
 
@@ -108,7 +108,7 @@ class UsernameEditFragmentTest {
       }
     )
 
-    val scenario = createScenario(isInRegistration = true)
+    val scenario = createScenario(UsernameEditMode.REGISTRATION)
     scenario.moveToState(Lifecycle.State.RESUMED)
 
     onView(withId(R.id.username_text)).perform(typeText(nickname))
@@ -132,8 +132,8 @@ class UsernameEditFragmentTest {
     onView(withId(R.id.username_done_button)).check(matches(isNotEnabled()))
   }
 
-  private fun createScenario(isInRegistration: Boolean = false): FragmentScenario<UsernameEditFragment> {
-    val fragmentArgs = UsernameEditFragmentArgs.Builder().setIsInRegistration(isInRegistration).build().toBundle()
+  private fun createScenario(mode: UsernameEditMode = UsernameEditMode.NORMAL): FragmentScenario<UsernameEditFragment> {
+    val fragmentArgs = UsernameEditFragmentArgs.Builder().setMode(mode).build().toBundle()
     return launchFragmentInContainer(
       fragmentArgs = fragmentArgs,
       themeResId = R.style.Signal_DayNight_NoActionBar

diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/SignalDatabaseRule.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/SignalDatabaseRule.kt
@@ -2,7 +2,9 @@ package org.thoughtcrime.securesms.testing
 
 import org.junit.rules.TestWatcher
 import org.junit.runner.Description
+import org.signal.core.util.deleteAll
 import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.ThreadTable
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.whispersystems.signalservice.api.push.ServiceId.ACI
 import org.whispersystems.signalservice.api.push.ServiceId.PNI
@@ -34,7 +36,8 @@ class SignalDatabaseRule(
 
   private fun deleteAllThreads() {
     if (deleteAllThreadsOnEachRun) {
-      SignalDatabase.threads.clearForTests()
+      SignalDatabase.threads.deleteAllConversations()
+      SignalDatabase.rawDatabase.deleteAll(ThreadTable.TABLE_NAME)
     }
   }
 }
diff --git a/...ms/components/settings/app/internal/conversation/test/InternalConversationTestFragment.kt b/...ms/components/settings/app/internal/conversation/test/InternalConversationTestFragment.kt
@@ -33,6 +33,7 @@ import org.thoughtcrime.securesms.conversation.colors.Colorizer
 import org.thoughtcrime.securesms.conversation.colors.RecyclerViewColorizer
 import org.thoughtcrime.securesms.conversation.mutiselect.MultiselectPart
 import org.thoughtcrime.securesms.conversation.v2.ConversationAdapterV2
+import org.thoughtcrime.securesms.conversation.v2.items.ChatColorsDrawable
 import org.thoughtcrime.securesms.database.model.InMemoryMessageRecord
 import org.thoughtcrime.securesms.database.model.MessageRecord
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord
@@ -65,7 +66,8 @@ class InternalConversationTestFragment : Fragment(R.layout.conversation_test_fra
       clickListener = ClickListener(),
       hasWallpaper = springboardViewModel.hasWallpaper.value,
       colorizer = Colorizer(),
-      startExpirationTimeout = {}
+      startExpirationTimeout = {},
+      chatColorsDataProvider = { ChatColorsDrawable.ChatColorsData(null, null) }
     )
 
     if (springboardViewModel.hasWallpaper.value) {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
     <uses-feature android:name="android.hardware.telephony" android:required="false" />
 
     <uses-permission android:name="android.permission.USE_BIOMETRIC"/>
+    <uses-permission android:name="android.permission.USE_EXACT_ALARM"/>
     <uses-permission android:name="${applicationId}.ACCESS_SECRETS"/>
     <uses-permission android:name="android.permission.READ_PROFILE"/>
     <uses-permission android:name="android.permission.WRITE_PROFILE"/>
@@ -1275,6 +1276,16 @@
         android:enabled="@bool/enable_alarm_manager"
         android:exported="false"/>
 
+    <service android:name=".service.webrtc.ActiveCallManager$ActiveCallForegroundService" android:exported="false" />
+    <receiver android:name=".service.webrtc.ActiveCallManager$ActiveCallServiceReceiver" android:exported="false">
+        <intent-filter>
+            <action android:name="org.thoughtcrime.securesms.service.webrtc.ActiveCallAction.DENY"/>
+        </intent-filter>
+        <intent-filter>
+            <action android:name="org.thoughtcrime.securesms.service.webrtc.ActiveCallAction.HANGUP"/>
+        </intent-filter>
+    </receiver>
+
     <uses-library android:name="org.apache.http.legacy" android:required="false"/>
 
 </application>