Merge pull request #1381 from JBsesh/fix/ses-3437

SES-3437 : Community Mentions Inconsistent [Update]

Author: ThomasSession

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/mention/MentionViewModel.kt

@@ -111,7 +111,7 @@ class MentionViewModel(
                     }
                     recipient.isCommunityRecipient -> mmsSmsDatabase.getRecentChatMemberAddresses(
                         threadID,
-                        20
+                        300
                     )
                     recipient.isContactRecipient -> listOf(recipient.address.toString())
                     else -> listOf()

app/src/test/java/org/thoughtcrime/securesms/conversation/v2/MentionViewModelTest.kt

@@ -116,7 +116,7 @@ class MentionViewModelTest : BaseViewModelTest() {
             threadID = threadID,
             application = InstrumentationRegistry.getInstrumentation().context as android.app.Application,
             mmsSmsDatabase = mock {
-                on { getRecentChatMemberAddresses(threadID, 20)} doAnswer {
+                on { getRecentChatMemberAddresses(eq(threadID), any())} doAnswer {
                     val limit = it.arguments[1] as Int
                     threadMembers.take(limit).map { m -> m.pubKey }
                 }

build.gradle.kts

@@ -16,7 +16,7 @@ buildscript {
 //        classpath(files("libs/gradle-witness.jar"))
 //        classpath("com.squareup:javapoet:1.13.0")
         if (project.hasProperty("huawei")) {
-            classpath("com.huawei.agconnect:agcp:1.9.1.300")
+            classpath("com.huawei.agconnect:agcp:1.9.3.301")
         }
     }
 }

gradle/libs.versions.toml

@@ -54,7 +54,7 @@ photoviewVersion = "2.3.0"
 phraseVersion = "1.2.0"
 lifecycleVersion = "2.7.0"
 materialVersion = "1.12.0"
-mockitoKotlinVersion = "5.4.0"
+mockitoKotlinVersion = "6.0.0"
 okhttpVersion = "5.1.0"
 preferenceVersion = "1.2.1"
 protobufVersion = "4.29.3"