From a63930b9f74d86cb35d0544d61e720c6dd93e9f9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 3 Nov 2024 20:07:50 +0000 Subject: [PATCH 1/2] Bump ch.acra:acra-http from 5.11.4 to 5.12.0 Bumps [ch.acra:acra-http](https://github.com/ACRA/acra) from 5.11.4 to 5.12.0. - [Release notes](https://github.com/ACRA/acra/releases) - [Commits](https://github.com/ACRA/acra/compare/acra-5.11.4...acra-5.12.0) --- updated-dependencies: - dependency-name: ch.acra:acra-http dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- FlowCrypt/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FlowCrypt/build.gradle.kts b/FlowCrypt/build.gradle.kts index fbc8158315..9871971697 100644 --- a/FlowCrypt/build.gradle.kts +++ b/FlowCrypt/build.gradle.kts @@ -473,7 +473,7 @@ dependencies { implementation("org.eclipse.angus:gimap:2.0.3") implementation("commons-io:commons-io:2.17.0") implementation("net.openid:appauth:0.11.1") - implementation("ch.acra:acra-http:5.11.4") + implementation("ch.acra:acra-http:5.12.0") implementation("io.github.everythingme:overscroll-decor-android:1.1.1") constraints { From b720d61f6bf8e05e4516e1b05f8695531bafc90d Mon Sep 17 00:00:00 2001 From: DenBond7 Date: Mon, 16 Dec 2024 14:54:38 +0200 Subject: [PATCH 2/2] Marked some tests as FlakyTest --- .../com/flowcrypt/email/ui/SendFeedbackHasAccountFlowTest.kt | 4 +++- .../incontainer/AddOtherAccountFragmentInIsolationTest.kt | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/SendFeedbackHasAccountFlowTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/SendFeedbackHasAccountFlowTest.kt index a58958c1ed..9155c393f0 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/SendFeedbackHasAccountFlowTest.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/SendFeedbackHasAccountFlowTest.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 @@ -15,6 +15,7 @@ import androidx.test.espresso.matcher.ViewMatchers.withId import androidx.test.espresso.matcher.ViewMatchers.withText import androidx.test.ext.junit.rules.activityScenarioRule import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.FlakyTest import androidx.test.filters.MediumTest import com.flowcrypt.email.R import com.flowcrypt.email.TestConstants @@ -127,6 +128,7 @@ class SendFeedbackHasAccountFlowTest : BaseFeedbackFragmentTest() { } @Test + @FlakyTest fun testNavigateToImageEditor() { onView(withId(R.id.checkBoxScreenshot)) .check(matches(isDisplayed())) diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/fragment/isolation/incontainer/AddOtherAccountFragmentInIsolationTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/fragment/isolation/incontainer/AddOtherAccountFragmentInIsolationTest.kt index 891d5c1ef5..eab2bee12e 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/fragment/isolation/incontainer/AddOtherAccountFragmentInIsolationTest.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/fragment/isolation/incontainer/AddOtherAccountFragmentInIsolationTest.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 @@ -18,6 +18,7 @@ import androidx.test.espresso.matcher.ViewMatchers.isNotChecked import androidx.test.espresso.matcher.ViewMatchers.withId import androidx.test.espresso.matcher.ViewMatchers.withText import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.FlakyTest import androidx.test.filters.MediumTest import com.flowcrypt.email.R import com.flowcrypt.email.TestConstants @@ -178,6 +179,7 @@ class AddOtherAccountFragmentInIsolationTest : AddOtherAccountBaseTest() { } @Test + @FlakyTest fun testVisibilityOfSmtpAuthField() { enableAdvancedMode()