Skip to content

fix: upgrade okhttp and sardine dependencies for improved functionality #705

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Parent: Stabilizing Branch
wants to merge 3 commits into
base: next
Choose a base branch
from
Open

fix: upgrade okhttp and sardine dependencies for improved functionality #705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
81b8d90
fix: upgrade okhttp and sardine dependencies for improved functionality
Elelan Aug 22, 2025
4383c51
Merge branch 'next' into bugFix/okhttp-sardine-upgrade
Elelan Oct 16, 2025
eaf0596
okhttp upgraded to 5.2.1
Elelan Oct 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")



Copy link

Copilot AI Aug 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using an alpha version (0.1.0-alpha03) in production code introduces stability risks. Consider using a stable release version or documenting the rationale for using an alpha version.

Suggested change
// NOTE: Only alpha versions of sardine-android are available as of June 2024.
// We use 0.1.0-alpha03 for WebDAV support, as no stable release exists.
// Risks: Potential instability. Mitigation: Pin version, monitor upstream, and test thoroughly.
implementation("com.github.elelan:sardine-android:0.1.0-alpha03")

Copilot uses AI. Check for mistakes.
// Utility Libraries
// Utility Libraries
implementation(libs.timber)
//implementation(libs.orhanobut.logger)
//implementation(libs.abdularis.circularimageview)
Expand Down Expand Up @@ -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")

Expand Down
6 changes: 2 additions & 4 deletions app/src/main/java/net/opendasharchive/openarchive/services/webdav/BasicAuthInterceptor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,13 @@ 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()
val authenticatedRequest = request.newBuilder()
.header("Authorization", credentials).build()
return chain.proceed(authenticatedRequest)
}
init {
credentials = basic(user!!, password!!)
}
}
14 changes: 7 additions & 7 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down Expand Up @@ -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]
Expand Down
2 changes: 2 additions & 0 deletions settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Copy link

Copilot AI Aug 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The thegrizzlylabs sardine-android module is included but not used in the actual implementation. Consider removing this unused module inclusion to avoid confusion.

Suggested change
includeModule("com.github.thegrizzlylabs", "sardine-android")

Copilot uses AI. Check for mistakes.
includeModule("com.github.elelan", "sardine-android")
}
}
}
Expand Down