Skip to content

Commit 214924b

Browse files
Bump the okhttp3 group with 3 updates (#3078)
* Bump the okhttp3 group with 3 updates Bumps the okhttp3 group with 3 updates: [com.squareup.okhttp3:mockwebserver](https://github.com/square/okhttp), [com.squareup.okhttp3:okhttp-tls](https://github.com/square/okhttp) and [com.squareup.okhttp3:logging-interceptor](https://github.com/square/okhttp). Updates `com.squareup.okhttp3:mockwebserver` from 4.12.0 to 5.1.0 - [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md) - [Commits](square/okhttp@parent-4.12.0...parent-5.1.0) Updates `com.squareup.okhttp3:okhttp-tls` from 4.12.0 to 5.1.0 - [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md) - [Commits](square/okhttp@parent-4.12.0...parent-5.1.0) Updates `com.squareup.okhttp3:logging-interceptor` from 4.12.0 to 5.1.0 - [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md) - [Commits](square/okhttp@parent-4.12.0...parent-5.1.0) --- updated-dependencies: - dependency-name: com.squareup.okhttp3:mockwebserver dependency-version: 5.1.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: okhttp3 - dependency-name: com.squareup.okhttp3:okhttp-tls dependency-version: 5.1.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: okhttp3 - dependency-name: com.squareup.okhttp3:logging-interceptor dependency-version: 5.1.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: okhttp3 ... Signed-off-by: dependabot[bot] <support@github.com> * wip * wip --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Den <DenBond7@gmail.com>
1 parent 8a8e653 commit 214924b

3 files changed

Lines changed: 396 additions & 160 deletions

File tree

FlowCrypt/build.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -428,12 +428,12 @@ dependencies {
428428
androidTestImplementation("androidx.room:room-testing:2.7.2")
429429
androidTestImplementation("androidx.arch.core:core-testing:2.2.0")
430430
androidTestImplementation("androidx.work:work-testing:2.10.3")
431-
androidTestImplementation("com.squareup.okhttp3:mockwebserver:4.12.0")
432-
androidTestImplementation("com.squareup.okhttp3:okhttp-tls:4.12.0")
431+
androidTestImplementation("com.squareup.okhttp3:mockwebserver:5.1.0")
432+
androidTestImplementation("com.squareup.okhttp3:okhttp-tls:5.1.0")
433433
androidTestImplementation("com.athaydes.rawhttp:rawhttp-core:2.6.0")
434434
androidTestUtil("androidx.test:orchestrator:1.6.1")
435435

436-
testImplementation("com.squareup.okhttp3:mockwebserver:4.12.0")
436+
testImplementation("com.squareup.okhttp3:mockwebserver:5.1.0")
437437
testImplementation("com.flextrade.jfixture:jfixture:2.7.2")
438438
testImplementation("com.shazam:shazamcrest:0.11")
439439
testImplementation("org.robolectric:robolectric:4.14.1")
@@ -490,7 +490,7 @@ dependencies {
490490
implementation("com.squareup.retrofit2:converter-gson:3.0.0")
491491
implementation("com.squareup.retrofit2:converter-scalars:3.0.0")
492492
implementation("com.squareup.okio:okio:3.16.0")
493-
implementation("com.squareup.okhttp3:logging-interceptor:4.12.0")
493+
implementation("com.squareup.okhttp3:logging-interceptor:5.1.0")
494494

495495
implementation("com.github.bumptech.glide:glide:4.16.0")
496496
implementation("com.nulab-inc:zxcvbn:1.9.0")

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ import jakarta.mail.internet.MimeMessage
1515
import kotlinx.coroutines.Dispatchers
1616
import kotlinx.coroutines.delay
1717
import kotlinx.coroutines.withContext
18-
import okhttp3.internal.io.FileSystem
18+
import okio.FileSystem
19+
import okio.Path.Companion.toOkioPath
1920
import okio.buffer
2021
import org.pgpainless.PGPainless
2122
import java.io.File
@@ -36,10 +37,10 @@ object MsgsCacheManager {
3637

3738
fun init(context: Context) {
3839
diskLruCache = DiskLruCache(
39-
FileSystem.SYSTEM,
40-
File(context.filesDir, CACHE_DIR_NAME),
41-
CACHE_VERSION,
42-
CACHE_SIZE
40+
fileSystem = FileSystem.SYSTEM,
41+
directory = File(context.filesDir, CACHE_DIR_NAME).toOkioPath(),
42+
appVersion = CACHE_VERSION,
43+
maxSize = CACHE_SIZE
4344
)
4445
}
4546

0 commit comments

Comments
 (0)