From 81b8d90c321be1ee2d699fd0b8d4eb8bb929c3ec Mon Sep 17 00:00:00 2001 From: elelanv Date: Fri, 22 Aug 2025 16:41:21 +0530 Subject: [PATCH 1/2] fix: upgrade okhttp and sardine dependencies for improved functionality --- app/build.gradle.kts | 12 ++++++++---- gradle/libs.versions.toml | 24 +++++++++++++----------- settings.gradle.kts | 2 ++ 3 files changed, 23 insertions(+), 15 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index aec1166c..8689714b 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -221,9 +221,14 @@ dependencies { implementation(libs.gson) implementation(libs.okhttp) implementation(libs.okhttp.logging) - implementation(libs.guardianproject.sardine) + // adding web dav support: https://github.com/thegrizzlylabs/sardine-android' + //implementation(libs.guardianproject.sardine) + //implementation(libs.thegrizzlylabs.sardine) + implementation("com.github.elelan:sardine-android:0.1.0-alpha03") + + - // Utility Libraries +// Utility Libraries implementation(libs.timber) //implementation(libs.orhanobut.logger) //implementation(libs.abdularis.circularimageview) @@ -281,8 +286,7 @@ dependencies { implementation(libs.satyan.sugar) - // adding web dav support: https://github.com/thegrizzlylabs/sardine-android' - implementation("com.github.guardianproject:sardine-android:89f7eae512") + implementation("com.github.derlio:audio-waveform:v1.0.1") diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 984f76b2..286bf879 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,38 +1,39 @@ [versions] activity = "1.10.1" -agp = "8.12.0" +agp = "8.12.1" appcompat = "1.7.1" biometric = "1.1.0" coil = "3.3.0" -compose = "1.9.0-beta03" +compose = "1.9.0" compose-material-icons = "1.7.8" compose-preference = "1.1.1" constraintlayout = "2.2.1" constraintlayout-compos = "1.1.1" coordinatorlayout = "1.3.0" -core = "1.16.0" +core = "1.17.0" core-splashscreen = "1.0.1" coroutines = "1.10.2" detekt = "1.23.8" -detekt-compose = "0.4.26" +detekt-compose = "0.4.27" detekt-rules-compose = "1.4.0" espresso-core = "3.5.1" -fragment = "1.8.8" +fragment = "1.8.9" google-api-client-android = "1.26.0" google-http-client-gson = "1.42.3" gson = "2.13.1" junit = "4.13.2" junit-android = "1.3.0" -androidx-test-runner = "1.6.2" +androidx-test-runner = "1.7.0" koin = "4.1.0" -kotlin = "2.2.0" -ksp = "2.2.0-2.0.2" +kotlin = "2.2.10" +ksp = "2.2.10-2.0.2" lifecycle = "2.9.2" material = "1.12.0" -material3 = "1.4.0-beta01" -mixpanel = "8.2.0" +material3 = "1.4.0-beta02" +mixpanel = "8.2.1" navigation = "2.9.3" -okhttp = "4.12.0" +okhttp = "5.1.0" +thegrizzlylabs-sardine = "0.9" preference = "1.2.1" recyclerview = "1.4.0" recyclerview-selection = "1.2.0" @@ -134,6 +135,7 @@ okhttp-logging = { group = "com.squareup.okhttp3", name = "logging-interceptor", retrofit = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit" } retrofit-gson = { group = "com.squareup.retrofit2", name = "converter-gson", version.ref = "retrofit" } guardianproject-sardine = { group = "com.github.guardianproject", name = "sardine-android", version = "89f7eae512" } +thegrizzlylabs-sardine = { group = "com.github.thegrizzlylabs", name = "sardine-android", version.ref = "thegrizzlylabs-sardine" } # Images coil = { group = "io.coil-kt.coil3", name = "coil", version.ref = "coil" } diff --git a/settings.gradle.kts b/settings.gradle.kts index abaf95ae..ad4cefd6 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -89,6 +89,8 @@ dependencyResolutionManagement { includeModule("com.github.derlio", "audio-waveform") includeModule("com.github.abdularis", "circularimageview") includeModule("com.github.guardianproject", "sardine-android") + includeModule("com.github.thegrizzlylabs", "sardine-android") + includeModule("com.github.elelan", "sardine-android") } } } From eaf0596c45be82375f18afae909d446feca9bd49 Mon Sep 17 00:00:00 2001 From: elelanv Date: Thu, 16 Oct 2025 13:21:23 +0530 Subject: [PATCH 2/2] okhttp upgraded to 5.2.1 --- app/build.gradle.kts | 2 +- .../services/webdav/BasicAuthInterceptor.kt | 6 ++---- gradle/libs.versions.toml | 14 +++++++------- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 9c0f72d9..3a321202 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -243,7 +243,7 @@ dependencies { // adding web dav support: https://github.com/thegrizzlylabs/sardine-android' //implementation(libs.guardianproject.sardine) //implementation(libs.thegrizzlylabs.sardine) - implementation("com.github.elelan:sardine-android:0.1.0-alpha03") + implementation("com.github.elelan:sardine-android:0.1.0-alpha05") diff --git a/app/src/main/java/net/opendasharchive/openarchive/services/webdav/BasicAuthInterceptor.kt b/app/src/main/java/net/opendasharchive/openarchive/services/webdav/BasicAuthInterceptor.kt index 8f956d75..1a44a16b 100644 --- a/app/src/main/java/net/opendasharchive/openarchive/services/webdav/BasicAuthInterceptor.kt +++ b/app/src/main/java/net/opendasharchive/openarchive/services/webdav/BasicAuthInterceptor.kt @@ -8,7 +8,8 @@ import java.io.IOException import kotlin.Throws class BasicAuthInterceptor(user: String?, password: String?) : Interceptor { - private val credentials: String + private val credentials: String = basic(user!!, password!!) + @Throws(IOException::class) override fun intercept(chain: Interceptor.Chain): Response { val request: Request = chain.request() @@ -16,7 +17,4 @@ class BasicAuthInterceptor(user: String?, password: String?) : Interceptor { .header("Authorization", credentials).build() return chain.proceed(authenticatedRequest) } - init { - credentials = basic(user!!, password!!) - } } \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 81a57972..fa8ce28f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ agp = "8.13.0" appcompat = "1.7.1" biometric = "1.1.0" coil = "3.3.0" -compose = "1.9.2" +compose = "1.9.3" compose-material-icons = "1.7.8" compose-preference = "1.1.1" constraintlayout = "2.2.1" @@ -27,13 +27,13 @@ junit-android = "1.3.0" androidx-test-runner = "1.7.0" koin = "4.1.1" kotlin = "2.2.20" -ksp = "2.2.20-2.0.3" +ksp = "2.2.20-2.0.4" lifecycle = "2.9.4" material = "1.13.0" material3 = "1.4.0" -mixpanel = "8.2.3" +mixpanel = "8.2.4" navigation = "2.9.5" -okhttp = "4.12.0" +okhttp = "5.2.1" preference = "1.2.1" recyclerview = "1.4.0" recyclerview-selection = "1.2.0" @@ -65,10 +65,10 @@ netcipher = "2.2.0-alpha" permissionx = "1.8.1" proofmode = "1.0.30" satyan-sugar = "1.5" -tor-android = "0.4.8.17.2" +tor-android = "0.4.8.18" jtorctl = "0.4.5.7" -firebase-crashlytics = "20.0.2" -google-gms-google-services = "4.4.3" +firebase-crashlytics = "20.0.3" +google-gms-google-services = "4.4.4" google-firebase-crashlytics = "3.0.6" [libraries]