Potential fix to oauth error after logging in for first time that makes user to reauthenticate

Unsharing wont return anything anymore since result object was not used

README.md

@@ -49,6 +49,6 @@ ownCloud Android Library uses OkHttp version 4.6.0, licensed under Apache Licens
 
 ### Compatibility
 
-ownCloud Android Library is valid for Android systems from version Android 6 (android:minSdkVersion="23" android:targetSdkVersion="33").
+ownCloud Android Library is valid for Android systems from version Android 5 (android:minSdkVersion="21" android:targetSdkVersion="29").
 
 ownCloud Android library supports ownCloud server from version 4.5.

build.gradle

@@ -1,7 +1,7 @@
 buildscript {
     ext {
-        orgJetbrainsKotlin = '1.8.10'
-        comSquareupMoshi = '1.14.0'
+        kotlinVersion = '1.6.21'
+        moshiVersion = "1.13.0"
     }
 
     repositories {
@@ -10,16 +10,12 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath "org.jlleitschuh.gradle:ktlint-gradle:11.1.0"
-        classpath 'com.android.tools.build:gradle:7.4.2'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$orgJetbrainsKotlin"
+        classpath "org.jlleitschuh.gradle:ktlint-gradle:10.3.0"
+        classpath 'com.android.tools.build:gradle:7.1.3'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
     }
 }
 
-plugins {
-    id 'com.google.devtools.ksp' version '1.8.10-1.0.9' apply false
-}
-
 allprojects {
     repositories {
         google()
@@ -30,5 +26,4 @@ allprojects {
 
 subprojects {
     apply plugin: "org.jlleitschuh.gradle.ktlint"
-    apply plugin: "com.google.devtools.ksp"
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

owncloudComLibrary/build.gradle

@@ -1,32 +1,32 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'com.google.devtools.ksp'
+apply plugin: 'kotlin-kapt'
 apply plugin: 'kotlin-parcelize'
 
 dependencies {
     api 'com.squareup.okhttp3:okhttp:4.6.0'
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$orgJetbrainsKotlin"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
     api 'com.gitlab.ownclouders:dav4android:oc_support_2.1.5'
     api 'com.github.AppDevNext.Logcat:LogcatCore:2.2.2'
 
     // Moshi
-    implementation("com.squareup.moshi:moshi-kotlin:$comSquareupMoshi") {
+    implementation("com.squareup.moshi:moshi-kotlin:$moshiVersion") {
         exclude module: "kotlin-reflect"
     }
     implementation 'org.apache.commons:commons-lang3:3.12.0'
-    ksp "com.squareup.moshi:moshi-kotlin-codegen:$comSquareupMoshi"
+    kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshiVersion"
 
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.robolectric:robolectric:4.10'
+    testImplementation 'org.robolectric:robolectric:4.9'
     debugImplementation 'com.facebook.stetho:stetho-okhttp3:1.6.0'
 }
 
 android {
-    compileSdkVersion 33
+    compileSdkVersion 31
 
     defaultConfig {
-        minSdkVersion 23
-        targetSdkVersion 33
+        minSdkVersion 21
+        targetSdkVersion 31
     }
 
     lint {
@@ -39,5 +39,4 @@ android {
             includeAndroidResources = true
         }
     }
-    namespace 'com.owncloud.android.lib'
 }

owncloudComLibrary/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--  ownCloud Android Library is available under MIT license
-   Copyright (C) 2023 ownCloud GmbH.
+   Copyright (C) 2016 ownCloud GmbH.
     
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -23,8 +23,16 @@
 
  -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest package="com.owncloud.android.lib"
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <!-- USE_CREDENTIALS, MANAGE_ACCOUNTS and AUTHENTICATE_ACCOUNTS are needed for API < 23.
+        In API >= 23 the do not exist anymore -->
+    <uses-permission
+        android:name="android.permission.MANAGE_ACCOUNTS"
+        android:maxSdkVersion="22" />
+    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
+    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
 </manifest>

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/OwnCloudClient.java

@@ -43,7 +43,6 @@ import timber.log.Timber;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.List;
-import java.util.Locale;
 
 import static com.owncloud.android.lib.common.http.HttpConstants.AUTHORIZATION_HEADER;
 import static com.owncloud.android.lib.common.http.HttpConstants.HTTP_MOVED_PERMANENTLY;
@@ -129,7 +128,6 @@ public class OwnCloudClient extends HttpClient {
             Timber.d("Executing in request with id %s", requestId);
             method.setRequestHeader(HttpConstants.OC_X_REQUEST_ID, requestId);
             method.setRequestHeader(HttpConstants.USER_AGENT_HEADER, SingleSessionManager.getUserAgent());
-            method.setRequestHeader(HttpConstants.ACCEPT_LANGUAGE_HEADER, Locale.getDefault().getLanguage());
             method.setRequestHeader(HttpConstants.ACCEPT_ENCODING_HEADER, HttpConstants.ACCEPT_ENCODING_IDENTITY);
             if (mCredentials.getHeaderAuth() != null && !mCredentials.getHeaderAuth().isEmpty()) {
                 method.setRequestHeader(AUTHORIZATION_HEADER, mCredentials.getHeaderAuth());

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/HttpConstants.java

@@ -40,7 +40,6 @@ public class HttpConstants {
     public static final String IF_MATCH_HEADER = "If-Match";
     public static final String IF_NONE_MATCH_HEADER = "If-None-Match";
     public static final String CONTENT_TYPE_HEADER = "Content-Type";
-    public static final String ACCEPT_LANGUAGE_HEADER = "Accept-Language";
     public static final String CONTENT_LENGTH_HEADER = "Content-Length";
     public static final String OC_TOTAL_LENGTH_HEADER = "OC-Total-Length";
     public static final String OC_X_OC_MTIME_HEADER = "X-OC-Mtime";

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/LogInterceptor.kt

@@ -51,7 +51,7 @@ class LogInterceptor : Interceptor {
 
         val request = chain.request().also {
             val requestId = it.headers[OC_X_REQUEST_ID]
-            logHttp(REQUEST, INFO, requestId, "Method: ${it.method} URL: ${it.url}")
+            logHttp(REQUEST, INFO, requestId, "Type: ${it.method} URL: ${it.url}")
             logHeaders(requestId, it.headers, REQUEST)
             logRequestBody(requestId, it.body)
         }
@@ -64,7 +64,7 @@ class LogInterceptor : Interceptor {
                 RESPONSE,
                 INFO,
                 requestId,
-                "Method: ${request.method} URL: ${request.url} Code: ${it.code} Message: ${it.message}"
+                "Code: ${it.code}  Message: ${it.message} IsSuccessful: ${it.isSuccessful}"
             )
             logHeaders(requestId, it.headers, RESPONSE)
             logResponseBody(requestId, it.body)

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/CopyMethod.kt

@@ -36,7 +36,7 @@ import java.net.URL
 class CopyMethod(
     val url: URL,
     private val destinationUrl: String,
-    val forceOverride: Boolean = false
+    private val forceOverride: Boolean = false
 ) : DavMethod(url) {
     @Throws(Exception::class)
     public override fun onDavExecute(davResource: DavOCResource): Int {

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/DavUtils.kt

@@ -24,36 +24,13 @@
 package com.owncloud.android.lib.common.http.methods.webdav
 
 import at.bitfire.dav4jvm.Property
+import at.bitfire.dav4jvm.PropertyUtils.getAllPropSet
 import at.bitfire.dav4jvm.PropertyUtils.getQuotaPropset
-import at.bitfire.dav4jvm.property.CreationDate
-import at.bitfire.dav4jvm.property.DisplayName
-import at.bitfire.dav4jvm.property.GetContentLength
-import at.bitfire.dav4jvm.property.GetContentType
-import at.bitfire.dav4jvm.property.GetETag
-import at.bitfire.dav4jvm.property.GetLastModified
-import at.bitfire.dav4jvm.property.OCId
-import at.bitfire.dav4jvm.property.OCPermissions
-import at.bitfire.dav4jvm.property.OCPrivatelink
-import at.bitfire.dav4jvm.property.OCSize
-import at.bitfire.dav4jvm.property.ResourceType
 import com.owncloud.android.lib.common.http.methods.webdav.properties.OCShareTypes
 
 object DavUtils {
-    @JvmStatic val allPropSet: Array<Property.Name>
-        get() = arrayOf(
-            DisplayName.NAME,
-            GetContentType.NAME,
-            ResourceType.NAME,
-            GetContentLength.NAME,
-            GetLastModified.NAME,
-            CreationDate.NAME,
-            GetETag.NAME,
-            OCPermissions.NAME,
-            OCId.NAME,
-            OCSize.NAME,
-            OCPrivatelink.NAME,
-            OCShareTypes.NAME,
-        )
+    @JvmStatic val allPropset: Array<Property.Name>
+        get() = getAllPropSet().plus(OCShareTypes.NAME)
 
     val quotaPropSet: Array<Property.Name>
         get() = getQuotaPropset()

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/MoveMethod.kt

@@ -36,7 +36,7 @@ import java.net.URL
 class MoveMethod(
     url: URL,
     private val destinationUrl: String,
-    val forceOverride: Boolean = false
+    private val forceOverride: Boolean = false
 ) : DavMethod(url) {
     @Throws(Exception::class)
     override fun onDavExecute(davResource: DavOCResource): Int {

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/operations/RemoteOperationResult.java

@@ -46,7 +46,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.Serializable;
 import java.net.MalformedURLException;
-import java.net.ProtocolException;
 import java.net.SocketException;
 import java.net.SocketTimeoutException;
 import java.net.UnknownHostException;
@@ -167,10 +166,7 @@ public class RemoteOperationResult<T>
         } else if (e instanceof FileNotFoundException) {
             mCode = ResultCode.LOCAL_FILE_NOT_FOUND;
 
-        } else if (e instanceof ProtocolException) {
-            mCode = ResultCode.NETWORK_ERROR;
-        }
-        else {
+        } else {
             mCode = ResultCode.UNKNOWN_ERROR;
         }
     }
@@ -593,6 +589,5 @@ public class RemoteOperationResult<T>
         SPECIFIC_METHOD_NOT_ALLOWED,
         SPECIFIC_BAD_REQUEST,
         TOO_EARLY,
-        NETWORK_ERROR,
     }
 }

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/appregistry/CreateRemoteFileWithAppProviderOperation.kt

@@ -1,108 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2023 ownCloud GmbH.
- *
- *   Permission is hereby granted, free of charge, to any person obtaining a copy
- *   of this software and associated documentation files (the "Software"), to deal
- *   in the Software without restriction, including without limitation the rights
- *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *   copies of the Software, and to permit persons to whom the Software is
- *   furnished to do so, subject to the following conditions:
- *
- *   The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- *
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *   THE SOFTWARE.
- *
- */
-
-package com.owncloud.android.lib.resources.appregistry
-
-import com.owncloud.android.lib.common.OwnCloudClient
-import com.owncloud.android.lib.common.http.HttpConstants
-import com.owncloud.android.lib.common.http.methods.nonwebdav.PostMethod
-import com.owncloud.android.lib.common.network.WebdavUtils
-import com.owncloud.android.lib.common.operations.RemoteOperation
-import com.owncloud.android.lib.common.operations.RemoteOperationResult
-import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonAdapter
-import com.squareup.moshi.JsonClass
-import com.squareup.moshi.Moshi
-import okhttp3.FormBody
-import okhttp3.RequestBody
-import timber.log.Timber
-import java.net.URL
-import java.util.concurrent.TimeUnit
-
-class CreateRemoteFileWithAppProviderOperation(
-    private val createFileWithAppProviderEndpoint: String,
-    private val parentContainerId: String,
-    private val filename: String,
-) : RemoteOperation<String>() {
-
-    override fun run(client: OwnCloudClient): RemoteOperationResult<String> {
-        return try {
-
-            val createFileWithAppProviderRequestBody = CreateFileWithAppProviderParams(parentContainerId, filename)
-                .toRequestBody()
-
-            val stringUrl = client.baseUri.toString() + WebdavUtils.encodePath(createFileWithAppProviderEndpoint)
-
-            val postMethod = PostMethod(URL(stringUrl), createFileWithAppProviderRequestBody).apply {
-                setReadTimeout(TIMEOUT, TimeUnit.MILLISECONDS)
-                setConnectionTimeout(TIMEOUT, TimeUnit.MILLISECONDS)
-            }
-
-            val status = client.executeHttpMethod(postMethod)
-            Timber.d("Create file $filename with app provider in folder with ID $parentContainerId - $status${if (!isSuccess(status)) "(FAIL)" else ""}")
-
-            if (isSuccess(status)) RemoteOperationResult<String>(ResultCode.OK).apply {
-                val moshi = Moshi.Builder().build()
-                val adapter: JsonAdapter<CreateFileWithAppProviderResponse> = moshi.adapter(CreateFileWithAppProviderResponse::class.java)
-
-                data = postMethod.getResponseBodyAsString()?.let { adapter.fromJson(it)!!.fileId }
-            }
-            else RemoteOperationResult<String>(postMethod).apply { data = "" }
-
-        } catch (e: Exception) {
-            val result = RemoteOperationResult<String>(e)
-            Timber.e(e, "Create file $filename with app provider in folder with ID $parentContainerId failed")
-            result
-        }
-    }
-
-    private fun isSuccess(status: Int) = status == HttpConstants.HTTP_OK
-
-    data class CreateFileWithAppProviderParams(
-        val parentContainerId: String,
-        val filename: String,
-    ) {
-        fun toRequestBody(): RequestBody =
-            FormBody.Builder()
-                .add(PARAM_PARENT_CONTAINER_ID, parentContainerId)
-                .add(PARAM_FILENAME, filename)
-                .build()
-
-        companion object {
-            const val PARAM_PARENT_CONTAINER_ID = "parent_container_id"
-            const val PARAM_FILENAME = "filename"
-        }
-    }
-
-    @JsonClass(generateAdapter = true)
-    data class CreateFileWithAppProviderResponse(
-        @Json(name = "file_id")
-        val fileId: String,
-    )
-
-    companion object {
-        private const val TIMEOUT: Long = 5_000
-    }
-}

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/appregistry/GetRemoteAppRegistryOperation.kt

@@ -1,78 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   @author Abel García de Prada
- *
- *   Copyright (C) 2023 ownCloud GmbH.
- *
- *   Permission is hereby granted, free of charge, to any person obtaining a copy
- *   of this software and associated documentation files (the "Software"), to deal
- *   in the Software without restriction, including without limitation the rights
- *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *   copies of the Software, and to permit persons to whom the Software is
- *   furnished to do so, subject to the following conditions:
- *
- *   The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- *
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *   THE SOFTWARE.
- *
- */
-package com.owncloud.android.lib.resources.appregistry
-
-import com.owncloud.android.lib.common.OwnCloudClient
-import com.owncloud.android.lib.common.http.HttpConstants
-import com.owncloud.android.lib.common.http.methods.nonwebdav.GetMethod
-import com.owncloud.android.lib.common.operations.RemoteOperation
-import com.owncloud.android.lib.common.operations.RemoteOperationResult
-import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK
-import com.owncloud.android.lib.resources.appregistry.responses.AppRegistryResponse
-import com.squareup.moshi.JsonAdapter
-import com.squareup.moshi.Moshi
-import timber.log.Timber
-import java.net.URL
-
-class GetRemoteAppRegistryOperation(private val appUrl: String?) : RemoteOperation<AppRegistryResponse>() {
-
-    override fun run(client: OwnCloudClient): RemoteOperationResult<AppRegistryResponse> {
-        var result: RemoteOperationResult<AppRegistryResponse>
-
-        try {
-            val uriBuilder = client.baseUri.buildUpon().apply {
-                appendEncodedPath(appUrl)
-            }
-            val getMethod = GetMethod(URL(uriBuilder.build().toString()))
-            val status = client.executeHttpMethod(getMethod)
-
-            val response = getMethod.getResponseBodyAsString()
-
-            if (status == HttpConstants.HTTP_OK) {
-                Timber.d("Successful response $response")
-
-                // Parse the response
-                val moshi: Moshi = Moshi.Builder().build()
-                val adapter: JsonAdapter<AppRegistryResponse> = moshi.adapter(AppRegistryResponse::class.java)
-                val appRegistryResponse: AppRegistryResponse = response?.let { adapter.fromJson(it) } ?: AppRegistryResponse(value = emptyList())
-
-                result = RemoteOperationResult(OK)
-                result.data = appRegistryResponse
-
-                Timber.d("Get AppRegistry completed and parsed to ${result.data}")
-            } else {
-                result = RemoteOperationResult(getMethod)
-                Timber.e("Failed response while getting app registry from the server status code: $status; response message: $response")
-            }
-
-        } catch (e: Exception) {
-            result = RemoteOperationResult(e)
-            Timber.e(e, "Exception while getting app registry")
-        }
-
-        return result
-    }
-}

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/appregistry/responses/AppRegistryResponse.kt

@@ -1,56 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   @author Abel García de Prada
- *
- *   Copyright (C) 2023 ownCloud GmbH.
- *
- *   Permission is hereby granted, free of charge, to any person obtaining a copy
- *   of this software and associated documentation files (the "Software"), to deal
- *   in the Software without restriction, including without limitation the rights
- *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *   copies of the Software, and to permit persons to whom the Software is
- *   furnished to do so, subject to the following conditions:
- *
- *   The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- *
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *   THE SOFTWARE.
- *
- */
-package com.owncloud.android.lib.resources.appregistry.responses
-
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
-
-@JsonClass(generateAdapter = true)
-data class AppRegistryResponse(
-    @Json(name = "mime-types")
-    val value: List<AppRegistryMimeTypeResponse>
-)
-
-@JsonClass(generateAdapter = true)
-data class AppRegistryMimeTypeResponse(
-    @Json(name = "mime_type") val mimeType: String,
-    val ext: String? = null,
-    @Json(name = "app_providers")
-    val appProviders: List<AppRegistryProviderResponse>,
-    val name: String? = null,
-    val icon: String? = null,
-    val description: String? = null,
-    @Json(name = "allow_creation")
-    val allowCreation: Boolean? = null,
-    @Json(name = "default_application")
-    val defaultApplication: String? = null
-)
-
-@JsonClass(generateAdapter = true)
-data class AppRegistryProviderResponse(
-    val name: String,
-    val icon: String,
-)

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/appregistry/services/AppRegistryService.kt

@@ -1,44 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2023 ownCloud GmbH.
- *
- *   Permission is hereby granted, free of charge, to any person obtaining a copy
- *   of this software and associated documentation files (the "Software"), to deal
- *   in the Software without restriction, including without limitation the rights
- *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *   copies of the Software, and to permit persons to whom the Software is
- *   furnished to do so, subject to the following conditions:
- *
- *   The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- *
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *   THE SOFTWARE.
- */
-
-package com.owncloud.android.lib.resources.appregistry.services
-
-import com.owncloud.android.lib.common.operations.RemoteOperationResult
-import com.owncloud.android.lib.resources.Service
-import com.owncloud.android.lib.resources.appregistry.responses.AppRegistryResponse
-
-interface AppRegistryService : Service {
-    fun getAppRegistry(appUrl: String?): RemoteOperationResult<AppRegistryResponse>
-
-    fun getUrlToOpenInWeb(
-        openWebEndpoint: String,
-        fileId: String,
-        appName: String,
-    ): RemoteOperationResult<String>
-
-    fun createFileWithAppProvider(
-        createFileWithAppProviderEndpoint: String,
-        parentContainerId: String,
-        filename: String,
-    ): RemoteOperationResult<String>
-}

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/appregistry/services/OCAppRegistryService.kt

@@ -1,54 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2023 ownCloud GmbH.
- *
- *   Permission is hereby granted, free of charge, to any person obtaining a copy
- *   of this software and associated documentation files (the "Software"), to deal
- *   in the Software without restriction, including without limitation the rights
- *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *   copies of the Software, and to permit persons to whom the Software is
- *   furnished to do so, subject to the following conditions:
- *
- *   The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- *
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *   THE SOFTWARE.
- */
-
-package com.owncloud.android.lib.resources.appregistry.services
-
-import com.owncloud.android.lib.common.OwnCloudClient
-import com.owncloud.android.lib.common.operations.RemoteOperationResult
-import com.owncloud.android.lib.resources.appregistry.CreateRemoteFileWithAppProviderOperation
-import com.owncloud.android.lib.resources.appregistry.GetRemoteAppRegistryOperation
-import com.owncloud.android.lib.resources.appregistry.GetUrlToOpenInWebRemoteOperation
-import com.owncloud.android.lib.resources.appregistry.responses.AppRegistryResponse
-
-class OCAppRegistryService(override val client: OwnCloudClient) : AppRegistryService {
-    override fun getAppRegistry(appUrl: String?): RemoteOperationResult<AppRegistryResponse> =
-        GetRemoteAppRegistryOperation(appUrl).execute(client)
-
-    override fun getUrlToOpenInWeb(openWebEndpoint: String, fileId: String, appName: String): RemoteOperationResult<String> =
-        GetUrlToOpenInWebRemoteOperation(
-            openWithWebEndpoint = openWebEndpoint,
-            fileId = fileId,
-            appName = appName
-        ).execute(client)
-
-    override fun createFileWithAppProvider(
-        createFileWithAppProviderEndpoint: String,
-        parentContainerId: String,
-        filename: String
-    ): RemoteOperationResult<String> =
-        CreateRemoteFileWithAppProviderOperation(
-            createFileWithAppProviderEndpoint = createFileWithAppProviderEndpoint,
-            parentContainerId = parentContainerId,
-            filename = filename,
-        ).execute(client)
-}

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/CheckPathExistenceRemoteOperation.kt

@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
-*   Copyright (C) 2023 ownCloud GmbH.
+*   Copyright (C) 2020 ownCloud GmbH.
 *
 *   Permission is hereby granted, free of charge, to any person obtaining a copy
 *   of this software and associated documentation files (the "Software"), to deal
@@ -25,7 +25,7 @@ package com.owncloud.android.lib.resources.files
 
 import com.owncloud.android.lib.common.OwnCloudClient
 import com.owncloud.android.lib.common.http.HttpConstants
-import com.owncloud.android.lib.common.http.methods.webdav.DavUtils.allPropSet
+import com.owncloud.android.lib.common.http.methods.webdav.DavUtils.allPropset
 import com.owncloud.android.lib.common.http.methods.webdav.PropfindMethod
 import com.owncloud.android.lib.common.network.WebdavUtils
 import com.owncloud.android.lib.common.operations.RemoteOperation
@@ -41,7 +41,6 @@ import java.util.concurrent.TimeUnit
  * @author David A. Velasco
  * @author David González Verdugo
  * @author Abel García de Prada
- * @author Juan Carlos Garrote Gascón
  *
  * @param remotePath      Path to append to the URL owned by the client instance.
  * @param isUserLoggedIn    When `true`, the username won't be added at the end of the PROPFIND url since is not
@@ -49,21 +48,21 @@ import java.util.concurrent.TimeUnit
  */
 class CheckPathExistenceRemoteOperation(
     val remotePath: String? = "",
-    val isUserLoggedIn: Boolean,
-    val spaceWebDavUrl: String? = null,
+    val isUserLoggedIn: Boolean
 ) : RemoteOperation<Boolean>() {
 
     override fun run(client: OwnCloudClient): RemoteOperationResult<Boolean> {
-        val baseStringUrl = spaceWebDavUrl ?: if (isUserLoggedIn) client.userFilesWebDavUri.toString() else client.baseFilesWebDavUri.toString()
-        val stringUrl = if (isUserLoggedIn) baseStringUrl + WebdavUtils.encodePath(remotePath) else baseStringUrl
-
         return try {
-            val propFindMethod = PropfindMethod(URL(stringUrl), 0, allPropSet).apply {
+            val stringUrl =
+                if (isUserLoggedIn) client.baseFilesWebDavUri.toString()
+                else client.userFilesWebDavUri.toString() + WebdavUtils.encodePath(remotePath)
+
+            val propFindMethod = PropfindMethod(URL(stringUrl), 0, allPropset).apply {
                 setReadTimeout(TIMEOUT.toLong(), TimeUnit.SECONDS)
                 setConnectionTimeout(TIMEOUT.toLong(), TimeUnit.SECONDS)
             }
 
-            val status = client.executeHttpMethod(propFindMethod)
+            var status = client.executeHttpMethod(propFindMethod)
             /* PROPFIND method
              * 404 NOT FOUND: path doesn't exist,
              * 207 MULTI_STATUS: path exists.
@@ -78,9 +77,8 @@ class CheckPathExistenceRemoteOperation(
             val result = RemoteOperationResult<Boolean>(e)
             Timber.e(
                 e,
-                "Existence check for $stringUrl : ${result.logMessage}"
+                "Existence check for ${client.userFilesWebDavUri}${WebdavUtils.encodePath(remotePath)} : ${result.logMessage}"
             )
-            result.data = false
             result
         }
     }

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/CopyRemoteFileOperation.kt

@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2023 ownCloud GmbH.
+ *   Copyright (C) 2022 ownCloud GmbH.
  *
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -44,31 +44,25 @@ import java.util.concurrent.TimeUnit
  * @author David A. Velasco
  * @author Christian Schabesberger
  * @author David González V.
- * @author Juan Carlos Garrote Gascón
- * @author Manuel Plazas Palacio
  *
- * @param sourceRemotePath    Remote path of the file/folder to copy.
+ * @param srcRemotePath    Remote path of the file/folder to copy.
  * @param targetRemotePath Remote path desired for the file/folder to copy it.
  */
 class CopyRemoteFileOperation(
-    private val sourceRemotePath: String,
+    private val srcRemotePath: String,
     private val targetRemotePath: String,
-    private val sourceSpaceWebDavUrl: String? = null,
-    private val targetSpaceWebDavUrl: String? = null,
-    private val forceOverride: Boolean = false,
 ) : RemoteOperation<String>() {
-
     /**
      * Performs the rename operation.
      *
      * @param client Client object to communicate with the remote ownCloud server.
      */
     override fun run(client: OwnCloudClient): RemoteOperationResult<String> {
-        if (targetRemotePath == sourceRemotePath && sourceSpaceWebDavUrl == targetSpaceWebDavUrl) {
+        if (targetRemotePath == srcRemotePath) {
             // nothing to do!
             return RemoteOperationResult(ResultCode.OK)
         }
-        if (targetRemotePath.startsWith(sourceRemotePath) && sourceSpaceWebDavUrl == targetSpaceWebDavUrl) {
+        if (targetRemotePath.startsWith(srcRemotePath)) {
             return RemoteOperationResult(ResultCode.INVALID_COPY_INTO_DESCENDANT)
         }
 
@@ -76,11 +70,9 @@ class CopyRemoteFileOperation(
         var result: RemoteOperationResult<String>
         try {
             val copyMethod = CopyMethod(
-                url = URL((sourceSpaceWebDavUrl ?: client.userFilesWebDavUri.toString()) + WebdavUtils.encodePath(sourceRemotePath)),
-                destinationUrl = (targetSpaceWebDavUrl ?: client.userFilesWebDavUri.toString()) + WebdavUtils.encodePath(targetRemotePath),
-                forceOverride = forceOverride,
+                URL(client.userFilesWebDavUri.toString() + WebdavUtils.encodePath(srcRemotePath)),
+                client.userFilesWebDavUri.toString() + WebdavUtils.encodePath(targetRemotePath),
             ).apply {
-                addRequestHeaders(this)
                 setReadTimeout(COPY_READ_TIMEOUT, TimeUnit.SECONDS)
                 setConnectionTimeout(COPY_CONNECTION_TIMEOUT, TimeUnit.SECONDS)
             }
@@ -91,7 +83,6 @@ class CopyRemoteFileOperation(
                     result = RemoteOperationResult(ResultCode.OK)
                     result.setData(fileRemoteId)
                 }
-
                 isPreconditionFailed(status) -> {
                     result = RemoteOperationResult(ResultCode.INVALID_OVERWRITE)
                     client.exhaustResponse(copyMethod.getResponseBodyAsStream())
@@ -99,27 +90,19 @@ class CopyRemoteFileOperation(
                     /// for other errors that could be explicitly handled, check first:
                     /// http://www.webdav.org/specs/rfc4918.html#rfc.section.9.9.4
                 }
-
                 else -> {
                     result = RemoteOperationResult(copyMethod)
                     client.exhaustResponse(copyMethod.getResponseBodyAsStream())
                 }
             }
-            Timber.i("Copy $sourceRemotePath to $targetRemotePath: ${result.logMessage}")
+            Timber.i("Copy $srcRemotePath to $targetRemotePath: ${result.logMessage}")
         } catch (e: Exception) {
             result = RemoteOperationResult(e)
-            Timber.e(e, "Copy $sourceRemotePath to $targetRemotePath: ${result.logMessage}")
+            Timber.e(e, "Copy $srcRemotePath to $targetRemotePath: ${result.logMessage}")
         }
         return result
     }
 
-    private fun addRequestHeaders(copyMethod: CopyMethod) {
-        //Adding this because the library has an error with override
-        if (copyMethod.forceOverride) {
-            copyMethod.setRequestHeader(OVERWRITE, TRUE)
-        }
-    }
-
     private fun isSuccess(status: Int) = status.isOneOf(HttpConstants.HTTP_CREATED, HttpConstants.HTTP_NO_CONTENT)
 
     private fun isPreconditionFailed(status: Int) = status == HttpConstants.HTTP_PRECONDITION_FAILED
@@ -127,7 +110,5 @@ class CopyRemoteFileOperation(
     companion object {
         private const val COPY_READ_TIMEOUT = 10L
         private const val COPY_CONNECTION_TIMEOUT = 6L
-        private const val OVERWRITE = "overwrite"
-        private const val TRUE = "T"
     }
 }

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.kt

@@ -46,8 +46,7 @@ import java.util.concurrent.TimeUnit
 class CreateRemoteFolderOperation(
     val remotePath: String,
     private val createFullPath: Boolean,
-    private val isChunksFolder: Boolean = false,
-    val spaceWebDavUrl: String? = null,
+    private val isChunksFolder: Boolean = false
 ) : RemoteOperation<Unit>() {
 
     override fun run(client: OwnCloudClient): RemoteOperationResult<Unit> {
@@ -68,13 +67,13 @@ class CreateRemoteFolderOperation(
         var result: RemoteOperationResult<Unit>
         try {
             val webDavUri = if (isChunksFolder) {
-                client.uploadsWebDavUri.toString()
+                client.uploadsWebDavUri
             } else {
-                spaceWebDavUrl ?: client.userFilesWebDavUri.toString()
+                client.userFilesWebDavUri
             }
 
             val mkCol = MkColMethod(
-                URL(webDavUri + WebdavUtils.encodePath(remotePath))
+                URL(webDavUri.toString() + WebdavUtils.encodePath(remotePath))
             ).apply {
                 setReadTimeout(READ_TIMEOUT, TimeUnit.SECONDS)
                 setConnectionTimeout(CONNECTION_TIMEOUT, TimeUnit.SECONDS)

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.kt

@@ -36,6 +36,7 @@ import java.io.BufferedInputStream
 import java.io.File
 import java.io.FileOutputStream
 import java.net.URL
+import java.util.HashSet
 import java.util.concurrent.atomic.AtomicBoolean
 
 /**
@@ -46,8 +47,7 @@ import java.util.concurrent.atomic.AtomicBoolean
  */
 class DownloadRemoteFileOperation(
     private val remotePath: String,
-    localFolderPath: String,
-    private val spaceWebDavUrl: String? = null,
+    localFolderPath: String
 ) : RemoteOperation<Unit>() {
 
     private val cancellationRequested = AtomicBoolean(false)
@@ -84,8 +84,7 @@ class DownloadRemoteFileOperation(
         var bis: BufferedInputStream? = null
         var savedFile = false
 
-        val webDavUri = spaceWebDavUrl ?: client.userFilesWebDavUri.toString()
-        val getMethod = GetMethod(URL(webDavUri + WebdavUtils.encodePath(remotePath)))
+        val getMethod = GetMethod(URL(client.userFilesWebDavUri.toString() + WebdavUtils.encodePath(remotePath)))
 
         try {
             val status = client.executeHttpMethod(getMethod)

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/GetBaseUrlRemoteOperation.kt

@@ -44,7 +44,7 @@ class GetBaseUrlRemoteOperation : RemoteOperation<String?>() {
         return try {
             val stringUrl = client.baseFilesWebDavUri.toString()
 
-            val propFindMethod = PropfindMethod(URL(stringUrl), 0, DavUtils.allPropSet).apply {
+            val propFindMethod = PropfindMethod(URL(stringUrl), 0, DavUtils.allPropset).apply {
                 setReadTimeout(TIMEOUT, TimeUnit.SECONDS)
                 setConnectionTimeout(TIMEOUT, TimeUnit.SECONDS)
             }

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/GetUrlToOpenInWebRemoteOperation.kt

@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
-*   Copyright (C) 2023 ownCloud GmbH.
+*   Copyright (C) 2022 ownCloud GmbH.
 *
 *   Permission is hereby granted, free of charge, to any person obtaining a copy
 *   of this software and associated documentation files (the "Software"), to deal
@@ -21,8 +21,7 @@
 *   THE SOFTWARE.
 *
 */
-
-package com.owncloud.android.lib.resources.appregistry
+package com.owncloud.android.lib.resources.files
 
 import com.owncloud.android.lib.common.OwnCloudClient
 import com.owncloud.android.lib.common.http.HttpConstants
@@ -31,6 +30,7 @@ import com.owncloud.android.lib.common.network.WebdavUtils
 import com.owncloud.android.lib.common.operations.RemoteOperation
 import com.owncloud.android.lib.common.operations.RemoteOperationResult
 import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode
+import com.owncloud.android.lib.resources.files.GetUrlToOpenInWebRemoteOperation.OpenInWebParams.Companion.PARAM_FILE_ID
 import com.squareup.moshi.JsonAdapter
 import com.squareup.moshi.JsonClass
 import com.squareup.moshi.Moshi
@@ -41,18 +41,16 @@ import java.net.URL
 import java.util.concurrent.TimeUnit
 
 class GetUrlToOpenInWebRemoteOperation(
-    private val openWithWebEndpoint: String,
-    private val fileId: String,
-    private val appName: String,
+    val openWithWebEndpoint: String,
+    val fileId: String,
 ) : RemoteOperation<String>() {
 
     override fun run(client: OwnCloudClient): RemoteOperationResult<String> {
         return try {
 
-            val openInWebRequestBody = OpenInWebParams(fileId, appName).toRequestBody()
+            val openInWebRequestBody = OpenInWebParams(fileId).toRequestBody()
 
-            val stringUrl =
-                client.baseUri.toString() + WebdavUtils.encodePath(openWithWebEndpoint)
+            val stringUrl = client.baseUri.toString() + WebdavUtils.encodePath(openWithWebEndpoint) + "?$PARAM_FILE_ID=$fileId"
 
             val postMethod = PostMethod(URL(stringUrl), openInWebRequestBody).apply {
                 setReadTimeout(TIMEOUT, TimeUnit.MILLISECONDS)
@@ -77,21 +75,14 @@ class GetUrlToOpenInWebRemoteOperation(
         }
     }
 
-    private fun isSuccess(status: Int) = status == HttpConstants.HTTP_OK
+    private fun isSuccess(status: Int) = status == HttpConstants.HTTP_OK || status == HttpConstants.HTTP_MULTI_STATUS
 
-    data class OpenInWebParams(
-        val fileId: String,
-        val appName: String,
-    ) {
+    data class OpenInWebParams(val fileId: String) {
         fun toRequestBody(): RequestBody =
-            FormBody.Builder()
-                .add(PARAM_FILE_ID, fileId)
-                .add(PARAM_APP_NAME, appName)
-                .build()
+            FormBody.Builder().build()
 
         companion object {
             const val PARAM_FILE_ID = "file_id"
-            const val PARAM_APP_NAME = "app_name"
         }
     }
 

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.kt

@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2023 ownCloud GmbH.
+ *   Copyright (C) 2021 ownCloud GmbH.
  *
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -38,24 +38,17 @@ import java.util.concurrent.TimeUnit
 
 /**
  * Remote operation moving a remote file or folder in the ownCloud server to a different folder
- * in the same account and space.
+ * in the same account.
  *
  * Allows renaming the moving file/folder at the same time.
  *
  * @author David A. Velasco
  * @author David González Verdugo
  * @author Abel García de Prada
- * @author Juan Carlos Garrote Gascón
- * @author Manuel Plazas Palacio
- *
- * @param sourceRemotePath  Remote path of the file/folder to copy.
- * @param targetRemotePath  Remote path desired for the file/folder to copy it.
  */
 open class MoveRemoteFileOperation(
     private val sourceRemotePath: String,
     private val targetRemotePath: String,
-    private val spaceWebDavUrl: String? = null,
-    private val forceOverride: Boolean = false,
 ) : RemoteOperation<Unit>() {
 
     /**
@@ -80,9 +73,8 @@ open class MoveRemoteFileOperation(
             // so this uri has to be customizable
             val srcWebDavUri = getSrcWebDavUriForClient(client)
             val moveMethod = MoveMethod(
-                url = URL((spaceWebDavUrl ?: srcWebDavUri.toString()) + WebdavUtils.encodePath(sourceRemotePath)),
-                destinationUrl = (spaceWebDavUrl ?: client.userFilesWebDavUri.toString()) + WebdavUtils.encodePath(targetRemotePath),
-                forceOverride = forceOverride,
+                url = URL(srcWebDavUri.toString() + WebdavUtils.encodePath(sourceRemotePath)),
+                destinationUrl = client.userFilesWebDavUri.toString() + WebdavUtils.encodePath(targetRemotePath),
             ).apply {
                 addRequestHeaders(this)
                 setReadTimeout(MOVE_READ_TIMEOUT, TimeUnit.SECONDS)
@@ -95,7 +87,6 @@ open class MoveRemoteFileOperation(
                 isSuccess(status) -> {
                     result = RemoteOperationResult<Unit>(ResultCode.OK)
                 }
-
                 isPreconditionFailed(status) -> {
                     result = RemoteOperationResult<Unit>(ResultCode.INVALID_OVERWRITE)
                     client.exhaustResponse(moveMethod.getResponseBodyAsStream())
@@ -103,7 +94,6 @@ open class MoveRemoteFileOperation(
                     /// for other errors that could be explicitly handled, check first:
                     /// http://www.webdav.org/specs/rfc4918.html#rfc.section.9.9.4
                 }
-
                 else -> {
                     result = RemoteOperationResult<Unit>(moveMethod)
                     client.exhaustResponse(moveMethod.getResponseBodyAsStream())
@@ -130,10 +120,6 @@ open class MoveRemoteFileOperation(
      * In case new headers are needed, override this method
      */
     open fun addRequestHeaders(moveMethod: MoveMethod) {
-        //Adding this because the library has an error with override
-        if (moveMethod.forceOverride) {
-            moveMethod.setRequestHeader(OVERWRITE, TRUE)
-        }
     }
 
     private fun isSuccess(status: Int) = status.isOneOf(HttpConstants.HTTP_CREATED, HttpConstants.HTTP_NO_CONTENT)
@@ -143,7 +129,5 @@ open class MoveRemoteFileOperation(
     companion object {
         private const val MOVE_READ_TIMEOUT = 10L
         private const val MOVE_CONNECTION_TIMEOUT = 6L
-        private const val OVERWRITE = "overwrite"
-        private const val TRUE = "T"
     }
 }

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.kt

@@ -46,10 +46,7 @@ import java.util.concurrent.TimeUnit
  * @author David González Verdugo
  */
 
-class ReadRemoteFileOperation(
-    val remotePath: String,
-    val spaceWebDavUrl: String? = null,
-) : RemoteOperation<RemoteFile>() {
+class ReadRemoteFileOperation(val remotePath: String) : RemoteOperation<RemoteFile>() {
 
     /**
      * Performs the read operation.
@@ -60,9 +57,9 @@ class ReadRemoteFileOperation(
     override fun run(client: OwnCloudClient): RemoteOperationResult<RemoteFile> {
         try {
             val propFind = PropfindMethod(
-                url = getFinalWebDavUrl(),
+                url = URL("${client.userFilesWebDavUri}${WebdavUtils.encodePath(remotePath)}"),
                 depth = DEPTH_0,
-                propertiesToRequest = DavUtils.allPropSet
+                propertiesToRequest = DavUtils.allPropset
             ).apply {
                 setReadTimeout(SYNC_READ_TIMEOUT, TimeUnit.SECONDS)
                 setConnectionTimeout(SYNC_CONNECTION_TIMEOUT, TimeUnit.SECONDS)
@@ -72,11 +69,10 @@ class ReadRemoteFileOperation(
             Timber.i("Read remote file $remotePath with status ${propFind.statusCode}")
 
             return if (isSuccess(status)) {
+                // TODO: Remove that !!
                 val remoteFile = RemoteFile.getRemoteFileFromDav(
-                    davResource = propFind.root!!,
-                    userId = AccountUtils.getUserId(mAccount, mContext),
-                    userName = mAccount.name,
-                    spaceWebDavUrl = spaceWebDavUrl,
+                    propFind.root!!,
+                    AccountUtils.getUserId(mAccount, mContext), mAccount.name
                 )
 
                 RemoteOperationResult<RemoteFile>(RemoteOperationResult.ResultCode.OK).apply {
@@ -92,12 +88,6 @@ class ReadRemoteFileOperation(
         }
     }
 
-    private fun getFinalWebDavUrl(): URL {
-        val baseWebDavUrl = spaceWebDavUrl ?: client.userFilesWebDavUri.toString()
-
-        return URL(baseWebDavUrl + WebdavUtils.encodePath(remotePath))
-    }
-
     private fun isSuccess(status: Int) = status.isOneOf(HTTP_MULTI_STATUS, HTTP_OK)
 
     companion object {

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.kt

@@ -48,8 +48,7 @@ import java.net.URL
  * @author David González Verdugo
  */
 class ReadRemoteFolderOperation(
-    val remotePath: String,
-    val spaceWebDavUrl: String? = null,
+    val remotePath: String
 ) : RemoteOperation<ArrayList<RemoteFile>>() {
 
     /**
@@ -62,9 +61,9 @@ class ReadRemoteFolderOperation(
             PropertyRegistry.register(OCShareTypes.Factory())
 
             val propfindMethod = PropfindMethod(
-                getFinalWebDavUrl(),
+                URL(client.userFilesWebDavUri.toString() + WebdavUtils.encodePath(remotePath)),
                 DavConstants.DEPTH_1,
-                DavUtils.allPropSet
+                DavUtils.allPropset
             )
 
             val status = client.executeHttpMethod(propfindMethod)
@@ -72,11 +71,12 @@ class ReadRemoteFolderOperation(
             if (isSuccess(status)) {
                 val mFolderAndFiles = ArrayList<RemoteFile>()
 
+                // parse data from remote folder
+                // TODO: Remove that !!
                 val remoteFolder = RemoteFile.getRemoteFileFromDav(
                     davResource = propfindMethod.root!!,
                     userId = AccountUtils.getUserId(mAccount, mContext),
-                    userName = mAccount.name,
-                    spaceWebDavUrl = spaceWebDavUrl,
+                    userName = mAccount.name
                 )
                 mFolderAndFiles.add(remoteFolder)
 
@@ -85,8 +85,7 @@ class ReadRemoteFolderOperation(
                     val remoteFile = RemoteFile.getRemoteFileFromDav(
                         davResource = resource,
                         userId = AccountUtils.getUserId(mAccount, mContext),
-                        userName = mAccount.name,
-                        spaceWebDavUrl = spaceWebDavUrl,
+                        userName = mAccount.name
                     )
                     mFolderAndFiles.add(remoteFile)
                 }
@@ -108,11 +107,5 @@ class ReadRemoteFolderOperation(
         }
     }
 
-    private fun getFinalWebDavUrl(): URL {
-        val baseWebDavUrl = spaceWebDavUrl ?: client.userFilesWebDavUri.toString()
-
-        return URL(baseWebDavUrl + WebdavUtils.encodePath(remotePath))
-    }
-
     private fun isSuccess(status: Int): Boolean = status.isOneOf(HTTP_OK, HTTP_MULTI_STATUS)
 }

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/RemoteFile.kt

@@ -26,7 +26,6 @@ package com.owncloud.android.lib.resources.files
 
 import android.net.Uri
 import android.os.Parcelable
-import androidx.annotation.VisibleForTesting
 import at.bitfire.dav4jvm.PropStat
 import at.bitfire.dav4jvm.Property
 import at.bitfire.dav4jvm.Response
@@ -39,6 +38,8 @@ import at.bitfire.dav4jvm.property.OCId
 import at.bitfire.dav4jvm.property.OCPermissions
 import at.bitfire.dav4jvm.property.OCPrivatelink
 import at.bitfire.dav4jvm.property.OCSize
+import at.bitfire.dav4jvm.property.QuotaAvailableBytes
+import at.bitfire.dav4jvm.property.QuotaUsedBytes
 import com.owncloud.android.lib.common.OwnCloudClient
 import com.owncloud.android.lib.common.http.HttpConstants
 import com.owncloud.android.lib.common.http.methods.webdav.properties.OCShareTypes
@@ -49,6 +50,7 @@ import kotlinx.parcelize.Parcelize
 import okhttp3.HttpUrl
 import timber.log.Timber
 import java.io.File
+import java.math.BigDecimal
 
 /**
  * Contains the data of a Remote File from a WebDavEntry
@@ -70,6 +72,8 @@ data class RemoteFile(
     var permissions: String? = null,
     var remoteId: String? = null,
     var size: Long = 0,
+    var quotaUsedBytes: BigDecimal? = null,
+    var quotaAvailableBytes: BigDecimal? = null,
     var privateLink: String? = null,
     var owner: String,
     var sharedByLink: Boolean = false,
@@ -96,13 +100,8 @@ data class RemoteFile(
         const val MIME_DIR = "DIR"
         const val MIME_DIR_UNIX = "httpd/unix-directory"
 
-        fun getRemoteFileFromDav(
-            davResource: Response,
-            userId: String,
-            userName: String,
-            spaceWebDavUrl: String? = null
-        ): RemoteFile {
-            val remotePath = getRemotePathFromUrl(davResource.href, userId, spaceWebDavUrl)
+        fun getRemoteFileFromDav(davResource: Response, userId: String, userName: String): RemoteFile {
+            val remotePath = getRemotePathFromUrl(davResource.href, userId)
             val remoteFile = RemoteFile(remotePath = remotePath, owner = userName)
             val properties = getPropertiesEvenIfPostProcessing(davResource)
 
@@ -132,6 +131,12 @@ data class RemoteFile(
                     is OCSize -> {
                         remoteFile.size = property.size
                     }
+                    is QuotaUsedBytes -> {
+                        remoteFile.quotaUsedBytes = BigDecimal.valueOf(property.quotaUsedBytes)
+                    }
+                    is QuotaAvailableBytes -> {
+                        remoteFile.quotaAvailableBytes = BigDecimal.valueOf(property.quotaAvailableBytes)
+                    }
                     is OCPrivatelink -> {
                         remoteFile.privateLink = property.link
                     }
@@ -159,25 +164,15 @@ data class RemoteFile(
          * Retrieves a relative path from a remote file url
          *
          *
-         * Example legacy:
-         * /remote.php/dav/files/username/Documents/text.txt => /Documents/text.txt
-         *
-         * Example spaces:
-         * /dav/spaces/8871f4f3-fc6f-4a66-8bed-62f175f76f38$05bca744-d89f-4e9c-a990-25a0d7f03fe9/Documents/text.txt => /Documents/text.txt
+         * Example: url:port/remote.php/dav/files/username/Documents/text.txt => /Documents/text.txt
          *
          * @param url    remote file url
          * @param userId file owner
-         * @param spaceWebDavUrl custom web dav url for space
          * @return remote relative path of the file
          */
-        @VisibleForTesting
-        fun getRemotePathFromUrl(
-            url: HttpUrl,
-            userId: String,
-            spaceWebDavUrl: String? = null,
-        ): String {
-            val davFilesPath = spaceWebDavUrl ?: (OwnCloudClient.WEBDAV_FILES_PATH_4_0 + userId)
-            val absoluteDavPath = if (spaceWebDavUrl != null) Uri.decode(url.toString()) else Uri.decode(url.encodedPath)
+        private fun getRemotePathFromUrl(url: HttpUrl, userId: String): String {
+            val davFilesPath = OwnCloudClient.WEBDAV_FILES_PATH_4_0 + userId
+            val absoluteDavPath = Uri.decode(url.encodedPath)
             val pathToOc = absoluteDavPath.split(davFilesPath).first()
             return absoluteDavPath.replace(pathToOc + davFilesPath, "")
         }

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/RemoveRemoteFileOperation.kt

@@ -24,6 +24,7 @@
 
 package com.owncloud.android.lib.resources.files
 
+import android.net.Uri
 import com.owncloud.android.lib.common.OwnCloudClient
 import com.owncloud.android.lib.common.http.HttpConstants.HTTP_NO_CONTENT
 import com.owncloud.android.lib.common.http.HttpConstants.HTTP_OK
@@ -45,8 +46,7 @@ import java.net.URL
  * @author Abel García de Prada
  */
 open class RemoveRemoteFileOperation(
-    private val remotePath: String,
-    val spaceWebDavUrl: String? = null,
+    private val remotePath: String
 ) : RemoteOperation<Unit>() {
 
     override fun run(client: OwnCloudClient): RemoteOperationResult<Unit> {
@@ -54,7 +54,7 @@ open class RemoveRemoteFileOperation(
         try {
             val srcWebDavUri = getSrcWebDavUriForClient(client)
             val deleteMethod = DeleteMethod(
-                URL(srcWebDavUri + WebdavUtils.encodePath(remotePath))
+                URL(srcWebDavUri.toString() + WebdavUtils.encodePath(remotePath))
             )
             val status = client.executeHttpMethod(deleteMethod)
 
@@ -75,7 +75,7 @@ open class RemoveRemoteFileOperation(
      * For standard removals, we will use [OwnCloudClient.getUserFilesWebDavUri].
      * In case we need a different source Uri, override this method.
      */
-    open fun getSrcWebDavUriForClient(client: OwnCloudClient): String = spaceWebDavUrl ?: client.userFilesWebDavUri.toString()
+    open fun getSrcWebDavUriForClient(client: OwnCloudClient): Uri = client.userFilesWebDavUri
 
     private fun isSuccess(status: Int) = status.isOneOf(HTTP_OK, HTTP_NO_CONTENT)
 }

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.kt

@@ -48,7 +48,6 @@ class RenameRemoteFileOperation(
     private val oldRemotePath: String,
     private val newName: String,
     isFolder: Boolean,
-    val spaceWebDavUrl: String? = null,
 ) : RemoteOperation<Unit>() {
 
     private var newRemotePath: String
@@ -76,8 +75,8 @@ class RenameRemoteFileOperation(
             }
 
             val moveMethod: MoveMethod = MoveMethod(
-                url = URL((spaceWebDavUrl ?: client.userFilesWebDavUri.toString()) + WebdavUtils.encodePath(oldRemotePath)),
-                destinationUrl = (spaceWebDavUrl ?: client.userFilesWebDavUri.toString()) + WebdavUtils.encodePath(newRemotePath),
+                url = URL(client.userFilesWebDavUri.toString() + WebdavUtils.encodePath(oldRemotePath)),
+                destinationUrl = client.userFilesWebDavUri.toString() + WebdavUtils.encodePath(newRemotePath),
             ).apply {
                 setReadTimeout(RENAME_READ_TIMEOUT, TimeUnit.MILLISECONDS)
                 setConnectionTimeout(RENAME_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
@@ -106,7 +105,7 @@ class RenameRemoteFileOperation(
      * @return 'True' if the target path is already used by an existing file.
      */
     private fun targetPathIsUsed(client: OwnCloudClient): Boolean {
-        val checkPathExistenceRemoteOperation = CheckPathExistenceRemoteOperation(newRemotePath, true)
+        val checkPathExistenceRemoteOperation = CheckPathExistenceRemoteOperation(newRemotePath, false)
         val exists = checkPathExistenceRemoteOperation.execute(client)
         return exists.isSuccess
     }

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/UploadFileFromFileSystemOperation.kt

@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2023 ownCloud GmbH.
+ *   Copyright (C) 2022 ownCloud GmbH.
  *
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -48,7 +48,6 @@ import java.util.concurrent.atomic.AtomicBoolean
  * @author masensio
  * @author David González Verdugo
  * @author Abel García de Prada
- * @author Juan Carlos Garrote Gascón
  */
 open class UploadFileFromFileSystemOperation(
     val localPath: String,
@@ -56,7 +55,6 @@ open class UploadFileFromFileSystemOperation(
     val mimeType: String,
     val lastModifiedTimestamp: String,
     val requiredEtag: String?,
-    val spaceWebDavUrl: String? = null,
 ) : RemoteOperation<Unit>() {
 
     protected val cancellationRequested = AtomicBoolean(false)
@@ -99,8 +97,7 @@ open class UploadFileFromFileSystemOperation(
             synchronized(dataTransferListener) { it.addDatatransferProgressListeners(dataTransferListener) }
         }
 
-        val baseStringUrl = spaceWebDavUrl ?: client.userFilesWebDavUri.toString()
-        putMethod = PutMethod(URL(baseStringUrl + WebdavUtils.encodePath(remotePath)), fileRequestBody!!).apply {
+        putMethod = PutMethod(URL(client.userFilesWebDavUri.toString() + WebdavUtils.encodePath(remotePath)), fileRequestBody!!).apply {
             retryOnConnectionFailure = false
             if (!requiredEtag.isNullOrBlank()) {
                 addRequestHeader(HttpConstants.IF_MATCH_HEADER, requiredEtag)

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/chunks/RemoveRemoteChunksFolderOperation.kt

@@ -24,9 +24,10 @@
  */
 package com.owncloud.android.lib.resources.files.chunks
 
+import android.net.Uri
 import com.owncloud.android.lib.common.OwnCloudClient
 import com.owncloud.android.lib.resources.files.RemoveRemoteFileOperation
 
 class RemoveRemoteChunksFolderOperation(remotePath: String) : RemoveRemoteFileOperation(remotePath) {
-    override fun getSrcWebDavUriForClient(client: OwnCloudClient): String = client.uploadsWebDavUri.toString()
+    override fun getSrcWebDavUriForClient(client: OwnCloudClient): Uri = client.uploadsWebDavUri
 }

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/services/FileService.kt

@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2023 ownCloud GmbH.
+ *   Copyright (C) 2020 ownCloud GmbH.
  *
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -28,25 +28,22 @@ import com.owncloud.android.lib.resources.Service
 import com.owncloud.android.lib.resources.files.RemoteFile
 
 interface FileService : Service {
+    fun getUrlToOpenInWeb(openWebEndpoint: String, fileId: String): RemoteOperationResult<String>
+
     fun checkPathExistence(
         path: String,
-        isUserLogged: Boolean,
-        spaceWebDavUrl: String? = null,
+        isUserLogged: Boolean
     ): RemoteOperationResult<Boolean>
 
     fun copyFile(
         sourceRemotePath: String,
         targetRemotePath: String,
-        sourceSpaceWebDavUrl: String?,
-        targetSpaceWebDavUrl: String?,
-        replace: Boolean,
-    ): RemoteOperationResult<String?>
+    ): RemoteOperationResult<String>
 
     fun createFolder(
         remotePath: String,
         createFullPath: Boolean,
-        isChunkFolder: Boolean = false,
-        spaceWebDavUrl: String? = null,
+        isChunkFolder: Boolean = false
     ): RemoteOperationResult<Unit>
 
     fun downloadFile(
@@ -57,23 +54,18 @@ interface FileService : Service {
     fun moveFile(
         sourceRemotePath: String,
         targetRemotePath: String,
-        spaceWebDavUrl: String?,
-        replace: Boolean,
     ): RemoteOperationResult<Unit>
 
     fun readFile(
-        remotePath: String,
-        spaceWebDavUrl: String? = null,
+        remotePath: String
     ): RemoteOperationResult<RemoteFile>
 
     fun refreshFolder(
-        remotePath: String,
-        spaceWebDavUrl: String? = null,
+        remotePath: String
     ): RemoteOperationResult<ArrayList<RemoteFile>>
 
     fun removeFile(
-        remotePath: String,
-        spaceWebDavUrl: String? = null,
+        remotePath: String
     ): RemoteOperationResult<Unit>
 
     fun renameFile(
@@ -81,6 +73,5 @@ interface FileService : Service {
         oldRemotePath: String,
         newName: String,
         isFolder: Boolean,
-        spaceWebDavUrl: String? = null,
     ): RemoteOperationResult<Unit>
 }

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/services/implementation/OCFileService.kt

@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2023 ownCloud GmbH.
+ *   Copyright (C) 2022 ownCloud GmbH.
  *
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -29,6 +29,7 @@ import com.owncloud.android.lib.resources.files.CheckPathExistenceRemoteOperatio
 import com.owncloud.android.lib.resources.files.CopyRemoteFileOperation
 import com.owncloud.android.lib.resources.files.CreateRemoteFolderOperation
 import com.owncloud.android.lib.resources.files.DownloadRemoteFileOperation
+import com.owncloud.android.lib.resources.files.GetUrlToOpenInWebRemoteOperation
 import com.owncloud.android.lib.resources.files.MoveRemoteFileOperation
 import com.owncloud.android.lib.resources.files.ReadRemoteFileOperation
 import com.owncloud.android.lib.resources.files.ReadRemoteFolderOperation
@@ -38,43 +39,37 @@ import com.owncloud.android.lib.resources.files.RenameRemoteFileOperation
 import com.owncloud.android.lib.resources.files.services.FileService
 
 class OCFileService(override val client: OwnCloudClient) : FileService {
+
     override fun checkPathExistence(
         path: String,
-        isUserLogged: Boolean,
-        spaceWebDavUrl: String?,
+        isUserLogged: Boolean
     ): RemoteOperationResult<Boolean> =
         CheckPathExistenceRemoteOperation(
             remotePath = path,
-            isUserLoggedIn = isUserLogged,
-            spaceWebDavUrl = spaceWebDavUrl,
+            isUserLoggedIn = isUserLogged
         ).execute(client)
 
+    override fun getUrlToOpenInWeb(openWebEndpoint: String, fileId: String): RemoteOperationResult<String> =
+        GetUrlToOpenInWebRemoteOperation(openWithWebEndpoint = openWebEndpoint, fileId = fileId).execute(client)
+
     override fun copyFile(
         sourceRemotePath: String,
-        targetRemotePath: String,
-        sourceSpaceWebDavUrl: String?,
-        targetSpaceWebDavUrl: String?,
-        replace: Boolean,
-    ): RemoteOperationResult<String?> =
+        targetRemotePath: String
+    ): RemoteOperationResult<String> =
         CopyRemoteFileOperation(
-            sourceRemotePath = sourceRemotePath,
-            targetRemotePath = targetRemotePath,
-            sourceSpaceWebDavUrl = sourceSpaceWebDavUrl,
-            targetSpaceWebDavUrl = targetSpaceWebDavUrl,
-            forceOverride = replace,
+            srcRemotePath = sourceRemotePath,
+            targetRemotePath = targetRemotePath
         ).execute(client)
 
     override fun createFolder(
         remotePath: String,
         createFullPath: Boolean,
-        isChunkFolder: Boolean,
-        spaceWebDavUrl: String?,
+        isChunkFolder: Boolean
     ): RemoteOperationResult<Unit> =
         CreateRemoteFolderOperation(
             remotePath = remotePath,
             createFullPath = createFullPath,
-            isChunksFolder = isChunkFolder,
-            spaceWebDavUrl = spaceWebDavUrl,
+            isChunksFolder = isChunkFolder
         ).execute(client)
 
     override fun downloadFile(
@@ -89,55 +84,43 @@ class OCFileService(override val client: OwnCloudClient) : FileService {
     override fun moveFile(
         sourceRemotePath: String,
         targetRemotePath: String,
-        spaceWebDavUrl: String?,
-        replace: Boolean,
     ): RemoteOperationResult<Unit> =
         MoveRemoteFileOperation(
             sourceRemotePath = sourceRemotePath,
             targetRemotePath = targetRemotePath,
-            spaceWebDavUrl = spaceWebDavUrl,
-            forceOverride = replace,
         ).execute(client)
 
     override fun readFile(
-        remotePath: String,
-        spaceWebDavUrl: String?,
+        remotePath: String
     ): RemoteOperationResult<RemoteFile> =
         ReadRemoteFileOperation(
-            remotePath = remotePath,
-            spaceWebDavUrl = spaceWebDavUrl,
+            remotePath = remotePath
         ).execute(client)
 
     override fun refreshFolder(
-        remotePath: String,
-        spaceWebDavUrl: String?,
+        remotePath: String
     ): RemoteOperationResult<ArrayList<RemoteFile>> =
         ReadRemoteFolderOperation(
-            remotePath = remotePath,
-            spaceWebDavUrl = spaceWebDavUrl,
+            remotePath = remotePath
         ).execute(client)
 
     override fun removeFile(
-        remotePath: String,
-        spaceWebDavUrl: String?,
+        remotePath: String
     ): RemoteOperationResult<Unit> =
         RemoveRemoteFileOperation(
-            remotePath = remotePath,
-            spaceWebDavUrl = spaceWebDavUrl,
+            remotePath = remotePath
         ).execute(client)
 
     override fun renameFile(
         oldName: String,
         oldRemotePath: String,
         newName: String,
-        isFolder: Boolean,
-        spaceWebDavUrl: String?,
+        isFolder: Boolean
     ): RemoteOperationResult<Unit> =
         RenameRemoteFileOperation(
             oldName = oldName,
             oldRemotePath = oldRemotePath,
             newName = newName,
-            isFolder = isFolder,
-            spaceWebDavUrl = spaceWebDavUrl,
+            isFolder = isFolder
         ).execute(client)
 }

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.kt

@@ -89,6 +89,8 @@ class CreateRemoteShareOperation(
 
     var expirationDateInMillis: Long = INIT_EXPIRATION_DATE_IN_MILLIS // Expiration date to set for the public link
 
+    var publicUpload: Boolean = false // Upload permissions for the public link (only folders)
+
     var retrieveShareDetails = false // To retrieve more info about the just created share
 
     private fun buildRequestUri(baseUri: Uri) =
@@ -97,7 +99,7 @@ class CreateRemoteShareOperation(
             .appendQueryParameter(PARAM_FORMAT, VALUE_FORMAT)
             .build()
 
-    private fun parseResponse(response: String): ShareResponse {
+    private fun parseResponse(response: String): ShareResponse? {
         val moshi = Moshi.Builder().build()
         val commonOcsType: Type = Types.newParameterizedType(CommonOcsResponse::class.java, ShareItem::class.java)
         val adapter: JsonAdapter<CommonOcsResponse<ShareItem>> = moshi.adapter(commonOcsType)
@@ -153,10 +155,12 @@ class CreateRemoteShareOperation(
             formBodyBuilder.add(PARAM_EXPIRATION_DATE, formattedExpirationDate)
         }
 
+        if (publicUpload) {
+            formBodyBuilder.add(PARAM_PUBLIC_UPLOAD, publicUpload.toString())
+        }
         if (password.isNotEmpty()) {
             formBodyBuilder.add(PARAM_PASSWORD, password)
         }
-
         if (RemoteShare.DEFAULT_PERMISSION != permissions) {
             formBodyBuilder.add(PARAM_PERMISSIONS, permissions.toString())
         }
@@ -203,6 +207,7 @@ class CreateRemoteShareOperation(
         private const val PARAM_SHARE_TYPE = "shareType"
         private const val PARAM_SHARE_WITH = "shareWith"
         private const val PARAM_PASSWORD = "password"
+        private const val PARAM_PUBLIC_UPLOAD = "publicUpload"
         private const val PARAM_PERMISSIONS = "permissions"
 
         //Arguments - constant values

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.kt

@@ -103,6 +103,13 @@ class UpdateRemoteShareOperation
      */
     var permissions: Int = DEFAULT_PERMISSION
 
+    /**
+     * Enable upload permissions to update in Share resource.
+     *
+     * Null results in no update applied to the upload permission.
+     */
+    var publicUpload: Boolean? = null
+
     var retrieveShareDetails = false // To retrieve more info about the just updated share
 
     private fun buildRequestUri(baseUri: Uri) =
@@ -112,7 +119,7 @@ class UpdateRemoteShareOperation
             .appendQueryParameter(PARAM_FORMAT, VALUE_FORMAT)
             .build()
 
-    private fun parseResponse(response: String): ShareResponse {
+    private fun parseResponse(response: String): ShareResponse? {
         val moshi = Moshi.Builder().build()
         val commonOcsType: Type = Types.newParameterizedType(CommonOcsResponse::class.java, ShareItem::class.java)
         val adapter: JsonAdapter<CommonOcsResponse<ShareItem>> = moshi.adapter(commonOcsType)
@@ -174,6 +181,10 @@ class UpdateRemoteShareOperation
             formBodyBuilder.add(PARAM_EXPIRATION_DATE, formattedExpirationDate)
         } // else, ignore - no update
 
+        if (publicUpload != null) {
+            formBodyBuilder.add(PARAM_PUBLIC_UPLOAD, publicUpload.toString())
+        }
+
         // IMPORTANT: permissions parameter needs to be updated after mPublicUpload parameter,
         // otherwise they would be set always as 1 (READ) in the server when mPublicUpload was updated
         if (permissions > DEFAULT_PERMISSION) {
@@ -222,6 +233,7 @@ class UpdateRemoteShareOperation
         private const val PARAM_PASSWORD = "password"
         private const val PARAM_EXPIRATION_DATE = "expireDate"
         private const val PARAM_PERMISSIONS = "permissions"
+        private const val PARAM_PUBLIC_UPLOAD = "publicUpload"
 
         //Arguments - constant values
         private const val FORMAT_EXPIRATION_DATE = "yyyy-MM-dd"

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/services/ShareService.kt

@@ -46,6 +46,7 @@ interface ShareService : Service {
         name: String,
         password: String,
         expirationDate: Long,
+        publicUpload: Boolean
     ): RemoteOperationResult<ShareResponse>
 
     fun updateShare(
@@ -54,6 +55,7 @@ interface ShareService : Service {
         password: String?,
         expirationDate: Long,
         permissions: Int,
+        publicUpload: Boolean
     ): RemoteOperationResult<ShareResponse>
 
     fun deleteShare(remoteId: String): RemoteOperationResult<Unit>

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/services/implementation/OCShareService.kt

@@ -55,6 +55,7 @@ class OCShareService(override val client: OwnCloudClient) : ShareService {
         name: String,
         password: String,
         expirationDate: Long,
+        publicUpload: Boolean
     ): RemoteOperationResult<ShareResponse> =
         CreateRemoteShareOperation(
             remoteFilePath,
@@ -65,6 +66,7 @@ class OCShareService(override val client: OwnCloudClient) : ShareService {
             this.name = name
             this.password = password
             this.expirationDateInMillis = expirationDate
+            this.publicUpload = publicUpload
             this.retrieveShareDetails = true
         }.execute(client)
 
@@ -74,6 +76,7 @@ class OCShareService(override val client: OwnCloudClient) : ShareService {
         password: String?,
         expirationDate: Long,
         permissions: Int,
+        publicUpload: Boolean
     ): RemoteOperationResult<ShareResponse> =
         UpdateRemoteShareOperation(
             remoteId
@@ -82,6 +85,7 @@ class OCShareService(override val client: OwnCloudClient) : ShareService {
             this.password = password
             this.expirationDateInMillis = expirationDate
             this.permissions = permissions
+            this.publicUpload = publicUpload
             this.retrieveShareDetails = true
         }.execute(client)
 

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/spaces/GetRemoteSpacesOperation.kt

@@ -1,99 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2022 ownCloud GmbH.
- *
- *   Permission is hereby granted, free of charge, to any person obtaining a copy
- *   of this software and associated documentation files (the "Software"), to deal
- *   in the Software without restriction, including without limitation the rights
- *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *   copies of the Software, and to permit persons to whom the Software is
- *   furnished to do so, subject to the following conditions:
- *
- *   The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- *
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *   THE SOFTWARE.
- */
-package com.owncloud.android.lib.resources.spaces
-
-import android.net.Uri
-import com.owncloud.android.lib.common.OwnCloudClient
-import com.owncloud.android.lib.common.http.HttpConstants
-import com.owncloud.android.lib.common.http.methods.nonwebdav.GetMethod
-import com.owncloud.android.lib.common.operations.RemoteOperation
-import com.owncloud.android.lib.common.operations.RemoteOperationResult
-import com.owncloud.android.lib.resources.spaces.responses.SpaceResponse
-import com.owncloud.android.lib.resources.spaces.responses.SpacesResponseWrapper
-import com.squareup.moshi.JsonAdapter
-import com.squareup.moshi.Moshi
-import timber.log.Timber
-import java.net.URL
-
-class GetRemoteSpacesOperation : RemoteOperation<List<SpaceResponse>>() {
-    override fun run(client: OwnCloudClient): RemoteOperationResult<List<SpaceResponse>> {
-        val requestUri = buildRequestUri(client.baseUri)
-
-        val getMethod = GetMethod(URL(requestUri.toString()))
-
-        return try {
-            val status = client.executeHttpMethod(getMethod)
-            val response = getMethod.getResponseBodyAsString()
-
-            if (isSuccess(status)) {
-                onRequestSuccessful(response)
-            } else {
-                onResultUnsuccessful(getMethod, response, status)
-            }
-        } catch (e: Exception) {
-            Timber.e(e, "Exception while getting remote shares")
-            RemoteOperationResult(e)
-        }
-    }
-
-    private fun buildRequestUri(baseUri: Uri) =
-        baseUri.buildUpon()
-            .appendEncodedPath(GRAPH_API_PATH)
-            .appendEncodedPath(ENDPOINT_SPACES_LIST)
-            .build()
-
-    private fun parseResponse(response: String): List<SpaceResponse> {
-        val moshi = Moshi.Builder().build()
-        val adapter: JsonAdapter<SpacesResponseWrapper> = moshi.adapter(SpacesResponseWrapper::class.java)
-        return adapter.fromJson(response)?.value ?: listOf()
-    }
-
-    private fun onResultUnsuccessful(
-        method: GetMethod,
-        response: String?,
-        status: Int
-    ): RemoteOperationResult<List<SpaceResponse>> {
-        Timber.e("Failed response while getting spaces for user")
-        if (response != null) {
-            Timber.e("*** status code: $status; response message: $response")
-        } else {
-            Timber.e("*** status code: $status")
-        }
-        return RemoteOperationResult(method)
-    }
-
-    private fun onRequestSuccessful(response: String?): RemoteOperationResult<List<SpaceResponse>> {
-        val result = RemoteOperationResult<List<SpaceResponse>>(RemoteOperationResult.ResultCode.OK)
-        Timber.d("Successful response: $response")
-        result.data = response?.let { parseResponse(it) } ?: listOf()
-        Timber.d("*** Fetch of spaces completed and parsed to ${result.data}")
-        return result
-    }
-
-    private fun isSuccess(status: Int) = status == HttpConstants.HTTP_OK
-
-    companion object {
-        private const val GRAPH_API_PATH = "graph/v1.0"
-        private const val ENDPOINT_SPACES_LIST = "me/drives"
-    }
-}

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/spaces/responses/SpacesResponse.kt

@@ -1,98 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2022 ownCloud GmbH.
- *
- *   Permission is hereby granted, free of charge, to any person obtaining a copy
- *   of this software and associated documentation files (the "Software"), to deal
- *   in the Software without restriction, including without limitation the rights
- *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *   copies of the Software, and to permit persons to whom the Software is
- *   furnished to do so, subject to the following conditions:
- *
- *   The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- *
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *   THE SOFTWARE.
- */
-package com.owncloud.android.lib.resources.spaces.responses
-
-import com.squareup.moshi.JsonClass
-
-@JsonClass(generateAdapter = true)
-data class SpacesResponseWrapper(
-    val value: List<SpaceResponse>
-)
-
-@JsonClass(generateAdapter = true)
-data class SpaceResponse(
-    val description: String?,
-    val driveAlias: String,
-    val driveType: String,
-    val id: String,
-    val lastModifiedDateTime: String?,
-    val name: String,
-    val owner: OwnerResponse?,
-    val quota: QuotaResponse?,
-    val root: RootResponse,
-    val special: List<SpecialResponse>?,
-    val webUrl: String,
-)
-
-@JsonClass(generateAdapter = true)
-data class OwnerResponse(
-    val user: UserResponse
-)
-
-@JsonClass(generateAdapter = true)
-data class QuotaResponse(
-    val remaining: Long?,
-    val state: String?,
-    val total: Long,
-    val used: Long?,
-)
-
-@JsonClass(generateAdapter = true)
-data class RootResponse(
-    val eTag: String?,
-    val id: String,
-    val webDavUrl: String,
-    val deleted: DeleteResponse?,
-)
-
-@JsonClass(generateAdapter = true)
-data class SpecialResponse(
-    val eTag: String,
-    val file: FileResponse,
-    val id: String,
-    val lastModifiedDateTime: String,
-    val name: String,
-    val size: Int,
-    val specialFolder: SpecialFolderResponse,
-    val webDavUrl: String
-)
-
-@JsonClass(generateAdapter = true)
-data class UserResponse(
-    val id: String
-)
-
-@JsonClass(generateAdapter = true)
-data class FileResponse(
-    val mimeType: String
-)
-
-@JsonClass(generateAdapter = true)
-data class DeleteResponse(
-    val state: String,
-)
-
-@JsonClass(generateAdapter = true)
-data class SpecialFolderResponse(
-    val name: String
-)

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/spaces/services/OCSpacesService.kt

@@ -1,34 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2022 ownCloud GmbH.
- *
- *   Permission is hereby granted, free of charge, to any person obtaining a copy
- *   of this software and associated documentation files (the "Software"), to deal
- *   in the Software without restriction, including without limitation the rights
- *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *   copies of the Software, and to permit persons to whom the Software is
- *   furnished to do so, subject to the following conditions:
- *
- *   The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- *
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *   THE SOFTWARE.
- */
-package com.owncloud.android.lib.resources.spaces.services
-
-import com.owncloud.android.lib.common.OwnCloudClient
-import com.owncloud.android.lib.common.operations.RemoteOperationResult
-import com.owncloud.android.lib.resources.spaces.GetRemoteSpacesOperation
-import com.owncloud.android.lib.resources.spaces.responses.SpaceResponse
-
-class OCSpacesService(override val client: OwnCloudClient) : SpacesService {
-    override fun getSpaces(): RemoteOperationResult<List<SpaceResponse>> {
-        return GetRemoteSpacesOperation().execute(client)
-    }
-}

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/spaces/services/SpacesService.kt

@@ -1,31 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2022 ownCloud GmbH.
- *
- *   Permission is hereby granted, free of charge, to any person obtaining a copy
- *   of this software and associated documentation files (the "Software"), to deal
- *   in the Software without restriction, including without limitation the rights
- *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *   copies of the Software, and to permit persons to whom the Software is
- *   furnished to do so, subject to the following conditions:
- *
- *   The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- *
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *   THE SOFTWARE.
- */
-package com.owncloud.android.lib.resources.spaces.services
-
-import com.owncloud.android.lib.common.operations.RemoteOperationResult
-import com.owncloud.android.lib.resources.Service
-import com.owncloud.android.lib.resources.spaces.responses.SpaceResponse
-
-interface SpacesService : Service {
-    fun getSpaces(): RemoteOperationResult<List<SpaceResponse>>
-}

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.kt

@@ -45,7 +45,7 @@ import java.net.URL
 
 /**
  * Get the Capabilities from the server
- * Save Result.getData in a RemoteCapability object
+ * Save in Result.getData in a RemoteCapability object
  *
  * @author masensio
  * @author David González Verdugo

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/RemoteCapability.kt

@@ -1,12 +1,8 @@
-/**
- * ownCloud Android Library is available under MIT license
- *
+/* ownCloud Android Library is available under MIT license
  *   @author masensio
  *   @author David González Verdugo
  *   @author Abel García de Prada
- * @author Juan Carlos Garrote Gascón
- *
- * Copyright (C) 2022 ownCloud GmbH.
+ *   Copyright (C) 2020 ownCloud GmbH.
  *
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -26,8 +22,8 @@
  *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *   THE SOFTWARE.
+ *
  */
-
 package com.owncloud.android.lib.resources.status
 
 /**
@@ -37,7 +33,7 @@ data class RemoteCapability(
     var accountName: String = "",
 
     // Server version
-    var versionMajor: Int = 0,
+    var versionMayor: Int = 0,
     var versionMinor: Int = 0,
     var versionMicro: Int = 0,
     var versionString: String = "",
@@ -72,10 +68,7 @@ data class RemoteCapability(
     var filesUndelete: CapabilityBooleanType = CapabilityBooleanType.UNKNOWN,
     var filesVersioning: CapabilityBooleanType = CapabilityBooleanType.UNKNOWN,
     val filesPrivateLinks: CapabilityBooleanType = CapabilityBooleanType.UNKNOWN,
-    val filesAppProviders: List<RemoteAppProviders>?,
-
-    // Spaces
-    val spaces: RemoteSpaces?,
+    val filesAppProviders: List<RemoteOCISProvider>?,
 ) {
     /**
      * Enum for Boolean Type in capabilities, with values:
@@ -108,7 +101,7 @@ data class RemoteCapability(
         }
     }
 
-    data class RemoteAppProviders(
+    data class RemoteOCISProvider(
         val enabled: Boolean,
         val version: String,
         val appsUrl: String?,
@@ -116,10 +109,4 @@ data class RemoteCapability(
         val openWebUrl: String?,
         val newUrl: String?,
     )
-
-    data class RemoteSpaces(
-        val enabled: Boolean,
-        val projects: Boolean,
-        val shareJail: Boolean,
-    )
 }

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/responses/CapabilityResponse.kt

@@ -1,10 +1,6 @@
-/**
- * ownCloud Android Library is available under MIT license
- *
+/* ownCloud Android Library is available under MIT license
  *   @author Abel García de Prada
- * @author Juan Carlos Garrote Gascón
- *
- * Copyright (C) 2022 ownCloud GmbH.
+ *   Copyright (C) 2020 ownCloud GmbH.
  *
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -24,12 +20,13 @@
  *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *   THE SOFTWARE.
+ *
  */
-
 package com.owncloud.android.lib.resources.status.responses
 
 import com.owncloud.android.lib.resources.status.RemoteCapability
-import com.owncloud.android.lib.resources.status.RemoteCapability.*
+import com.owncloud.android.lib.resources.status.RemoteCapability.CapabilityBooleanType
+import com.owncloud.android.lib.resources.status.RemoteCapability.RemoteOCISProvider
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
@@ -40,7 +37,7 @@ data class CapabilityResponse(
     val capabilities: Capabilities?
 ) {
     fun toRemoteCapability(): RemoteCapability = RemoteCapability(
-        versionMajor = serverVersion?.major ?: 0,
+        versionMayor = serverVersion?.major ?: 0,
         versionMinor = serverVersion?.minor ?: 0,
         versionMicro = serverVersion?.micro ?: 0,
         versionString = serverVersion?.string ?: "",
@@ -73,11 +70,10 @@ data class CapabilityResponse(
         filesUndelete = CapabilityBooleanType.fromBooleanValue(capabilities?.fileCapabilities?.undelete),
         filesVersioning = CapabilityBooleanType.fromBooleanValue(capabilities?.fileCapabilities?.versioning),
         filesPrivateLinks = capabilities?.fileCapabilities?.privateLinks?.let { CapabilityBooleanType.fromBooleanValue(it) } ?: CapabilityBooleanType.UNKNOWN,
-        filesAppProviders = capabilities?.fileCapabilities?.appProviders?.map { it.toAppProviders() },
+        filesAppProviders = capabilities?.fileCapabilities?.appProviders?.map { it.toOCISProvider() },
         filesSharingFederationIncoming = CapabilityBooleanType.fromBooleanValue(capabilities?.fileSharingCapabilities?.fileSharingFederation?.incoming),
         filesSharingFederationOutgoing = CapabilityBooleanType.fromBooleanValue(capabilities?.fileSharingCapabilities?.fileSharingFederation?.outgoing),
         filesSharingUserProfilePicture = CapabilityBooleanType.fromBooleanValue(capabilities?.fileSharingCapabilities?.fileSharingUser?.profilePicture),
-        spaces = capabilities?.spacesCapabilities?.toSpaces(),
     )
 }
 
@@ -90,9 +86,7 @@ data class Capabilities(
     @Json(name = "files")
     val fileCapabilities: FileCapabilities?,
     @Json(name = "dav")
-    val davCapabilities: DavCapabilities?,
-    @Json(name = "spaces")
-    val spacesCapabilities: SpacesCapabilities?,
+    val davCapabilities: DavCapabilities?
 )
 
 @JsonClass(generateAdapter = true)
@@ -188,7 +182,7 @@ data class AppProvider(
     @Json(name = "new_url")
     val newUrl: String?,
 ) {
-    fun toAppProviders() = RemoteAppProviders(enabled, version, appsUrl, openUrl, openWebUrl, newUrl)
+    fun toOCISProvider() = RemoteOCISProvider(enabled, version, appsUrl, openUrl, openWebUrl, newUrl)
 }
 
 @JsonClass(generateAdapter = true)
@@ -196,16 +190,6 @@ data class DavCapabilities(
     val chunking: String?
 )
 
-@JsonClass(generateAdapter = true)
-data class SpacesCapabilities(
-    val enabled: Boolean,
-    val projects: Boolean,
-    @Json(name = "share_jail")
-    val shareJail: Boolean,
-) {
-    fun toSpaces() = RemoteSpaces(enabled, projects, shareJail)
-}
-
 @JsonClass(generateAdapter = true)
 data class ServerVersion(
     var major: Int?,

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/services/implementation/OCCapabilityService.kt

@@ -1,6 +1,8 @@
 /* ownCloud Android Library is available under MIT license
  *   Copyright (C) 2022 ownCloud GmbH.
  *
+ *   @author David González Verdugo
+ * 
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
  *   in the Software without restriction, including without limitation the rights
@@ -30,7 +32,8 @@ import com.owncloud.android.lib.resources.status.GetRemoteCapabilitiesOperation
 import com.owncloud.android.lib.resources.status.RemoteCapability
 import com.owncloud.android.lib.resources.status.services.CapabilityService
 
-class OCCapabilityService(override val client: OwnCloudClient) : CapabilityService {
+class OCCapabilityService(override val client: OwnCloudClient) :
+    CapabilityService {
     override fun getCapabilities(): RemoteOperationResult<RemoteCapability> =
         GetRemoteCapabilitiesOperation().execute(client)
 }

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/services/implementation/OCServerInfoService.kt

@@ -1,6 +1,8 @@
 /* ownCloud Android Library is available under MIT license
  *   Copyright (C) 2022 ownCloud GmbH.
  *
+ * @author Abel García de Prada 
+ *
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
  *   in the Software without restriction, including without limitation the rights
@@ -24,6 +26,7 @@
 
 package com.owncloud.android.lib.resources.status.services.implementation
 
+
 import com.owncloud.android.lib.common.OwnCloudClient
 import com.owncloud.android.lib.common.operations.RemoteOperationResult
 import com.owncloud.android.lib.resources.files.CheckPathExistenceRemoteOperation
@@ -36,16 +39,16 @@ class OCServerInfoService : ServerInfoService {
     override fun checkPathExistence(
         path: String,
         isUserLoggedIn: Boolean,
-        client: OwnCloudClient,
+        client: OwnCloudClient
     ): RemoteOperationResult<Boolean> =
         CheckPathExistenceRemoteOperation(
             remotePath = path,
-            isUserLoggedIn = isUserLoggedIn,
+            isUserLoggedIn = true
         ).execute(client)
 
     override fun getRemoteStatus(
         path: String,
-        client: OwnCloudClient,
+        client: OwnCloudClient
     ): RemoteOperationResult<RemoteServerInfo> =
         GetRemoteStatusOperation().execute(client)
 }

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/webfinger/GetOCInstanceViaWebfingerOperation.kt

@@ -31,16 +31,16 @@ import com.owncloud.android.lib.common.http.methods.nonwebdav.GetMethod
 import com.owncloud.android.lib.common.http.methods.nonwebdav.HttpMethod
 import com.owncloud.android.lib.common.operations.RemoteOperation
 import com.owncloud.android.lib.common.operations.RemoteOperationResult
-import com.owncloud.android.lib.resources.webfinger.responses.WebFingerResponse
+import com.owncloud.android.lib.resources.webfinger.responses.WebfingerJrdResponse
 import com.squareup.moshi.Moshi
 import timber.log.Timber
 import java.net.URL
 
-class GetInstancesViaWebFingerOperation(
+class GetOCInstanceViaWebfingerOperation(
     private val lockupServerDomain: String,
     private val rel: String,
     private val resource: String,
-) : RemoteOperation<List<String>>() {
+) : RemoteOperation<String>() {
 
     private fun buildRequestUri() =
         Uri.parse(lockupServerDomain).buildUpon()
@@ -51,9 +51,9 @@ class GetInstancesViaWebFingerOperation(
 
     private fun isSuccess(status: Int): Boolean = status == HttpConstants.HTTP_OK
 
-    private fun parseResponse(response: String): WebFingerResponse {
+    private fun parseResponse(response: String): WebfingerJrdResponse {
         val moshi = Moshi.Builder().build()
-        val adapter = moshi.adapter(WebFingerResponse::class.java)
+        val adapter = moshi.adapter(WebfingerJrdResponse::class.java)
         return adapter.fromJson(response)!!
     }
 
@@ -61,31 +61,32 @@ class GetInstancesViaWebFingerOperation(
         method: HttpMethod,
         response: String?,
         status: Int
-    ): RemoteOperationResult<List<String>> {
-        Timber.e("Failed requesting WebFinger info")
+    ): RemoteOperationResult<String> {
+        Timber.e("Failed requesting webfinger info")
         if (response != null) {
             Timber.e("*** status code: $status; response message: $response")
         } else {
             Timber.e("*** status code: $status")
         }
-        return RemoteOperationResult<List<String>>(method)
+        return RemoteOperationResult<String>(method)
     }
 
-    private fun onRequestSuccessful(rawResponse: String): RemoteOperationResult<List<String>> {
+    private fun onRequestSuccessful(rawResponse: String): RemoteOperationResult<String> {
         val response = parseResponse(rawResponse)
-        Timber.d("Successful WebFinger request: $response")
-        val operationResult = RemoteOperationResult<List<String>>(RemoteOperationResult.ResultCode.OK)
-        operationResult.data = response.links?.map { it.href } ?: listOf()
+        for (i in response.links) {
+            if (i.rel == rel) {
+                val operationResult = RemoteOperationResult<String>(RemoteOperationResult.ResultCode.OK)
+                operationResult.data = i.href
                 return operationResult
             }
+        }
+        Timber.e("Could not find ownCloud relevant information in webfinger response: $rawResponse")
+        throw java.lang.Exception("Could not find ownCloud relevant information in webfinger response")
+    }
 
-    override fun run(client: OwnCloudClient): RemoteOperationResult<List<String>> {
+    override fun run(client: OwnCloudClient): RemoteOperationResult<String> {
         val requestUri = buildRequestUri()
         val getMethod = GetMethod(URL(requestUri.toString()))
-
-        // First iteration won't follow redirections.
-        getMethod.followRedirects = false
-
         return try {
             val status = client.executeHttpMethod(getMethod)
             val response = getMethod.getResponseBodyAsString()!!
@@ -96,8 +97,8 @@ class GetInstancesViaWebFingerOperation(
                 onResultUnsuccessful(getMethod, response, status)
             }
         } catch (e: Exception) {
-            Timber.e(e, "Requesting WebFinger info failed")
-            RemoteOperationResult<List<String>>(e)
+            Timber.e(e, "Requesting webfinger info failed")
+            RemoteOperationResult<String>(e)
         }
     }
 

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/webfinger/responses/WebfingerResponse.kt

@@ -27,13 +27,13 @@ package com.owncloud.android.lib.resources.webfinger.responses
 import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
-data class WebFingerResponse(
+data class WebfingerJrdResponse(
     val subject: String,
-    val links: List<LinkItem>?
+    val links: List<LinkItem>
 )
 
 @JsonClass(generateAdapter = true)
 data class LinkItem(
-    val rel: String,
     val href: String,
+    val rel: String
 )

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/webfinger/services/WebfingerService.kt

@@ -20,11 +20,10 @@ package com.owncloud.android.lib.resources.webfinger.services
 import com.owncloud.android.lib.common.OwnCloudClient
 import com.owncloud.android.lib.common.operations.RemoteOperationResult
 
-interface WebFingerService {
-    fun getInstancesFromWebFinger(
+interface WebfingerService {
+    fun getInstanceFromWebfinger(
         lookupServer: String,
-        resource: String,
-        rel: String,
+        username: String,
         client: OwnCloudClient,
-    ): RemoteOperationResult<List<String>>
+    ): RemoteOperationResult<String>
 }

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/webfinger/services/implementation/OCWebfingerService.kt

@@ -19,16 +19,20 @@ package com.owncloud.android.lib.resources.webfinger.services.implementation
 
 import com.owncloud.android.lib.common.OwnCloudClient
 import com.owncloud.android.lib.common.operations.RemoteOperationResult
-import com.owncloud.android.lib.resources.webfinger.GetInstancesViaWebFingerOperation
-import com.owncloud.android.lib.resources.webfinger.services.WebFingerService
+import com.owncloud.android.lib.resources.webfinger.GetOCInstanceViaWebfingerOperation
+import com.owncloud.android.lib.resources.webfinger.services.WebfingerService
 
-class OCWebFingerService : WebFingerService {
+class OCWebfingerService : WebfingerService {
 
-    override fun getInstancesFromWebFinger(
+    override fun getInstanceFromWebfinger(
         lookupServer: String,
-        resource: String,
-        rel: String,
+        username: String,
         client: OwnCloudClient,
-    ): RemoteOperationResult<List<String>> =
-        GetInstancesViaWebFingerOperation(lookupServer, rel, resource).execute(client)
+    ): RemoteOperationResult<String> =
+        GetOCInstanceViaWebfingerOperation(lookupServer, OWNCLOUD_REL, username).execute(client)
+
+    companion object {
+        private const val OWNCLOUD_REL = "http://webfinger.owncloud/rel/server-instance"
+    }
+
 }

owncloudComLibrary/src/test/java/com/owncloud/android/lib/RemoteFileTest.kt

@@ -1,59 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2023 ownCloud GmbH.
- *
- *   Permission is hereby granted, free of charge, to any person obtaining a copy
- *   of this software and associated documentation files (the "Software"), to deal
- *   in the Software without restriction, including without limitation the rights
- *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *   copies of the Software, and to permit persons to whom the Software is
- *   furnished to do so, subject to the following conditions:
- *
- *   The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- *
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *   THE SOFTWARE.
- *
- */
-package com.owncloud.android.lib
-
-import android.os.Build
-import com.owncloud.android.lib.resources.files.RemoteFile
-import okhttp3.HttpUrl.Companion.toHttpUrl
-import org.junit.Assert.assertEquals
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
-import org.robolectric.annotation.Config
-
-@RunWith(RobolectricTestRunner::class)
-@Config(sdk = [Build.VERSION_CODES.O], manifest = Config.NONE)
-class RemoteFileTest {
-
-    @Test
-    fun getRemotePathFromUrl_legacyWebDav() {
-        val httpUrlToTest = "https://server.url/remote.php/dav/files/username/Documents/text.txt".toHttpUrl()
-        val expectedRemotePath = "/Documents/text.txt"
-
-        val actualRemotePath = RemoteFile.Companion.getRemotePathFromUrl(httpUrlToTest, "username")
-        assertEquals(expectedRemotePath, actualRemotePath)
-    }
-
-    @Test
-    fun getRemotePathFromUrl_spacesWebDav() {
-        val spaceWebDavUrl = "https://server.url/dav/spaces/8871f4f3-fc6f-4a66-8bed-62f175f76f38$05bca744-d89f-4e9c-a990-25a0d7f03fe9"
-
-        val httpUrlToTest =
-            "https://server.url/dav/spaces/8871f4f3-fc6f-4a66-8bed-62f175f76f38$05bca744-d89f-4e9c-a990-25a0d7f03fe9/Documents/text.txt".toHttpUrl()
-        val expectedRemotePath = "/Documents/text.txt"
-
-        val actualRemotePath = RemoteFile.Companion.getRemotePathFromUrl(httpUrlToTest, "username", spaceWebDavUrl)
-        assertEquals(expectedRemotePath, actualRemotePath)
-    }
-}

owncloudComLibrary/src/test/java/com/owncloud/android/lib/resources/webfinger/responses/WebfingerResponseTest.kt

@@ -8,34 +8,34 @@ import org.junit.Before
 import org.junit.Test
 import java.io.File
 
-class WebFingerResponseTest {
-    lateinit var adapter: JsonAdapter<WebFingerResponse>
+class WebfingerResponseTest {
+    lateinit var adapter: JsonAdapter<WebfingerJrdResponse>
 
     private fun loadResponses(fileName: String) = adapter.fromJson(File(fileName).readText())
 
     @Before
     fun prepare() {
         val moshi = Moshi.Builder().build()
-        adapter = moshi.adapter(WebFingerResponse::class.java)
+        adapter = moshi.adapter(WebfingerJrdResponse::class.java)
     }
 
     @Test
     fun `check rel in too much information - ok`() {
         val response = loadResponses(TOO_MUCH_INFORMATION_JSON)!!
-        Assert.assertEquals("https://gast.somedomain.de", response.links!![0].href)
-        Assert.assertEquals("http://webfinger.owncloud/rel/server-instance", response.links!![0].rel)
+        Assert.assertEquals("https://gast.somedomain.de", response.links[0].href)
+        Assert.assertEquals("http://webfinger.owncloud/rel/server-instance", response.links[0].rel)
     }
 
     @Test(expected = JsonDataException::class)
     fun `check key value pairs - ko - no href key`() {
         val response = loadResponses(BROKEN_JSON)!!
-        Assert.assertEquals("https://gast.somedomain.de", response.links!![0].href)
+        Assert.assertEquals("https://gast.somedomain.de", response.links[0].href)
     }
 
     @Test(expected = JsonDataException::class)
     fun `check key value pairs - ko - no rel key`() {
         val response = loadResponses(BROKEN_JSON)!!
-        Assert.assertEquals("https://gast.somedomain.de", response.links!![0].href)
+        Assert.assertEquals("https://gast.somedomain.de", response.links[0].href)
     }
 
     companion object {