From 814940860b3644bfea3fda3e38be5ced07fbe6ef Mon Sep 17 00:00:00 2001 From: Denys Bondarenko Date: Sat, 21 Mar 2026 19:56:54 +0200 Subject: [PATCH 1/6] Fixed ComposeScreenFlowTest.testSelectImportPublicKeyFromPopUp() --- .../java/com/flowcrypt/email/ui/ComposeScreenFlowTest.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/ComposeScreenFlowTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/ComposeScreenFlowTest.kt index 1d71bce2c..4d01d920a 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/ComposeScreenFlowTest.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/ComposeScreenFlowTest.kt @@ -64,6 +64,7 @@ import com.flowcrypt.email.security.pgp.PgpKey import com.flowcrypt.email.ui.activity.MainActivity import com.flowcrypt.email.ui.adapter.RecipientChipRecyclerViewAdapter import com.flowcrypt.email.ui.base.BaseComposeScreenTest +import com.flowcrypt.email.ui.base.BaseDraftsGmailAPIFlowTest.Companion.MESSAGE_SUBJECT_FIRST import com.flowcrypt.email.util.PrivateKeysManager import com.flowcrypt.email.util.TestGeneralUtil import com.flowcrypt.email.util.UIUtil @@ -360,7 +361,6 @@ class ComposeScreenFlowTest : BaseComposeScreenTest() { } @Test - @Ignore("temporary disabled") fun testSelectImportPublicKeyFromPopUp() { activeActivityRule?.launch(intent) intending(hasComponent(ComponentName(getTargetContext(), MainActivity::class.java))) @@ -419,6 +419,8 @@ class ComposeScreenFlowTest : BaseComposeScreenTest() { .check(matches(isDisplayed())) .perform(click()) + waitForObjectWithText(email, TimeUnit.SECONDS.toMillis(10)) + onView(withId(R.id.recyclerViewChipsTo)) .perform( RecyclerViewActions.scrollTo( From aaf43d75e0929503d7e8301e60a6cbe0a460ca51 Mon Sep 17 00:00:00 2001 From: Denys Bondarenko Date: Sat, 21 Mar 2026 19:59:34 +0200 Subject: [PATCH 2/6] Removed unused code --- .../java/com/flowcrypt/email/ui/ComposeScreenFlowTest.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/ComposeScreenFlowTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/ComposeScreenFlowTest.kt index 4d01d920a..d4539eff6 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/ComposeScreenFlowTest.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/ComposeScreenFlowTest.kt @@ -64,7 +64,6 @@ import com.flowcrypt.email.security.pgp.PgpKey import com.flowcrypt.email.ui.activity.MainActivity import com.flowcrypt.email.ui.adapter.RecipientChipRecyclerViewAdapter import com.flowcrypt.email.ui.base.BaseComposeScreenTest -import com.flowcrypt.email.ui.base.BaseDraftsGmailAPIFlowTest.Companion.MESSAGE_SUBJECT_FIRST import com.flowcrypt.email.util.PrivateKeysManager import com.flowcrypt.email.util.TestGeneralUtil import com.flowcrypt.email.util.UIUtil From 49545fbad0613a95941e110090f266784b95cbe0 Mon Sep 17 00:00:00 2001 From: Denys Bondarenko Date: Sat, 21 Mar 2026 20:40:18 +0200 Subject: [PATCH 3/6] Updated gradle plugin --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8749a79c6..b3af95b55 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -4,6 +4,6 @@ # distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 96086866223bdfcdb222b79a17eb3d0117cdd481 Mon Sep 17 00:00:00 2001 From: Denys Bondarenko Date: Sat, 21 Mar 2026 21:21:39 +0200 Subject: [PATCH 4/6] wip --- .../incontainer/CreateMessageFragmentInIsolationTest.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/fragment/isolation/incontainer/CreateMessageFragmentInIsolationTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/fragment/isolation/incontainer/CreateMessageFragmentInIsolationTest.kt index 9d7a220ff..87ed8f97a 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/fragment/isolation/incontainer/CreateMessageFragmentInIsolationTest.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/fragment/isolation/incontainer/CreateMessageFragmentInIsolationTest.kt @@ -1,6 +1,6 @@ /* * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com - * Contributors: DenBond7 + * Contributors: denbond7 */ package com.flowcrypt.email.ui.fragment.isolation.incontainer @@ -117,6 +117,7 @@ class CreateMessageFragmentInIsolationTest : BaseComposeScreenTest() { } @Test + @Ignore("fix me") fun testUpdatingAddRecipientLabel() { val chars = "email".toCharArray() val typedChars = mutableListOf() From 02b8460799dd8ea78f0a62a21553d1c3ff982819 Mon Sep 17 00:00:00 2001 From: Denys Bondarenko Date: Sat, 21 Mar 2026 21:58:11 +0200 Subject: [PATCH 5/6] wip --- .../incontainer/CreateMessageFragmentInIsolationTest.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/fragment/isolation/incontainer/CreateMessageFragmentInIsolationTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/fragment/isolation/incontainer/CreateMessageFragmentInIsolationTest.kt index 87ed8f97a..8cb0e2578 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/fragment/isolation/incontainer/CreateMessageFragmentInIsolationTest.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/fragment/isolation/incontainer/CreateMessageFragmentInIsolationTest.kt @@ -36,6 +36,7 @@ import okhttp3.mockwebserver.RecordedRequest import org.hamcrest.Matchers.allOf import org.junit.Before import org.junit.ClassRule +import org.junit.Ignore import org.junit.Rule import org.junit.Test import org.junit.rules.RuleChain From c7c99455d8d58a53d4ddace83ca19783c2ea8b81 Mon Sep 17 00:00:00 2001 From: Denys Bondarenko Date: Sun, 22 Mar 2026 08:14:01 +0200 Subject: [PATCH 6/6] wip --- .../incontainer/CreateMessageFragmentInIsolationTest.kt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/fragment/isolation/incontainer/CreateMessageFragmentInIsolationTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/fragment/isolation/incontainer/CreateMessageFragmentInIsolationTest.kt index 8cb0e2578..fc0fb5002 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/fragment/isolation/incontainer/CreateMessageFragmentInIsolationTest.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/fragment/isolation/incontainer/CreateMessageFragmentInIsolationTest.kt @@ -36,13 +36,13 @@ import okhttp3.mockwebserver.RecordedRequest import org.hamcrest.Matchers.allOf import org.junit.Before import org.junit.ClassRule -import org.junit.Ignore import org.junit.Rule import org.junit.Test import org.junit.rules.RuleChain import org.junit.rules.TestRule import org.junit.runner.RunWith import java.net.HttpURLConnection +import java.util.concurrent.TimeUnit /** * @author Denys Bondarenko @@ -118,7 +118,6 @@ class CreateMessageFragmentInIsolationTest : BaseComposeScreenTest() { } @Test - @Ignore("fix me") fun testUpdatingAddRecipientLabel() { val chars = "email".toCharArray() val typedChars = mutableListOf() @@ -127,6 +126,8 @@ class CreateMessageFragmentInIsolationTest : BaseComposeScreenTest() { .perform(typeText(char.toString())) typedChars.add(char) + waitForObjectWithText(String(typedChars.toCharArray()), TimeUnit.SECONDS.toMillis(10)) + onView(withId(R.id.recyclerViewAutocompleteTo)) .perform( scrollTo( @@ -142,7 +143,8 @@ class CreateMessageFragmentInIsolationTest : BaseComposeScreenTest() { companion object { @get:ClassRule @JvmStatic - val mockWebServerRule = FlowCryptMockWebServerRule(TestConstants.MOCK_WEB_SERVER_PORT, + val mockWebServerRule = FlowCryptMockWebServerRule( + TestConstants.MOCK_WEB_SERVER_PORT, object : Dispatcher() { override fun dispatch(request: RecordedRequest): MockResponse { if (request.path?.startsWith("/attester/pub", ignoreCase = true) == true) {