Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d415360d authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

feat: replace nc-android-lib with eOS fork 

to support cookie passing on req, nc-andoir-lib should be replaced with eOS nc-android-lib fork
parent 3bae1fae

app/build.gradle

+3 −2
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ plugins { 
    id 'dagger.hilt.android.plugin'

    id 'kotlin-android'

    id 'kotlin-kapt'     // remove as soon as Hilt supports KSP [https://issuetracker.google.com/179057202]

    id 'kotlin-parcelize'

}



// Android configuration
@@ -28,7 +29,7 @@ android { 
        minSdkVersion 24        // Android 7.0

        targetSdkVersion 33     // Android 13



        buildConfigField "String", "userAgent", "\"DAVx5\""

        buildConfigField "String", "userAgent", "\"AccountManager\""



        testInstrumentationRunner "at.bitfire.davdroid.CustomTestRunner"

    }
@@ -217,7 +218,7 @@ dependencies { 
    implementation "commons-httpclient:commons-httpclient:3.1@jar" // remove after entire switch to lib v2

    implementation 'org.apache.jackrabbit:jackrabbit-webdav:2.13.5' // remove after entire switch to lib v2

    implementation 'com.google.code.gson:gson:2.10.1'

    implementation("com.github.nextcloud:android-library:2.14.0") {

    implementation("foundation.e:Nextcloud-Android-Library:1.0.1-alpha") {

        exclude group: 'com.gitlab.bitfireAT', module: 'dav4jvm'

        exclude group: 'org.ogce', module: 'xpp3' // unused in Android and brings wrong Junit version

        exclude group: 'com.squareup.okhttp3'

app/src/main/kotlin/at/bitfire/davdroid/webdav/StreamingFileDescriptor.kt

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ import at.bitfire.davdroid.util.DavUtils 
import okhttp3.HttpUrl

import okhttp3.MediaType

import okhttp3.RequestBody

import okhttp3.internal.headersContentLength

import okhttp3.internal.toLongOrDefault

import okio.BufferedSink

import org.apache.commons.io.FileUtils

import java.io.IOException
@@ -107,7 +107,7 @@ class StreamingFileDescriptor( 
        dav.get(mimeType?.toString() ?: DavUtils.MIME_TYPE_ACCEPT_ALL, null) { response ->

            response.body?.use { body ->

                if (response.isSuccessful) {

                    val length = response.headersContentLength()

                    val length = response.headers["Content-Length"]?.toLongOrDefault(-1L) ?: -1L



                    notification.setContentTitle(context.getString(R.string.webdav_notification_download))

                    if (length == -1L)

build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ buildscript { 
        hilt: '2.48.1',

        kotlin: '1.9.10',      // keep in sync with * app/build.gradle composeOptions.kotlinCompilerExtensionVersion

                               //                   * com.google.devtools.ksp at the end of this file

        okhttp: '4.12.0',

        okhttp: '5.0.0-alpha.11',

        room: '2.5.2',

        workManager: '2.9.0-rc01',

        // Apache Commons versions