diff --git a/app/build.gradle.kts b/app/build.gradle.kts index ca251d318..3a321202d 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -240,9 +240,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-alpha05") + + - // Utility Libraries +// Utility Libraries implementation(libs.timber) //implementation(libs.orhanobut.logger) //implementation(libs.abdularis.circularimageview) @@ -300,8 +305,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/app/src/main/java/net/opendasharchive/openarchive/services/webdav/BasicAuthInterceptor.kt b/app/src/main/java/net/opendasharchive/openarchive/services/webdav/BasicAuthInterceptor.kt index 8f956d751..1a44a16b1 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 81a579727..fa8ce28f0 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] diff --git a/settings.gradle.kts b/settings.gradle.kts index abaf95ae8..ad4cefd66 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") } } }