From 28b83efc63fdbee438392e59681c0411f4e01163 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 May 2025 16:30:24 +0000 Subject: [PATCH 1/2] Bump com.google.apis:google-api-services-gmail Bumps com.google.apis:google-api-services-gmail from v1-rev20240520-2.0.0 to v1-rev20250331-2.0.0. --- updated-dependencies: - dependency-name: com.google.apis:google-api-services-gmail dependency-version: v1-rev20250331-2.0.0 dependency-type: direct:production ... 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 60a9b2c2e8..97e939bb83 100644 --- a/FlowCrypt/build.gradle.kts +++ b/FlowCrypt/build.gradle.kts @@ -472,7 +472,7 @@ dependencies { implementation("com.google.android.flexbox:flexbox:3.0.0") implementation("com.google.code.gson:gson:2.13.1") implementation("com.google.api-client:google-api-client-android:2.7.2") - implementation("com.google.apis:google-api-services-gmail:v1-rev20240520-2.0.0") + implementation("com.google.apis:google-api-services-gmail:v1-rev20250331-2.0.0") //ACRA needs the following dependency to use a custom report sender implementation("com.google.auto.service:auto-service-annotations:1.1.1") From 4b92bfe0d9f997300499d5df5e965d5452eccc0b Mon Sep 17 00:00:00 2001 From: denbond7 Date: Tue, 6 May 2025 12:07:05 +0300 Subject: [PATCH 2/2] wip --- ...ePrivateKeyWithPassPhraseInDatabaseFlowTest.kt | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/UpdatePrivateKeyWithPassPhraseInDatabaseFlowTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/UpdatePrivateKeyWithPassPhraseInDatabaseFlowTest.kt index ee705e3371..9f1aa7580b 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/UpdatePrivateKeyWithPassPhraseInDatabaseFlowTest.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/UpdatePrivateKeyWithPassPhraseInDatabaseFlowTest.kt @@ -148,16 +148,15 @@ class UpdatePrivateKeyWithPassPhraseInDatabaseFlowTest : BaseTest() { onView(withId(R.id.buttonPositiveAction)) .perform(scrollTo(), click()) - waitForObjectWithText(getResString(R.string.key_details), TimeUnit.SECONDS.toMillis(60)) + val dateAfterUpdating = getResString( + R.string.template_modified, + dateFormat.format(Date(requireNotNull(updatedKeyDetails.lastModified))) + ) + waitForObjectWithText(dateAfterUpdating, TimeUnit.SECONDS.toMillis(60)) - //do checks after update + //do checks after updating onView( - withText( - getResString( - R.string.template_modified, - dateFormat.format(Date(requireNotNull(updatedKeyDetails.lastModified))) - ) - ) + withText(dateAfterUpdating) ).check(matches(isDisplayed())) val existingRecipientWithPubKeysAfterUpdate = runBlocking {