Merge branch 'master' into dependabot/gradle/commons-io-commons-io-2.20.0

Author: DenBond7

FlowCrypt/build.gradle.kts

@@ -428,12 +428,12 @@ dependencies {
   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:4.12.0")
-  androidTestImplementation("com.squareup.okhttp3:okhttp-tls:4.12.0")
+  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.6.1")
 
-  testImplementation("com.squareup.okhttp3:mockwebserver:4.12.0")
+  testImplementation("com.squareup.okhttp3:mockwebserver:5.1.0")
   testImplementation("com.flextrade.jfixture:jfixture:2.7.2")
   testImplementation("com.shazam:shazamcrest:0.11")
   testImplementation("org.robolectric:robolectric:4.14.1")
@@ -490,7 +490,7 @@ dependencies {
   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.0")
-  implementation("com.squareup.okhttp3:logging-interceptor:4.12.0")
+  implementation("com.squareup.okhttp3:logging-interceptor:5.1.0")
 
   implementation("com.github.bumptech.glide:glide:4.16.0")
   implementation("com.nulab-inc:zxcvbn:1.9.0")

FlowCrypt/src/main/java/com/flowcrypt/email/api/email/MsgsCacheManager.kt

@@ -15,7 +15,8 @@ import jakarta.mail.internet.MimeMessage
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.withContext
-import okhttp3.internal.io.FileSystem
+import okio.FileSystem
+import okio.Path.Companion.toOkioPath
 import okio.buffer
 import org.pgpainless.PGPainless
 import java.io.File
@@ -36,10 +37,10 @@ object MsgsCacheManager {
 
   fun init(context: Context) {
     diskLruCache = DiskLruCache(
-      FileSystem.SYSTEM,
-      File(context.filesDir, CACHE_DIR_NAME),
-      CACHE_VERSION,
-      CACHE_SIZE
+      fileSystem = FileSystem.SYSTEM,
+      directory = File(context.filesDir, CACHE_DIR_NAME).toOkioPath(),
+      appVersion = CACHE_VERSION,
+      maxSize = CACHE_SIZE
     )
   }