Merge branch 'master' into dependabot/gradle/androidx_lifecycle-99041b28b3

# Conflicts:
#	FlowCrypt/build.gradle.kts

Author: DenBond7

FlowCrypt/build.gradle.kts

@@ -402,7 +402,7 @@ val uiTestsImplementation by configurations.named("uiTestsImplementation")
 dependencies {
   ksp("com.github.bumptech.glide:ksp:4.16.0")
   ksp("androidx.annotation:annotation:1.9.1")
-  ksp("androidx.room:room-compiler:2.7.1")
+  ksp("androidx.room:room-compiler:2.7.2")
   //ACRA needs the following dependency to use a custom report sender
 
   ksp("dev.zacsweers.autoservice:auto-service-ksp:1.2.0")
@@ -425,9 +425,9 @@ dependencies {
   androidTestImplementation("androidx.test:rules:1.6.1")
   androidTestImplementation("androidx.test.ext:junit-ktx:1.2.1")
   androidTestImplementation("androidx.test.uiautomator:uiautomator:2.3.0")
-  androidTestImplementation("androidx.room:room-testing:2.7.1")
+  androidTestImplementation("androidx.room:room-testing:2.7.2")
   androidTestImplementation("androidx.arch.core:core-testing:2.2.0")
-  androidTestImplementation("androidx.work:work-testing:2.10.1")
+  androidTestImplementation("androidx.work:work-testing:2.10.2")
   androidTestImplementation("com.squareup.okhttp3:mockwebserver:4.12.0")
   androidTestImplementation("com.squareup.okhttp3:okhttp-tls:4.12.0")
   androidTestImplementation("com.athaydes.rawhttp:rawhttp-core:2.6.0")
@@ -438,20 +438,20 @@ dependencies {
   testImplementation("com.shazam:shazamcrest:0.11")
   testImplementation("org.robolectric:robolectric:4.14.1")
   //we need it to test Parcelable implementation
-  testImplementation("org.jetbrains.kotlin:kotlin-reflect:2.1.21")
+  testImplementation("org.jetbrains.kotlin:kotlin-reflect:2.2.0")
   testImplementation("junit:junit:4.13.2")
-  testImplementation("androidx.room:room-testing:2.7.1")
+  testImplementation("androidx.room:room-testing:2.7.2")
   testImplementation("io.github.classgraph:classgraph:4.8.179")
 
   implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
 
   implementation("androidx.legacy:legacy-support-v4:1.0.0")
-  implementation("androidx.appcompat:appcompat:1.7.0")
+  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.recyclerview:recyclerview:1.4.0")
-  implementation("androidx.recyclerview:recyclerview-selection:1.1.0")
+  implementation("androidx.recyclerview:recyclerview-selection:1.2.0")
   implementation("androidx.constraintlayout:constraintlayout:2.2.1")
   implementation("androidx.test.espresso:espresso-idling-resource:3.6.1")
   implementation("androidx.lifecycle:lifecycle-extensions:2.2.0")
@@ -460,8 +460,8 @@ dependencies {
   implementation("androidx.lifecycle:lifecycle-process:2.9.1")
   implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.9.1")
   implementation("androidx.lifecycle:lifecycle-service:2.9.1")
-  implementation("androidx.room:room-runtime:2.7.1")
-  implementation("androidx.room:room-ktx:2.7.1")
+  implementation("androidx.room:room-runtime:2.7.2")
+  implementation("androidx.room:room-ktx:2.7.2")
   //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")
@@ -470,7 +470,7 @@ dependencies {
   implementation("androidx.core:core-splashscreen:1.0.1")
   implementation("androidx.activity:activity-ktx:1.10.1")
   implementation("androidx.fragment:fragment-ktx:1.8.8")
-  implementation("androidx.work:work-runtime-ktx:2.10.1")
+  implementation("androidx.work:work-runtime-ktx:2.10.2")
   implementation("androidx.navigation:navigation-fragment-ktx:2.9.0")
   implementation("androidx.navigation:navigation-ui-ktx:2.9.0")
   implementation("androidx.navigation:navigation-runtime-ktx:2.9.0")
@@ -481,7 +481,7 @@ dependencies {
   implementation("com.google.android.material:material:1.12.0")
   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.api-client:google-api-client-android:2.8.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")

FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/UserRecoverableAuthExceptionFragment.kt

@@ -1,12 +1,13 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.ui.activity.fragment
 
 import android.accounts.Account
 import android.accounts.AccountManager
+import android.annotation.SuppressLint
 import android.app.Activity
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -142,6 +143,7 @@ class UserRecoverableAuthExceptionFragment :
       GeneralUtil.openCustomTab(requireContext(), Constants.FLOWCRYPT_TERMS_URL)
     }
     binding?.buttonSecurity?.setOnClickListener {
+      @SuppressLint("CheckResult")
       NavGraphDirections.actionGlobalHtmlViewFromAssetsRawFragment(
         title = getString(R.string.security),
         resourceIdAsString = "html/security.htm"

build.gradle.kts

@@ -7,11 +7,11 @@
 
 plugins {
   id("com.android.application") version "8.9.2" apply false
-  id("org.jetbrains.kotlin.android") version "2.1.21" apply false
-  id("androidx.navigation.safeargs.kotlin") version "2.8.9" apply false
-  id("com.starter.easylauncher") version "6.4.0" apply false
-  id("org.jetbrains.kotlin.plugin.parcelize") version "2.1.21" apply false
-  id("com.google.devtools.ksp") version "2.1.21-2.0.2" apply false
+  id("org.jetbrains.kotlin.android") version "2.2.0" 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.0" apply false
+  id("com.google.devtools.ksp") version "2.2.0-2.0.2" apply false
   id("org.ajoberstar.grgit") version "5.3.0" apply false
 }