Merge branch 'master' into dependabot/gradle/okhttp3-22a53b8266

# Conflicts:
#	FlowCrypt/build.gradle.kts

Author: DenBond7

.github/CODEOWNERS

@@ -1,7 +1,7 @@
 # These owners will be the default owners for everything in the repo.
 # Unless a later match takes precedence,
 # these owners will be requested for review when someone opens a pull request.
-* @DenBond7 @ioanmo226
+* @DenBond7 @ioanatflowcrypt
 
 # The following files will no have codeowners to allow dependabot auto-merge
 # based on https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features

.semaphore/semaphore.yml

@@ -5,7 +5,7 @@ agent:
     type: e2-standard-2
     os_image: ubuntu2404
 execution_time_limit:
-  minutes: 60
+  minutes: 75
 
 fail_fast:
   stop:
@@ -194,4 +194,4 @@ after_pipeline:
     jobs:
       - name: Publish Results
         commands:
-          - test-results gen-pipeline-report
+          - test-results gen-pipeline-report

FlowCrypt/build.gradle.kts

@@ -416,22 +416,22 @@ dependencies {
   uiTestsImplementation("androidx.fragment:fragment-testing:1.8.7")
   uiTestsImplementation("androidx.test:core-ktx:1.6.1")
 
-  androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
-  androidTestImplementation("androidx.test.espresso:espresso-contrib:3.6.1")
-  androidTestImplementation("androidx.test.espresso:espresso-intents:3.6.1")
-  androidTestImplementation("androidx.test.espresso:espresso-web:3.6.1")
-  androidTestImplementation("androidx.test.ext:junit:1.2.1")
-  androidTestImplementation("androidx.test:runner:1.6.2")
+  androidTestImplementation("androidx.test.espresso:espresso-core:3.7.0")
+  androidTestImplementation("androidx.test.espresso:espresso-contrib:3.7.0")
+  androidTestImplementation("androidx.test.espresso:espresso-intents:3.7.0")
+  androidTestImplementation("androidx.test.espresso:espresso-web:3.7.0")
+  androidTestImplementation("androidx.test.ext:junit:1.3.0")
+  androidTestImplementation("androidx.test:runner:1.7.0")
   androidTestImplementation("androidx.test:rules:1.6.1")
-  androidTestImplementation("androidx.test.ext:junit-ktx:1.2.1")
+  androidTestImplementation("androidx.test.ext:junit-ktx:1.3.0")
   androidTestImplementation("androidx.test.uiautomator:uiautomator:2.3.0")
   androidTestImplementation("androidx.room:room-testing:2.7.2")
   androidTestImplementation("androidx.arch.core:core-testing:2.2.0")
   androidTestImplementation("androidx.work:work-testing:2.10.3")
   androidTestImplementation("com.squareup.okhttp3:mockwebserver:5.1.0")
   androidTestImplementation("com.squareup.okhttp3:okhttp-tls:5.1.0")
   androidTestImplementation("com.athaydes.rawhttp:rawhttp-core:2.6.0")
-  androidTestUtil("androidx.test:orchestrator:1.5.1")
+  androidTestUtil("androidx.test:orchestrator:1.6.1")
 
   testImplementation("com.squareup.okhttp3:mockwebserver:5.1.0")
   testImplementation("com.flextrade.jfixture:jfixture:2.7.2")
@@ -453,7 +453,7 @@ dependencies {
   implementation("androidx.recyclerview:recyclerview:1.4.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.test.espresso:espresso-idling-resource:3.7.0")
   implementation("androidx.lifecycle:lifecycle-extensions:2.2.0")
   implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.2")
   implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.9.2")
@@ -489,7 +489,7 @@ dependencies {
   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.13.0")
+  implementation("com.squareup.okio:okio:3.16.0")
   implementation("com.squareup.okhttp3:logging-interceptor:5.1.0")
 
   implementation("com.github.bumptech.glide:glide:4.16.0")
@@ -498,19 +498,19 @@ dependencies {
   implementation("com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20240325.1")
   implementation("com.sandinh:zbase32-commons-codec_2.12:1.0.0")
   implementation("org.bitbucket.b_c:jose4j:0.9.6")
-  implementation("org.jsoup:jsoup:1.20.1")
+  implementation("org.jsoup:jsoup:1.21.1")
   implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2")
   implementation("org.pgpainless:pgpainless-core:1.7.6")
-  implementation("org.eclipse.angus:angus-mail:2.0.3")
-  implementation("org.eclipse.angus:gimap:2.0.3")
+  implementation("org.eclipse.angus:angus-mail:2.0.4")
+  implementation("org.eclipse.angus:gimap:2.0.4")
   implementation("commons-io:commons-io:2.19.0")
   implementation("net.openid:appauth:0.11.1")
   implementation("ch.acra:acra-http:5.12.0")
   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.18.0") {
+    implementation("commons-codec:commons-codec:1.19.0") {
       because("version 1.11 has VULNERABILITY DESCRIPTION CWE-200")
     }
   }

FlowCrypt/src/androidTest/java/com/flowcrypt/email/base/BaseTest.kt

@@ -61,9 +61,7 @@ import jakarta.mail.Session
 import jakarta.mail.internet.MimeMessage
 import kotlinx.coroutines.runBlocking
 import org.hamcrest.MatcherAssert.assertThat
-import org.hamcrest.Matchers
 import org.hamcrest.Matchers.allOf
-import org.hamcrest.Matchers.hasItem
 import org.hamcrest.Matchers.hasToString
 import org.hamcrest.Matchers.`is`
 import org.hamcrest.Matchers.not
@@ -356,7 +354,7 @@ abstract class BaseTest : BaseActivityTestImplementation {
     intending(
       allOf(
         hasAction(Intent.ACTION_GET_CONTENT),
-        hasCategories(hasItem(Matchers.equalTo(Intent.CATEGORY_OPENABLE))),
+        hasCategories(setOf(Intent.CATEGORY_OPENABLE)),
         hasType(type)
       )
     ).respondWith(Instrumentation.ActivityResult(Activity.RESULT_OK, resultData))

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

@@ -16,6 +16,7 @@ import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.intent.Intents.intending
 import androidx.test.espresso.intent.matcher.IntentMatchers
+import androidx.test.espresso.intent.matcher.IntentMatchers.hasCategories
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
@@ -42,8 +43,6 @@ import com.flowcrypt.email.util.DateTimeUtil
 import com.flowcrypt.email.util.GeneralUtil
 import com.flowcrypt.email.util.PrivateKeysManager
 import com.flowcrypt.email.util.TestGeneralUtil
-import org.hamcrest.CoreMatchers
-import org.hamcrest.Matchers
 import org.hamcrest.Matchers.allOf
 import org.junit.AfterClass
 import org.junit.Rule
@@ -157,7 +156,7 @@ class PublicKeyDetailsFlowTest : BaseTest() {
     intending(
       allOf(
         IntentMatchers.hasAction(Intent.ACTION_CREATE_DOCUMENT),
-        IntentMatchers.hasCategories(CoreMatchers.hasItem(Matchers.equalTo(Intent.CATEGORY_OPENABLE))),
+        hasCategories(setOf(Intent.CATEGORY_OPENABLE)),
         IntentMatchers.hasType(Constants.MIME_TYPE_PGP_KEY)
       )
     )

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

@@ -49,9 +49,7 @@ import jakarta.mail.internet.InternetAddress
 import jakarta.mail.internet.MimeMessage
 import kotlinx.coroutines.runBlocking
 import org.bouncycastle.bcpg.ArmoredInputStream
-import org.hamcrest.CoreMatchers.hasItem
 import org.hamcrest.Matchers.allOf
-import org.hamcrest.Matchers.equalTo
 import org.junit.Assert.assertArrayEquals
 import org.junit.Rule
 import org.junit.Test
@@ -134,7 +132,7 @@ class PublicKeyDetailsHideArmorMetaFlowTest : BaseTest() {
     intending(
       allOf(
         hasAction(Intent.ACTION_CREATE_DOCUMENT),
-        hasCategories(hasItem(equalTo(Intent.CATEGORY_OPENABLE))),
+        hasCategories(setOf(Intent.CATEGORY_OPENABLE)),
         hasType(Constants.MIME_TYPE_PGP_KEY)
       )
     )

FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/base/BaseBackupKeysFragmentTest.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.base
@@ -17,8 +17,6 @@ import com.flowcrypt.email.Constants
 import com.flowcrypt.email.base.BaseTest
 import com.flowcrypt.email.junit.annotations.FlowCryptTestSettings
 import org.hamcrest.Matchers.allOf
-import org.hamcrest.Matchers.equalTo
-import org.hamcrest.Matchers.hasItem
 import java.io.File
 
 /**
@@ -32,7 +30,7 @@ abstract class BaseBackupKeysFragmentTest : BaseTest(), AddAccountToDatabaseRule
     intending(
       allOf(
         hasAction(Intent.ACTION_CREATE_DOCUMENT),
-        hasCategories(hasItem(equalTo(Intent.CATEGORY_OPENABLE))),
+        hasCategories(setOf(Intent.CATEGORY_OPENABLE)),
         hasType(Constants.MIME_TYPE_PGP_KEY)
       )
     ).respondWith(Instrumentation.ActivityResult(Activity.RESULT_OK, resultData))

FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/fragment/isolation/incontainer/PrivateKeyDetailsFragmentInIsolationTest.kt

@@ -42,8 +42,6 @@ import com.flowcrypt.email.util.DateTimeUtil
 import com.flowcrypt.email.util.GeneralUtil
 import com.flowcrypt.email.util.PrivateKeysManager
 import org.hamcrest.Matchers.allOf
-import org.hamcrest.Matchers.equalTo
-import org.hamcrest.Matchers.hasItem
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -178,7 +176,7 @@ class PrivateKeyDetailsFragmentInIsolationTest : BaseTest() {
     intending(
       allOf(
         hasAction(Intent.ACTION_CREATE_DOCUMENT),
-        hasCategories(hasItem(equalTo(Intent.CATEGORY_OPENABLE))),
+        hasCategories(setOf(Intent.CATEGORY_OPENABLE)),
         hasType(Constants.MIME_TYPE_PGP_KEY)
       )
     ).respondWith(Instrumentation.ActivityResult(Activity.RESULT_OK, resultData))

build.gradle.kts

@@ -12,7 +12,7 @@ plugins {
   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.0" apply false
+  id("org.ajoberstar.grgit") version "5.3.2" apply false
 }
 
 subprojects {