Merge branch 'master' into dependabot/gradle/com.google.api-client-google-api-client-android-2.8.1

Author: DenBond7

FlowCrypt/build.gradle.kts

@@ -449,7 +449,7 @@ dependencies {
   implementation("androidx.appcompat:appcompat:1.7.1")
   implementation("androidx.legacy:legacy-preference-v14:1.0.0")
   implementation("androidx.cardview:cardview:1.0.0")
-  implementation("androidx.browser:browser:1.8.0")
+  implementation("androidx.browser:browser:1.9.0")
   implementation("androidx.recyclerview:recyclerview:1.4.0")
   implementation("androidx.recyclerview:recyclerview-selection:1.2.0")
   implementation("androidx.constraintlayout:constraintlayout:2.2.1")
@@ -476,7 +476,7 @@ dependencies {
   implementation("androidx.navigation:navigation-runtime-ktx:2.9.3")
   implementation("androidx.webkit:webkit:1.14.0")
 
-  implementation("com.google.android.gms:play-services-base:18.7.0")
+  implementation("com.google.android.gms:play-services-base:18.7.2")
   implementation("com.google.android.gms:play-services-auth:21.3.0")
   implementation("com.google.android.material:material:1.12.0")
   implementation("com.google.android.flexbox:flexbox:3.0.0")

FlowCrypt/src/androidTest/java/com/flowcrypt/email/WkdClientTest.kt

@@ -8,6 +8,7 @@ package com.flowcrypt.email
 import android.content.Context
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.FlakyTest
 import androidx.test.filters.SmallTest
 import com.flowcrypt.email.api.retrofit.ApiHelper
 import com.flowcrypt.email.api.retrofit.response.base.ApiError
@@ -24,6 +25,7 @@ import org.apache.commons.codec.binary.ZBase32
 import org.apache.commons.codec.digest.DigestUtils
 import org.junit.Assert.assertNull
 import org.junit.Assert.assertTrue
+import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.RuleChain
@@ -79,6 +81,8 @@ class WkdClientTest {
     .around(mockWebServerRule)
 
   @Test
+  @FlakyTest
+  @Ignore("Temporary disabled as flaky")
   fun existingEmailFlowCryptDomainTest() = runBlocking {
     val keys = WkdClient.lookupEmail(context, EXISTING_EMAIL)
     assertTrue("There are no keys in the key collection", requireNotNull(keys).keyRings.hasNext())

FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/ComposeScreenReplyWithGmailApiSignatureFlowTest.kt

@@ -11,6 +11,7 @@ import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.contrib.RecyclerViewActions.actionOnItemAtPosition
 import androidx.test.espresso.matcher.ViewMatchers.withId
 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
@@ -25,6 +26,7 @@ import com.flowcrypt.email.ui.base.BaseComposeGmailApiSignatureFlowTest
 import okhttp3.mockwebserver.Dispatcher
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.RecordedRequest
+import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.RuleChain
@@ -65,6 +67,8 @@ class ComposeScreenReplyWithGmailApiSignatureFlowTest :
       .around(ScreenshotTestRule())
 
   @Test
+  @FlakyTest
+  @Ignore("Temporary disabled as flaky")
   fun testAddingSignatureAfterStart() {
     //need to wait while the app loads the messages list
     waitForObjectWithText(SUBJECT_EXISTING_STANDARD, TimeUnit.SECONDS.toMillis(10))
@@ -88,4 +92,4 @@ class ComposeScreenReplyWithGmailApiSignatureFlowTest :
 
     doBaseChecking()
   }
-}
+}

build.gradle.kts

@@ -6,13 +6,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 plugins {
-  id("com.android.application") version "8.12.1" apply false
+  id("com.android.application") version "8.13.0" apply false
   id("org.jetbrains.kotlin.android") version "2.2.10" apply false
   id("androidx.navigation.safeargs.kotlin") version "2.9.3" apply false
   id("com.starter.easylauncher") version "6.4.1" apply false
   id("org.jetbrains.kotlin.plugin.parcelize") version "2.2.10" apply false
   id("com.google.devtools.ksp") version "2.2.10-2.0.2" apply false
-  id("org.ajoberstar.grgit") version "5.3.2" apply false
+  id("org.ajoberstar.grgit") version "5.3.3" apply false
 }
 
 subprojects {