Merge branch 'master' into issue_2958_edge_to_edge_support

Author: DenBond7

FlowCrypt/build.gradle.kts

@@ -413,7 +413,7 @@ val uiTestsImplementation by configurations.named("uiTestsImplementation")
 dependencies {
   ksp("com.github.bumptech.glide:ksp:5.0.5")
   ksp("androidx.annotation:annotation:1.9.1")
-  ksp("androidx.room:room-compiler:2.8.2")
+  ksp("androidx.room:room-compiler:2.8.3")
   //ACRA needs the following dependency to use a custom report sender
 
   ksp("dev.zacsweers.autoservice:auto-service-ksp:1.2.0")
@@ -436,22 +436,22 @@ dependencies {
   androidTestImplementation("androidx.test:rules:1.7.0")
   androidTestImplementation("androidx.test.ext:junit-ktx:1.3.0")
   androidTestImplementation("androidx.test.uiautomator:uiautomator:2.3.0")
-  androidTestImplementation("androidx.room:room-testing:2.8.2")
+  androidTestImplementation("androidx.room:room-testing:2.8.3")
   androidTestImplementation("androidx.arch.core:core-testing:2.2.0")
   androidTestImplementation("androidx.work:work-testing:2.11.0")
-  androidTestImplementation("com.squareup.okhttp3:mockwebserver:5.2.1")
-  androidTestImplementation("com.squareup.okhttp3:okhttp-tls:5.2.1")
+  androidTestImplementation("com.squareup.okhttp3:mockwebserver:5.3.1")
+  androidTestImplementation("com.squareup.okhttp3:okhttp-tls:5.3.1")
   androidTestImplementation("com.athaydes.rawhttp:rawhttp-core:2.6.0")
   androidTestUtil("androidx.test:orchestrator:1.6.1")
 
-  testImplementation("com.squareup.okhttp3:mockwebserver:5.2.1")
+  testImplementation("com.squareup.okhttp3:mockwebserver:5.3.1")
   testImplementation("com.flextrade.jfixture:jfixture:2.7.2")
   testImplementation("com.shazam:shazamcrest:0.11")
   testImplementation("org.robolectric:robolectric:4.16")
   //we need it to test Parcelable implementation
   testImplementation("org.jetbrains.kotlin:kotlin-reflect:2.2.21")
   testImplementation("junit:junit:4.13.2")
-  testImplementation("androidx.room:room-testing:2.8.2")
+  testImplementation("androidx.room:room-testing:2.8.3")
   testImplementation("io.github.classgraph:classgraph:4.8.184")
 
   implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
@@ -471,15 +471,15 @@ dependencies {
   implementation("androidx.lifecycle:lifecycle-process:2.9.4")
   implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.9.4")
   implementation("androidx.lifecycle:lifecycle-service:2.9.4")
-  implementation("androidx.room:room-runtime:2.8.2")
-  implementation("androidx.room:room-ktx:2.8.2")
+  implementation("androidx.room:room-runtime:2.8.3")
+  implementation("androidx.room:room-ktx:2.8.3")
   //we disabled warnings about paging-runtime-ktx because a newer version doesn't fit our needs
   //noinspection GradleDependency
   implementation("androidx.paging:paging-runtime-ktx:2.1.2")
   implementation("androidx.preference:preference-ktx:1.2.1")
   implementation("androidx.core:core-ktx:1.17.0")
-  implementation("androidx.core:core-splashscreen:1.0.1")
-  implementation("androidx.activity:activity-ktx:1.11.0")
+  implementation("androidx.core:core-splashscreen:1.2.0")
+  implementation("androidx.activity:activity-ktx:1.12.0")
   implementation("androidx.fragment:fragment-ktx:1.8.9")
   implementation("androidx.work:work-runtime-ktx:2.11.0")
   implementation("androidx.navigation:navigation-fragment-ktx:2.9.6")
@@ -493,15 +493,15 @@ dependencies {
   implementation("com.google.android.flexbox:flexbox:3.0.0")
   implementation("com.google.code.gson:gson:2.13.2")
   implementation("com.google.api-client:google-api-client-android:2.8.1")
-  implementation("com.google.apis:google-api-services-gmail:v1-rev20250630-2.0.0")
+  implementation("com.google.apis:google-api-services-gmail:v1-rev20251110-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")
 
   implementation("com.squareup.retrofit2:retrofit:3.0.0")
   implementation("com.squareup.retrofit2:converter-gson:3.0.0")
   implementation("com.squareup.retrofit2:converter-scalars:3.0.0")
-  implementation("com.squareup.okio:okio:3.16.2")
-  implementation("com.squareup.okhttp3:logging-interceptor:5.2.1")
+  implementation("com.squareup.okio:okio:3.16.4")
+  implementation("com.squareup.okhttp3:logging-interceptor:5.3.1")
 
   implementation("com.github.bumptech.glide:glide:5.0.5")
   implementation("com.nulab-inc:zxcvbn:1.9.0")
@@ -514,17 +514,17 @@ dependencies {
   //kotlinx-serialization-core added to fix runtime issue with dependencies conflict.
   //Maybe it will be removed in future.
   implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.9.0")
-  implementation("org.pgpainless:pgpainless-core:2.0.1")
+  implementation("org.pgpainless:pgpainless-core:2.0.2")
   implementation("org.eclipse.angus:angus-mail:2.0.5")
   implementation("org.eclipse.angus:gimap:2.0.5")
-  implementation("commons-io:commons-io:2.20.0")
+  implementation("commons-io:commons-io:2.21.0")
   implementation("net.openid:appauth:0.11.1")
   implementation("ch.acra:acra-http:5.13.1")
   implementation("io.github.everythingme:overscroll-decor-android:1.1.1")
 
   constraints {
     //due to https://github.com/FlowCrypt/flowcrypt-security/issues/199
-    implementation("commons-codec:commons-codec:1.19.0") {
+    implementation("commons-codec:commons-codec:1.20.0") {
       because("version 1.11 has VULNERABILITY DESCRIPTION CWE-200")
     }
   }

FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/AttachmentDownloadingWithRestrictionFlowTest.kt

@@ -44,6 +44,7 @@ import com.google.api.services.gmail.model.MessagePartHeader
 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
@@ -164,6 +165,7 @@ class AttachmentDownloadingWithRestrictionFlowTest : BaseMessageDetailsFlowTest(
     .around(ScreenshotTestRule())
 
   @Test
+  @Ignore("tests crash randomly too many times on this test. Temporary disabled")
   fun testDownloadingAttachment() {
     val device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
 

build.gradle.kts

@@ -11,7 +11,7 @@ plugins {
   id("androidx.navigation.safeargs.kotlin") version "2.9.6" apply false
   id("com.starter.easylauncher") version "6.4.1" apply false
   id("org.jetbrains.kotlin.plugin.parcelize") version "2.2.21" apply false
-  id("com.google.devtools.ksp") version "2.3.2" apply false
+  id("com.google.devtools.ksp") version "2.3.3" apply false
   id("org.ajoberstar.grgit") version "5.3.3" apply false
 }