Merge pull request #581 from owncloud/release/4.1

[RELEASE] 4.1 library to master

.editorconfig

@@ -0,0 +1,5 @@
+[*]
+max_line_length = 150
+
+[*.{kt, kts}]
+disabled_rules=no-consecutive-blank-lines,no-wildcard-imports,max-line-length,no-blank-line-before-rbrace,final-newline,indent,no-multi-spaces,comment-spacing,parameter-list-wrapping

.github/dependabot.yml

@@ -0,0 +1,17 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "gradle"
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"
+    labels:
+      - "dependencies"
+  - package-ecosystem: "github-actions"
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"

.github/workflows/gradle-wrapper-validation.yml

@@ -6,5 +6,5 @@ jobs:
     name: "Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: gradle/wrapper-validation-action@v1

README.md

@@ -44,11 +44,11 @@ ownCloud Android Library is available under MIT license. See the file LICENSE.md
 
 #### Third party libraries
 
-ownCloud Android Library uses OkHttp version 3.10, licensed under Apache License and version 2.0. Besides, it uses Dav4Android, licensed under Mozilla Public License, v. 2.0
+ownCloud Android Library uses OkHttp version 4.6.0, licensed under Apache License and version 2.0. Besides, it uses Dav4Android, licensed under Mozilla Public License, v. 2.0
    
 
 ### Compatibility
 
-ownCloud Android Library is valid for Android systems from version Android 2.2 (android:minSdkVersion="8" android:targetSdkVersion="19").
+ownCloud Android Library is valid for Android systems from version Android 6 (android:minSdkVersion="23" android:targetSdkVersion="33").
 
 ownCloud Android library supports ownCloud server from version 4.5.

build.gradle

@@ -1,24 +1,34 @@
 buildscript {
     ext {
-        kotlinVersion = '1.3.72'
+        orgJetbrainsKotlin = '1.8.10'
-        moshiVersion = "1.9.2"
+        comSquareupMoshi = '1.14.0'
     }
 
     repositories {
         google()
-        jcenter()
+        mavenCentral()
+        maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.3'
+        classpath "org.jlleitschuh.gradle:ktlint-gradle:11.1.0"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
+        classpath 'com.android.tools.build:gradle:7.4.2'
-        classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlinVersion"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$orgJetbrainsKotlin"
     }
 }
 
+plugins {
+    id 'com.google.devtools.ksp' version '1.8.10-1.0.9' apply false
+}
+
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
         maven { url 'https://jitpack.io' }
     }
 }
+
+subprojects {
+    apply plugin: "org.jlleitschuh.gradle.ktlint"
+    apply plugin: "com.google.devtools.ksp"
+}

check_code_script.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+check_license_in_file() {
+    if ! head -n 20 $FILE | grep -q "Permission is hereby granted, free of charge, to any person obtaining a copy"
+    then
+        echo "$FILE does not contain a current copyright header"
+    fi
+}
+
+for FILE in $(find owncloudComLibrary/src -name "*.java" -o -name "*.kt")
+do
+    check_license_in_file
+done
+
+./gradlew ktlintFormat

gradle.properties

@@ -1,3 +1,3 @@
 android.enableJetifier=true
 android.useAndroidX=true
-org.gradle.jvmargs=-Xmx1536M
+org.gradle.jvmargs=-Xmx1536M

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Sun Sep 08 09:13:16 CEST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip

gradlew

@@ -1,79 +1,129 @@
-#!/usr/bin/env bash
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 ##############################################################################
-##
+#
-##  Gradle start up script for UN*X
+#   Gradle start up script for POSIX generated by Gradle.
-##
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+# Attempt to set APP_HOME
-DEFAULT_JVM_OPTS=""
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
-warn ( ) {
+warn () {
     echo "$*"
-}
+} >&2
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
-case "`uname`" in
+nonstop=false
-  CYGWIN* )
+case "$( uname )" in                #(
-    cygwin=true
+  CYGWIN* )         cygwin=true  ;; #(
-    ;;
+  Darwin* )         darwin=true  ;; #(
-  Darwin* )
+  MSYS* | MINGW* )  msys=true    ;; #(
-    darwin=true
+  NONSTOP* )        nonstop=true ;;
-    ;;
-  MINGW* )
-    msys=true
-    ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -82,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -90,75 +140,95 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
+    case $MAX_FD in #(
-    if [ $? -eq 0 ] ; then
+      max*)
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+        MAX_FD=$( ulimit -H -n ) ||
-            MAX_FD="$MAX_FD_LIMIT"
+            warn "Could not query maximum file descriptor limit"
-        fi
+    esac
-        ulimit -n $MAX_FD
+    case $MAX_FD in  #(
-        if [ $? -ne 0 ] ; then
+      '' | soft) :;; #(
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
+      *)
-        fi
+        ulimit -n "$MAX_FD" ||
-    else
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+# Collect all arguments for the java command, stacking in reverse order:
-function splitJvmOpts() {
+#   * args from the command line
-    JVM_OPTS=("$@")
+#   * the main class name
-}
+#   * -classpath
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+#   * -D...appname settings
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -8,20 +24,23 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -45,34 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

owncloudComLibrary/build.gradle

@@ -1,49 +1,43 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-kapt'
+apply plugin: 'com.google.devtools.ksp'
-apply plugin: 'kotlin-allopen'
+apply plugin: 'kotlin-parcelize'
 
 dependencies {
-    api 'com.squareup.okhttp3:okhttp:3.12.0'
+    api 'com.squareup.okhttp3:okhttp:4.6.0'
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$orgJetbrainsKotlin"
-    api 'com.gitlab.ownclouders:dav4android:oc_support_1.0.1'
+    api 'com.gitlab.ownclouders:dav4android:oc_support_2.1.5'
-    api 'com.github.hannesa2:Logcat:1.6.0'
+    api 'com.github.AppDevNext.Logcat:LogcatCore:2.2.2'
-    api 'net.openid:appauth:0.7.1'
 
     // Moshi
-    implementation ("com.squareup.moshi:moshi-kotlin:$moshiVersion") {
+    implementation("com.squareup.moshi:moshi-kotlin:$comSquareupMoshi") {
         exclude module: "kotlin-reflect"
     }
-    kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshiVersion"
+    implementation 'org.apache.commons:commons-lang3:3.12.0'
-}
+    ksp "com.squareup.moshi:moshi-kotlin-codegen:$comSquareupMoshi"
 
-allOpen {
+    testImplementation 'junit:junit:4.13.2'
-    // allows mocking for classes w/o directly opening them for release builds
+    testImplementation 'org.robolectric:robolectric:4.10'
-    annotation 'com.owncloud.android.lib.testing.OpenClass'
+    debugImplementation 'com.facebook.stetho:stetho-okhttp3:1.6.0'
 }
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 33
 
     defaultConfig {
-        minSdkVersion 21
+        minSdkVersion 23
-        targetSdkVersion 28
+        targetSdkVersion 33
-
-        versionCode = 10000500
-        versionName = "1.0.5"
-
-        // This is pretty ugly but manifest placeholders don't seem to work very well when using different modules
-        // See https://github.com/openid/AppAuth-Android/issues/325
-        manifestPlaceholders = [appAuthRedirectScheme: '']
     }
 
-    lintOptions {
+    lint {
         abortOnError false
         ignoreWarnings true
     }
 
-    compileOptions {
+    testOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
+        unitTests {
-        targetCompatibility JavaVersion.VERSION_1_8
+            includeAndroidResources = true
+        }
     }
+    namespace 'com.owncloud.android.lib'
 }

owncloudComLibrary/src/debug/java/com/owncloud/android/lib/common/http/DebugInterceptorFactory.kt

@@ -0,0 +1,30 @@
+/* ownCloud Android Library is available under MIT license
+ *   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
+ *   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.common.http
+
+import com.facebook.stetho.okhttp3.StethoInterceptor
+
+object DebugInterceptorFactory {
+    fun getInterceptor() = StethoInterceptor()
+}

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) 2016 ownCloud GmbH.
+   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
@@ -23,16 +23,8 @@
 
  -->
 
-<manifest package="com.owncloud.android.lib"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    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/ConnectionValidator.kt

@@ -0,0 +1,221 @@
+/* ownCloud Android Library is available under MIT license
+ *   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
+ *   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.common
+
+import android.accounts.AccountManager
+import android.accounts.AccountsException
+import android.content.Context
+import com.owncloud.android.lib.common.authentication.OwnCloudCredentials
+import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory.OwnCloudAnonymousCredentials
+import com.owncloud.android.lib.common.http.HttpConstants
+import com.owncloud.android.lib.common.operations.RemoteOperationResult
+import com.owncloud.android.lib.resources.files.CheckPathExistenceRemoteOperation
+import com.owncloud.android.lib.resources.status.GetRemoteStatusOperation
+import com.owncloud.android.lib.resources.status.RemoteServerInfo
+import org.apache.commons.lang3.exception.ExceptionUtils
+import timber.log.Timber
+import java.io.IOException
+
+/**
+ * ConnectionValidator
+ *
+ * @author Christian Schabesberger
+ */
+class ConnectionValidator(
+    val context: Context,
+    private val clearCookiesOnValidation: Boolean
+) {
+    fun validate(baseClient: OwnCloudClient, singleSessionManager: SingleSessionManager, context: Context): Boolean {
+        try {
+            var validationRetryCount = 0
+            val client = OwnCloudClient(baseClient.baseUri, null, false, singleSessionManager, context)
+            if (clearCookiesOnValidation) {
+                client.clearCookies()
+            } else {
+                client.cookiesForBaseUri = baseClient.cookiesForBaseUri
+            }
+
+            client.account = baseClient.account
+            client.credentials = baseClient.credentials
+            while (validationRetryCount < VALIDATION_RETRY_COUNT) {
+                Timber.d("validationRetryCount %d", validationRetryCount)
+                var successCounter = 0
+                var failCounter = 0
+
+                client.setFollowRedirects(true)
+                if (isOwnCloudStatusOk(client)) {
+                    successCounter++
+                } else {
+                    failCounter++
+                }
+
+                // Skip the part where we try to check if we can access the parts where we have to be logged in... if we are not logged in
+                if (baseClient.credentials !is OwnCloudAnonymousCredentials) {
+                    client.setFollowRedirects(false)
+                    val contentReply = canAccessRootFolder(client)
+                    if (contentReply.httpCode == HttpConstants.HTTP_OK) {
+                        if (contentReply.data == true) { //if data is true it means that the content reply was ok
+                            successCounter++
+                        } else {
+                            failCounter++
+                        }
+                    } else {
+                        failCounter++
+                        if (contentReply.httpCode == HttpConstants.HTTP_UNAUTHORIZED) {
+                            checkUnauthorizedAccess(client, singleSessionManager, contentReply.httpCode)
+                        }
+                    }
+                }
+                if (successCounter >= failCounter) {
+                    baseClient.credentials = client.credentials
+                    baseClient.cookiesForBaseUri = client.cookiesForBaseUri
+                    return true
+                }
+                validationRetryCount++
+            }
+            Timber.d("Could not authenticate or get valid data from owncloud")
+        } catch (e: Exception) {
+            Timber.d(ExceptionUtils.getStackTrace(e))
+        }
+        return false
+    }
+
+    private fun isOwnCloudStatusOk(client: OwnCloudClient): Boolean {
+        val reply = getOwnCloudStatus(client)
+        // dont check status code. It currently relais on the broken redirect code of the owncloud client
+        // TODO: Use okhttp redirect and add this check again
+        // return reply.httpCode == HttpConstants.HTTP_OK &&
+        return !reply.isException &&
+                reply.data != null
+    }
+
+    private fun getOwnCloudStatus(client: OwnCloudClient): RemoteOperationResult<RemoteServerInfo> {
+        val remoteStatusOperation = GetRemoteStatusOperation()
+        return remoteStatusOperation.execute(client)
+    }
+
+    private fun canAccessRootFolder(client: OwnCloudClient): RemoteOperationResult<Boolean> {
+        val checkPathExistenceRemoteOperation = CheckPathExistenceRemoteOperation("/", true)
+        return checkPathExistenceRemoteOperation.execute(client)
+    }
+
+    /**
+     * Determines if credentials should be invalidated according the to the HTTPS status
+     * of a network request just performed.
+     *
+     * @param httpStatusCode Result of the last request ran with the 'credentials' belows.
+     * @return 'True' if credentials should and might be invalidated, 'false' if shouldn't or
+     * cannot be invalidated with the given arguments.
+     */
+    private fun shouldInvalidateAccountCredentials(credentials: OwnCloudCredentials, account: OwnCloudAccount, httpStatusCode: Int): Boolean {
+        var shouldInvalidateAccountCredentials = httpStatusCode == HttpConstants.HTTP_UNAUTHORIZED
+        shouldInvalidateAccountCredentials = shouldInvalidateAccountCredentials and  // real credentials
+                (credentials !is OwnCloudAnonymousCredentials)
+
+        // test if have all the needed to effectively invalidate ...
+        shouldInvalidateAccountCredentials =
+            shouldInvalidateAccountCredentials and (account.savedAccount != null)
+        Timber.d(
+            """Received error: $httpStatusCode,
+            account: ${account.name}
+            credentials are real: ${credentials !is OwnCloudAnonymousCredentials},
+            so we need to invalidate credentials for account ${account.name} : $shouldInvalidateAccountCredentials"""
+        )
+        return shouldInvalidateAccountCredentials
+    }
+
+    /**
+     * Invalidates credentials stored for the given account in the system  [AccountManager] and in
+     * current [SingleSessionManager.getDefaultSingleton] instance.
+     *
+     *
+     * [.shouldInvalidateAccountCredentials] should be called first.
+     *
+     */
+    private fun invalidateAccountCredentials(account: OwnCloudAccount, credentials: OwnCloudCredentials) {
+        Timber.i("Invalidating account credentials for account $account")
+        val am = AccountManager.get(context)
+        am.invalidateAuthToken(
+            account.savedAccount.type,
+            credentials.authToken
+        )
+        am.clearPassword(account.savedAccount) // being strict, only needed for Basic Auth credentials
+    }
+
+    /**
+     * Checks the status code of an execution and decides if should be repeated with fresh credentials.
+     *
+     *
+     * Invalidates current credentials if the request failed as anauthorized.
+     *
+     *
+     * Refresh current credentials if possible, and marks a retry.
+     *
+     * @return
+     */
+    private fun checkUnauthorizedAccess(client: OwnCloudClient, singleSessionManager: SingleSessionManager, status: Int): Boolean {
+        var credentialsWereRefreshed = false
+        val account = client.account
+        val credentials = account.credentials
+        if (shouldInvalidateAccountCredentials(credentials, account, status)) {
+            invalidateAccountCredentials(account, credentials)
+
+            if (credentials.authTokenCanBeRefreshed()) {
+                try {
+                    // This command does the actual refresh
+                    Timber.i("Trying to refresh auth token for account $account")
+                    account.loadCredentials(context)
+                    // if mAccount.getCredentials().length() == 0 --> refresh failed
+                    client.credentials = account.credentials
+                    credentialsWereRefreshed = true
+                } catch (e: AccountsException) {
+                    Timber.e(
+                        e, "Error while trying to refresh auth token for %s\ntrace: %s",
+                        account.savedAccount.name,
+                        ExceptionUtils.getStackTrace(e)
+                    )
+                } catch (e: IOException) {
+                    Timber.e(
+                        e, "Error while trying to refresh auth token for %s\ntrace: %s",
+                        account.savedAccount.name,
+                        ExceptionUtils.getStackTrace(e)
+                    )
+                }
+                if (!credentialsWereRefreshed) {
+                    // if credentials are not refreshed, client must be removed
+                    // from the OwnCloudClientManager to prevent it is reused once and again
+                    Timber.w("Credentials were not refreshed, client will be removed from the Session Manager to prevent using it over and over")
+                    singleSessionManager.removeClientFor(account)
+                }
+            }
+            // else: onExecute will finish with status 401
+        }
+        return credentialsWereRefreshed
+    }
+
+    companion object {
+        private const val VALIDATION_RETRY_COUNT = 3
+    }
+}

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

@@ -25,11 +25,9 @@
 
 package com.owncloud.android.lib.common;
 
-import android.accounts.AccountManager;
+import android.content.Context;
-import android.accounts.AccountsException;
 import android.net.Uri;
 
-import at.bitfire.dav4android.exception.HttpException;
 import com.owncloud.android.lib.common.accounts.AccountUtils;
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentials;
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory;
@@ -37,9 +35,7 @@ import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory
 import com.owncloud.android.lib.common.http.HttpClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
 import com.owncloud.android.lib.common.http.methods.HttpBaseMethod;
-import com.owncloud.android.lib.common.network.RedirectionPath;
 import com.owncloud.android.lib.common.utils.RandomUtils;
-import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 import okhttp3.Cookie;
 import okhttp3.HttpUrl;
 import timber.log.Timber;
@@ -47,164 +43,122 @@ 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.OC_X_REQUEST_ID;
+import static com.owncloud.android.lib.common.http.HttpConstants.AUTHORIZATION_HEADER;
+import static com.owncloud.android.lib.common.http.HttpConstants.HTTP_MOVED_PERMANENTLY;
 
 public class OwnCloudClient extends HttpClient {
 
     public static final String WEBDAV_FILES_PATH_4_0 = "/remote.php/dav/files/";
-    public static final String WEBDAV_PATH_4_0_AND_LATER = "/remote.php/dav";
-    private static final String WEBDAV_UPLOADS_PATH_4_0 = "/remote.php/dav/uploads/";
     public static final String STATUS_PATH = "/status.php";
+    private static final String WEBDAV_UPLOADS_PATH_4_0 = "/remote.php/dav/uploads/";
+    private static final int MAX_RETRY_COUNT = 2;
 
-    private static final int MAX_REDIRECTIONS_COUNT = 3;
-    private static final int MAX_REPEAT_COUNT_WITH_FRESH_CREDENTIALS = 1;
-
-    private static byte[] sExhaustBuffer = new byte[1024];
     private static int sIntanceCounter = 0;
     private OwnCloudCredentials mCredentials = null;
     private int mInstanceNumber;
     private Uri mBaseUri;
-    private OwnCloudVersion mVersion = null;
     private OwnCloudAccount mAccount;
+    private final ConnectionValidator mConnectionValidator;
+    private Object mRequestMutex = new Object();
+
+    // If set to true a mutex will be used to prevent parallel execution of the execute() method
+    // if false the execute() method can be called even though the mutex is already aquired.
+    // This is used for the ConnectionValidator, which has to be able to execute OperationsWhile all "normal" operations net
+    // to be set on hold.
+    private final Boolean mSynchronizeRequests;
 
     private SingleSessionManager mSingleSessionManager = null;
 
-    private boolean mFollowRedirects;
+    private boolean mFollowRedirects = false;
+
+    public OwnCloudClient(Uri baseUri,
+                          ConnectionValidator connectionValidator,
+                          boolean synchronizeRequests,
+                          SingleSessionManager singleSessionManager,
+                          Context context) {
+        super(context);
 
-    public OwnCloudClient(Uri baseUri) {
         if (baseUri == null) {
             throw new IllegalArgumentException("Parameter 'baseUri' cannot be NULL");
         }
         mBaseUri = baseUri;
+        mSynchronizeRequests = synchronizeRequests;
+        mSingleSessionManager = singleSessionManager;
 
         mInstanceNumber = sIntanceCounter++;
         Timber.d("#" + mInstanceNumber + "Creating OwnCloudClient");
 
         clearCredentials();
         clearCookies();
+        mConnectionValidator = connectionValidator;
     }
 
     public void clearCredentials() {
         if (!(mCredentials instanceof OwnCloudAnonymousCredentials)) {
             mCredentials = OwnCloudCredentialsFactory.getAnonymousCredentials();
         }
-        mCredentials.applyTo(this);
-    }
-
-    void applyCredentials() {
-        mCredentials.applyTo(this);
     }
 
     public int executeHttpMethod(HttpBaseMethod method) throws Exception {
-        boolean repeatWithFreshCredentials;
+        if (mSynchronizeRequests) {
-        int repeatCounter = 0;
+            synchronized (mRequestMutex) {
-        int status;
+                return saveExecuteHttpMethod(method);
-
-        do {
-            setRequestId(method);
-
-            status = method.execute();
-
-            if (mFollowRedirects) {
-                status = followRedirection(method).getLastStatus();
-            }
-
-            repeatWithFreshCredentials = checkUnauthorizedAccess(status, repeatCounter);
-            if (repeatWithFreshCredentials) {
-                repeatCounter++;
-            }
-        } while (repeatWithFreshCredentials);
-
-        return status;
-    }
-
-    private int executeRedirectedHttpMethod(HttpBaseMethod method) throws Exception {
-        boolean repeatWithFreshCredentials;
-        int repeatCounter = 0;
-        int status;
-
-        do {
-            setRequestId(method);
-
-            status = method.execute();
-
-            repeatWithFreshCredentials = checkUnauthorizedAccess(status, repeatCounter);
-            if (repeatWithFreshCredentials) {
-                repeatCounter++;
-            }
-        } while (repeatWithFreshCredentials);
-
-        return status;
-    }
-
-    private void setRequestId(HttpBaseMethod method) {
-        // Clean previous request id. This is a bit hacky but is the only way to add request headers in WebDAV
-        // methods by using Dav4Android
-        deleteHeaderForAllRequests(OC_X_REQUEST_ID);
-
-        String requestId = RandomUtils.generateRandomUUID();
-
-        // Header to allow tracing requests in apache and ownCloud logs
-        addHeaderForAllRequests(OC_X_REQUEST_ID, requestId);
-
-        Timber.d("Executing in request with id %s", requestId);
-    }
-
-    public RedirectionPath followRedirection(HttpBaseMethod method) throws Exception {
-        int redirectionsCount = 0;
-        int status = method.getStatusCode();
-        RedirectionPath redirectionPath = new RedirectionPath(status, MAX_REDIRECTIONS_COUNT);
-
-        while (redirectionsCount < MAX_REDIRECTIONS_COUNT &&
-                (status == HttpConstants.HTTP_MOVED_PERMANENTLY ||
-                        status == HttpConstants.HTTP_MOVED_TEMPORARILY ||
-                        status == HttpConstants.HTTP_TEMPORARY_REDIRECT)
-        ) {
-
-            final String location = method.getResponseHeader(HttpConstants.LOCATION_HEADER) != null
-                    ? method.getResponseHeader(HttpConstants.LOCATION_HEADER)
-                    : method.getResponseHeader(HttpConstants.LOCATION_HEADER_LOWER);
-
-            if (location != null) {
-                Timber.d("#" + mInstanceNumber + "Location to redirect: " + location);
-
-                redirectionPath.addLocation(location);
-
-                // Release the connection to avoid reach the max number of connections per host
-                // due to it will be set a different url
-                exhaustResponse(method.getResponseBodyAsStream());
-
-                method.setUrl(HttpUrl.parse(location));
-                final String destination = method.getRequestHeader("Destination") != null
-                        ? method.getRequestHeader("Destination")
-                        : method.getRequestHeader("destination");
-
-                if (destination != null) {
-                    final int suffixIndex = location.lastIndexOf(getUserFilesWebDavUri().toString());
-                    final String redirectionBase = location.substring(0, suffixIndex);
-                    final String destinationPath = destination.substring(mBaseUri.toString().length());
-
-                    method.setRequestHeader("destination", redirectionBase + destinationPath);
-                }
-                try {
-                    status = executeRedirectedHttpMethod(method);
-                } catch (HttpException e) {
-                    if (e.getMessage().contains(Integer.toString(HttpConstants.HTTP_MOVED_TEMPORARILY))) {
-                        status = HttpConstants.HTTP_MOVED_TEMPORARILY;
-                    } else {
-                        throw e;
-                    }
-                }
-                redirectionPath.addStatus(status);
-                redirectionsCount++;
-
-            } else {
-                Timber.d(" #" + mInstanceNumber + "No location to redirect!");
-                status = HttpConstants.HTTP_NOT_FOUND;
             }
+        } else {
+            return saveExecuteHttpMethod(method);
         }
-        return redirectionPath;
+    }
+
+    private int saveExecuteHttpMethod(HttpBaseMethod method) throws Exception {
+        int repeatCounter = 0;
+        int status;
+
+        if (mFollowRedirects) {
+            method.setFollowRedirects(true);
+        }
+
+        boolean retry;
+        do {
+            repeatCounter++;
+            retry = false;
+            String requestId = RandomUtils.generateRandomUUID();
+
+            // Header to allow tracing requests in apache and ownCloud logs
+            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());
+            }
+
+            status = method.execute(this);
+
+            if (shouldConnectionValidatorBeCalled(method, status)) {
+                retry = mConnectionValidator.validate(this, mSingleSessionManager, getContext()); // retry on success fail on no success
+            } else if (method.getFollowPermanentRedirects() && status == HTTP_MOVED_PERMANENTLY) {
+                retry = true;
+                method.setFollowRedirects(true);
+            }
+
+        } while (retry && repeatCounter < MAX_RETRY_COUNT);
+
+        return status;
+    }
+
+    private boolean shouldConnectionValidatorBeCalled(HttpBaseMethod method, int status) {
+
+        return mConnectionValidator != null && (
+                (!(mCredentials instanceof OwnCloudAnonymousCredentials) &&
+                        status == HttpConstants.HTTP_UNAUTHORIZED
+                ) || (!mFollowRedirects &&
+                        !method.getFollowRedirects() &&
+                        status == HttpConstants.HTTP_MOVED_TEMPORARILY
+                )
+        );
     }
 
     /**
@@ -215,9 +169,6 @@ public class OwnCloudClient extends HttpClient {
     public void exhaustResponse(InputStream responseBodyAsStream) {
         if (responseBodyAsStream != null) {
             try {
-                while (responseBodyAsStream.read(sExhaustBuffer) >= 0) {
-                    ;
-                }
                 responseBodyAsStream.close();
 
             } catch (IOException io) {
@@ -234,7 +185,7 @@ public class OwnCloudClient extends HttpClient {
         return (mCredentials instanceof OwnCloudAnonymousCredentials || mAccount == null)
                 ? Uri.parse(mBaseUri + WEBDAV_FILES_PATH_4_0)
                 : Uri.parse(mBaseUri + WEBDAV_FILES_PATH_4_0 + AccountUtils.getUserId(
-                mAccount.getSavedAccount(), getContext()
+                        mAccount.getSavedAccount(), getContext()
                 )
         );
     }
@@ -243,7 +194,7 @@ public class OwnCloudClient extends HttpClient {
         return mCredentials instanceof OwnCloudAnonymousCredentials
                 ? Uri.parse(mBaseUri + WEBDAV_UPLOADS_PATH_4_0)
                 : Uri.parse(mBaseUri + WEBDAV_UPLOADS_PATH_4_0 + AccountUtils.getUserId(
-                mAccount.getSavedAccount(), getContext()
+                        mAccount.getSavedAccount(), getContext()
                 )
         );
     }
@@ -273,38 +224,21 @@ public class OwnCloudClient extends HttpClient {
     public void setCredentials(OwnCloudCredentials credentials) {
         if (credentials != null) {
             mCredentials = credentials;
-            mCredentials.applyTo(this);
         } else {
             clearCredentials();
         }
     }
 
-    public String getCookiesString() {
+    public void setCookiesForBaseUri(List<Cookie> cookies) {
-        StringBuilder cookiesString = new StringBuilder();
-        List<Cookie> cookieList = getCookiesFromUrl(HttpUrl.parse(mBaseUri.toString()));
-
-        if (cookieList != null) {
-            for (Cookie cookie : cookieList) {
-                cookiesString.append(cookie.toString()).append(";");
-            }
-        }
-
-        return cookiesString.toString();
-    }
-
-    public void setCookiesForCurrentAccount(List<Cookie> cookies) {
         getOkHttpClient().cookieJar().saveFromResponse(
-                HttpUrl.parse(getAccount().getBaseUri().toString()),
+                HttpUrl.parse(mBaseUri.toString()),
                 cookies
         );
     }
 
-    public OwnCloudVersion getOwnCloudVersion() {
+    public List<Cookie> getCookiesForBaseUri() {
-        return mVersion;
+        return getOkHttpClient().cookieJar().loadForRequest(
-    }
+                HttpUrl.parse(mBaseUri.toString()));
-
-    public void setOwnCloudVersion(OwnCloudVersion version) {
-        mVersion = version;
     }
 
     public OwnCloudAccount getAccount() {
@@ -315,94 +249,6 @@ public class OwnCloudClient extends HttpClient {
         this.mAccount = account;
     }
 
-    /**
-     * Checks the status code of an execution and decides if should be repeated with fresh credentials.
-     * <p>
-     * Invalidates current credentials if the request failed as anauthorized.
-     * <p>
-     * Refresh current credentials if possible, and marks a retry.
-     *
-     * @param status
-     * @param repeatCounter
-     * @return
-     */
-    private boolean checkUnauthorizedAccess(int status, int repeatCounter) {
-        boolean credentialsWereRefreshed = false;
-
-        if (shouldInvalidateAccountCredentials(status)) {
-            boolean invalidated = invalidateAccountCredentials();
-
-            if (invalidated) {
-                if (getCredentials().authTokenCanBeRefreshed() &&
-                        repeatCounter < MAX_REPEAT_COUNT_WITH_FRESH_CREDENTIALS) {
-                    try {
-                        mAccount.loadCredentials(getContext());
-                        // if mAccount.getCredentials().length() == 0 --> refresh failed
-                        setCredentials(mAccount.getCredentials());
-                        credentialsWereRefreshed = true;
-
-                    } catch (AccountsException | IOException e) {
-                        Timber.e(e, "Error while trying to refresh auth token for %s",
-                                mAccount.getSavedAccount().name
-                        );
-                    }
-                }
-
-                if (!credentialsWereRefreshed && mSingleSessionManager != null) {
-                    // if credentials are not refreshed, client must be removed
-                    // from the OwnCloudClientManager to prevent it is reused once and again
-                    mSingleSessionManager.removeClientFor(mAccount);
-                }
-            }
-            // else: onExecute will finish with status 401
-        }
-
-        return credentialsWereRefreshed;
-    }
-
-    /**
-     * Determines if credentials should be invalidated according the to the HTTPS status
-     * of a network request just performed.
-     *
-     * @param httpStatusCode Result of the last request ran with the 'credentials' belows.
-     * @return 'True' if credentials should and might be invalidated, 'false' if shouldn't or
-     * cannot be invalidated with the given arguments.
-     */
-    private boolean shouldInvalidateAccountCredentials(int httpStatusCode) {
-        boolean shouldInvalidateAccountCredentials =
-                (httpStatusCode == HttpConstants.HTTP_UNAUTHORIZED);
-
-        shouldInvalidateAccountCredentials &= (mCredentials != null &&         // real credentials
-                !(mCredentials instanceof OwnCloudCredentialsFactory.OwnCloudAnonymousCredentials));
-
-        // test if have all the needed to effectively invalidate ...
-        shouldInvalidateAccountCredentials &= (mAccount != null && mAccount.getSavedAccount() != null && getContext() != null);
-
-        return shouldInvalidateAccountCredentials;
-    }
-
-    /**
-     * Invalidates credentials stored for the given account in the system  {@link AccountManager} and in
-     * current {@link SingleSessionManager#getDefaultSingleton()} instance.
-     * <p>
-     * {@link #shouldInvalidateAccountCredentials(int)} should be called first.
-     *
-     * @return 'True' if invalidation was successful, 'false' otherwise.
-     */
-    private boolean invalidateAccountCredentials() {
-        AccountManager am = AccountManager.get(getContext());
-        am.invalidateAuthToken(
-                mAccount.getSavedAccount().type,
-                mCredentials.getAuthToken()
-        );
-        am.clearPassword(mAccount.getSavedAccount()); // being strict, only needed for Basic Auth credentials
-        return true;
-    }
-
-    public boolean followRedirects() {
-        return mFollowRedirects;
-    }
-
     public void setFollowRedirects(boolean followRedirects) {
         this.mFollowRedirects = followRedirects;
     }

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

@@ -1,49 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   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
- *   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.common;
-
-import android.content.Context;
-import android.net.Uri;
-
-public class OwnCloudClientFactory {
-
-    /**
-     * Creates a OwnCloudClient to access a URL and sets the desired parameters for ownCloud
-     * client connections.
-     *
-     * @param uri     URL to the ownCloud server; BASE ENTRY POINT, not WebDavPATH
-     * @param context Android context where the OwnCloudClient is being created.
-     * @return A OwnCloudClient object ready to be used
-     */
-    public static OwnCloudClient createOwnCloudClient(Uri uri, Context context, boolean followRedirects) {
-        OwnCloudClient client = new OwnCloudClient(uri);
-
-        client.setFollowRedirects(followRedirects);
-
-        client.setContext(context);
-
-        return client;
-    }
-}

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

@@ -24,19 +24,16 @@
 
 package com.owncloud.android.lib.common;
 
-import android.accounts.Account;
-import android.accounts.AccountManager;
 import android.accounts.AuthenticatorException;
 import android.accounts.OperationCanceledException;
 import android.content.Context;
 import android.net.Uri;
 
 import com.owncloud.android.lib.common.accounts.AccountUtils;
-import com.owncloud.android.lib.common.http.HttpClient;
+import com.owncloud.android.lib.common.authentication.OwnCloudCredentials;
 import timber.log.Timber;
 
 import java.io.IOException;
-import java.util.Iterator;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
@@ -51,6 +48,7 @@ public class SingleSessionManager {
 
     private static SingleSessionManager sDefaultSingleton;
     private static String sUserAgent;
+    private static ConnectionValidator sConnectionValidator;
 
     private ConcurrentMap<String, OwnCloudClient> mClientsWithKnownUsername = new ConcurrentHashMap<>();
     private ConcurrentMap<String, OwnCloudClient> mClientsWithUnknownUsername = new ConcurrentHashMap<>();
@@ -62,6 +60,14 @@ public class SingleSessionManager {
         return sDefaultSingleton;
     }
 
+    public static void setConnectionValidator(ConnectionValidator connectionValidator) {
+        sConnectionValidator = connectionValidator;
+    }
+
+    public static ConnectionValidator getConnectionValidator() {
+        return sConnectionValidator;
+    }
+
     public static String getUserAgent() {
         return sUserAgent;
     }
@@ -70,7 +76,23 @@ public class SingleSessionManager {
         sUserAgent = userAgent;
     }
 
-    public OwnCloudClient getClientFor(OwnCloudAccount account, Context context) throws OperationCanceledException,
+    private static OwnCloudClient createOwnCloudClient(Uri uri,
+                                                       Context context,
+                                                       ConnectionValidator connectionValidator,
+                                                       SingleSessionManager singleSessionManager) {
+        OwnCloudClient client = new OwnCloudClient(uri, connectionValidator, true, singleSessionManager, context);
+        return client;
+    }
+
+    public OwnCloudClient getClientFor(OwnCloudAccount account,
+                                       Context context) throws OperationCanceledException,
+            AuthenticatorException, IOException {
+        return getClientFor(account, context, getConnectionValidator());
+    }
+
+    public OwnCloudClient getClientFor(OwnCloudAccount account,
+                                       Context context,
+                                       ConnectionValidator connectionValidator) throws OperationCanceledException,
             AuthenticatorException, IOException {
 
         Timber.d("getClientFor starting ");
@@ -101,17 +123,41 @@ public class SingleSessionManager {
             }
         } else {
             Timber.v("reusing client for account %s", accountName);
+            if (client.getAccount() != null &&
+                    client.getAccount().getCredentials() != null &&
+                    (client.getAccount().getCredentials().getAuthToken() == null || client.getAccount().getCredentials().getAuthToken().isEmpty())
+            ) {
+                Timber.i("Client " + client.getAccount().getName() + " needs to refresh credentials");
+
+                //the next two lines are a hack because okHttpclient is used as a singleton instead of being an
+                //injected instance that can be deleted when required
+                client.clearCookies();
+                client.clearCredentials();
+
+                client.setAccount(account);
+
+                account.loadCredentials(context);
+                client.setCredentials(account.getCredentials());
+
+                Timber.i("Client " + account.getName() + " with credentials size" + client.getAccount().getCredentials().getAuthToken().length());
+            }
             reusingKnown = true;
         }
 
         if (client == null) {
             // no client to reuse - create a new one
-            client = OwnCloudClientFactory.createOwnCloudClient(
+            client = createOwnCloudClient(
                     account.getBaseUri(),
-                    context.getApplicationContext(),
+                    context,
-                    true);    // TODO remove dependency on OwnCloudClientFactory
+                    connectionValidator,
+                    this); // TODO remove dependency on OwnCloudClientFactory
+
+            //the next two lines are a hack because okHttpclient is used as a singleton instead of being an
+            //injected instance that can be deleted when required
+            client.clearCookies();
+            client.clearCredentials();
+
             client.setAccount(account);
-            HttpClient.setContext(context);
 
             account.loadCredentials(context);
             client.setCredentials(account.getCredentials());
@@ -129,8 +175,6 @@ public class SingleSessionManager {
                 Timber.v("reusing client for session %s", sessionName);
             }
 
-            keepCredentialsUpdated(client);
-            keepCookiesUpdated(context, account, client);
             keepUriUpdated(account, client);
         }
         Timber.d("getClientFor finishing ");
@@ -161,34 +205,13 @@ public class SingleSessionManager {
         Timber.d("removeClientFor finishing ");
     }
 
-    public void saveAllClients(Context context, String accountType) {
+    public void refreshCredentialsForAccount(String accountName, OwnCloudCredentials credentials) {
-        Timber.d("Saving sessions... ");
+        OwnCloudClient ownCloudClient = mClientsWithKnownUsername.get(accountName);
-
+        if (ownCloudClient == null) {
-        Iterator<String> accountNames = mClientsWithKnownUsername.keySet().iterator();
+            return;
-        String accountName;
-        Account account;
-        while (accountNames.hasNext()) {
-            accountName = accountNames.next();
-            account = new Account(accountName, accountType);
-            AccountUtils.saveClient(mClientsWithKnownUsername.get(accountName), account, context);
-        }
-
-        Timber.d("All sessions saved");
-    }
-
-    private void keepCredentialsUpdated(OwnCloudClient reusedClient) {
-        reusedClient.applyCredentials();
-    }
-
-    private void keepCookiesUpdated(Context context, OwnCloudAccount account, OwnCloudClient reusedClient) {
-        AccountManager am = AccountManager.get(context.getApplicationContext());
-        if (am != null && account.getSavedAccount() != null) {
-            String recentCookies = am.getUserData(account.getSavedAccount(), AccountUtils.Constants.KEY_COOKIES);
-            String previousCookies = reusedClient.getCookiesString();
-            if (recentCookies != null && !previousCookies.equals("") && !recentCookies.equals(previousCookies)) {
-                AccountUtils.restoreCookies(account.getSavedAccount(), reusedClient, context);
-            }
         }
+        ownCloudClient.setCredentials(credentials);
+        mClientsWithKnownUsername.replace(accountName, ownCloudClient);
     }
 
     // this method is just a patch; we need to distinguish accounts in the same host but

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/accounts/AccountUtils.java

@@ -36,14 +36,10 @@ import android.net.Uri;
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentials;
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory;
-import com.owncloud.android.lib.resources.files.FileUtils;
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;
-import okhttp3.Cookie;
 import timber.log.Timber;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
 
 public class AccountUtils {
     /**
@@ -56,17 +52,9 @@ public class AccountUtils {
      */
     public static String getWebDavUrlForAccount(Context context, Account account)
             throws AccountNotFoundException {
-        String webDavUrlForAccount = "";
 
-        try {
+        return getBaseUrlForAccount(context, account) + OwnCloudClient.WEBDAV_FILES_PATH_4_0
-            OwnCloudCredentials ownCloudCredentials = getCredentialsForAccount(context, account);
+                + AccountUtils.getUserId(account, context);
-            webDavUrlForAccount = getBaseUrlForAccount(context, account) + OwnCloudClient.WEBDAV_FILES_PATH_4_0
-                    + ownCloudCredentials.getUsername();
-        } catch (OperationCanceledException | AuthenticatorException | IOException e) {
-            Timber.e(e);
-        }
-
-        return webDavUrlForAccount;
     }
 
     /**
@@ -106,26 +94,6 @@ public class AccountUtils {
         return username;
     }
 
-    /**
-     * Get the stored server version corresponding to an OC account.
-     *
-     * @param account An OC account
-     * @param context Application context
-     * @return Version of the OC server, according to last check
-     */
-    public static OwnCloudVersion getServerVersionForAccount(Account account, Context context) {
-        AccountManager ama = AccountManager.get(context);
-        OwnCloudVersion version = null;
-        try {
-            String versionString = ama.getUserData(account, Constants.KEY_OC_VERSION);
-            version = new OwnCloudVersion(versionString);
-
-        } catch (Exception e) {
-            Timber.e(e, "Couldn't get a the server version for an account");
-        }
-        return version;
-    }
-
     /**
      * @return
      * @throws IOException
@@ -144,6 +112,7 @@ public class AccountUtils {
         String username = AccountUtils.getUsernameForAccount(account);
 
         if (isOauth2) {
+            Timber.i("Trying to retrieve credentials for oAuth account" + account.name);
             String accessToken = am.blockingGetAuthToken(
                     account,
                     AccountTypeUtils.getAuthTokenTypeAccessToken(account.type),
@@ -201,64 +170,6 @@ public class AccountUtils {
         return username + "@" + url;
     }
 
-    public static void saveClient(OwnCloudClient client, Account savedAccount, Context context) {
-        // Account Manager
-        AccountManager ac = AccountManager.get(context.getApplicationContext());
-
-        if (client != null) {
-            String cookiesString = client.getCookiesString();
-            if (!"".equals(cookiesString)) {
-                ac.setUserData(savedAccount, Constants.KEY_COOKIES, cookiesString);
-                Timber.d("Saving Cookies: %s", cookiesString);
-            }
-        }
-    }
-
-    /**
-     * Restore the client cookies persisted in an account stored in the system AccountManager.
-     *
-     * @param account Stored account.
-     * @param client  Client to restore cookies in.
-     * @param context Android context used to access the system AccountManager.
-     */
-    public static void restoreCookies(Account account, OwnCloudClient client, Context context) {
-        if (account == null) {
-            Timber.d("Cannot restore cookie for null account");
-
-        } else {
-            Timber.d("Restoring cookies for %s", account.name);
-
-            // Account Manager
-            AccountManager am = AccountManager.get(context.getApplicationContext());
-
-            Uri serverUri = (client.getBaseUri() != null) ? client.getBaseUri() : client.getUserFilesWebDavUri();
-
-            String cookiesString = am.getUserData(account, Constants.KEY_COOKIES);
-            if (cookiesString != null) {
-                String[] rawCookies = cookiesString.split(";");
-                List<Cookie> cookieList = new ArrayList<>(rawCookies.length);
-                for (String rawCookie : rawCookies) {
-                    rawCookie = rawCookie.replace(" ", "");
-                    final int equalPos = rawCookie.indexOf('=');
-                    if (equalPos == -1) {
-                        continue;
-                    }
-                    cookieList.add(new Cookie.Builder()
-                            .name(rawCookie.substring(0, equalPos))
-                            .value(rawCookie.substring(equalPos + 1))
-                            .domain(serverUri.getHost())
-                            .path(
-                                    serverUri.getPath().equals("")
-                                            ? FileUtils.PATH_SEPARATOR
-                                            : serverUri.getPath()
-                            )
-                            .build());
-                }
-                client.setCookiesForCurrentAccount(cookieList);
-            }
-        }
-    }
-
     public static class AccountNotFoundException extends AccountsException {
 
         /**
@@ -279,11 +190,6 @@ public class AccountUtils {
     }
 
     public static class Constants {
-        /**
-         * Version should be 3 numbers separated by dot so it can be parsed by
-         * {@link OwnCloudVersion}
-         */
-        public static final String KEY_OC_VERSION = "oc_version";
         /**
          * Base url should point to owncloud installation without trailing / ie:
          * http://server/path or https://owncloud.server
@@ -298,11 +204,6 @@ public class AccountUtils {
 
         public static final String OAUTH_SUPPORTED_TRUE = "TRUE";
 
-        /**
-         * OC account cookies
-         */
-        public static final String KEY_COOKIES = "oc_account_cookies";
-
         /**
          * OC account version
          */

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java

@@ -23,11 +23,9 @@
  */
 package com.owncloud.android.lib.common.authentication;
 
-import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.http.HttpClient;
-import com.owncloud.android.lib.common.http.HttpConstants;
 import okhttp3.Credentials;
-import okhttp3.internal.Util;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
 
 public class OwnCloudBasicCredentials implements OwnCloudCredentials {
 
@@ -39,21 +37,6 @@ public class OwnCloudBasicCredentials implements OwnCloudCredentials {
         mPassword = password != null ? password : "";
     }
 
-    public OwnCloudBasicCredentials(String username, String password, boolean preemptiveMode) {
-        mUsername = username != null ? username : "";
-        mPassword = password != null ? password : "";
-    }
-
-    @Override
-    public void applyTo(OwnCloudClient client) {
-        // Clear previous basic credentials
-        HttpClient.deleteHeaderForAllRequests(HttpConstants.AUTHORIZATION_HEADER);
-        HttpClient.deleteHeaderForAllRequests(HttpConstants.COOKIE_HEADER);
-
-        HttpClient.addHeaderForAllRequests(HttpConstants.AUTHORIZATION_HEADER,
-                Credentials.basic(mUsername, mPassword, Util.UTF_8));
-    }
-
     @Override
     public String getUsername() {
         return mUsername;
@@ -64,6 +47,11 @@ public class OwnCloudBasicCredentials implements OwnCloudCredentials {
         return mPassword;
     }
 
+    @Override
+    public String getHeaderAuth() {
+        return Credentials.basic(mUsername, mPassword, UTF_8);
+    }
+
     @Override
     public boolean authTokenExpires() {
         return false;

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/authentication/OwnCloudBearerCredentials.java

@@ -23,8 +23,6 @@
  */
 package com.owncloud.android.lib.common.authentication;
 
-import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.http.HttpClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
 
 public class OwnCloudBearerCredentials implements OwnCloudCredentials {
@@ -37,16 +35,6 @@ public class OwnCloudBearerCredentials implements OwnCloudCredentials {
         mAccessToken = accessToken != null ? accessToken : "";
     }
 
-    @Override
-    public void applyTo(OwnCloudClient client) {
-        // Clear previous credentials
-        HttpClient.deleteHeaderForAllRequests(HttpConstants.AUTHORIZATION_HEADER);
-        HttpClient.deleteHeaderForAllRequests(HttpConstants.COOKIE_HEADER);
-
-        HttpClient.addHeaderForAllRequests(HttpConstants.AUTHORIZATION_HEADER,
-                HttpConstants.BEARER_AUTHORIZATION_KEY + mAccessToken);
-    }
-
     @Override
     public String getUsername() {
         // not relevant for authentication, but relevant for informational purposes
@@ -58,6 +46,11 @@ public class OwnCloudBearerCredentials implements OwnCloudCredentials {
         return mAccessToken;
     }
 
+    @Override
+    public String getHeaderAuth() {
+        return HttpConstants.BEARER_AUTHORIZATION_KEY + mAccessToken;
+    }
+
     @Override
     public boolean authTokenExpires() {
         return true;

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/authentication/OwnCloudCredentials.java

@@ -24,16 +24,14 @@
 
 package com.owncloud.android.lib.common.authentication;
 
-import com.owncloud.android.lib.common.OwnCloudClient;
-
 public interface OwnCloudCredentials {
 
-    void applyTo(OwnCloudClient ownCloudClient);
-
     String getUsername();
 
     String getAuthToken();
 
+    String getHeaderAuth();
+
     boolean authTokenExpires();
 
     boolean authTokenCanBeRefreshed();

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/authentication/OwnCloudCredentialsFactory.java

@@ -24,10 +24,6 @@
 
 package com.owncloud.android.lib.common.authentication;
 
-import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.http.HttpClient;
-import com.owncloud.android.lib.common.http.HttpConstants;
-
 public class OwnCloudCredentialsFactory {
 
     public static final String CREDENTIAL_CHARSET = "UTF-8";
@@ -55,14 +51,12 @@ public class OwnCloudCredentialsFactory {
         }
 
         @Override
-        public void applyTo(OwnCloudClient client) {
+        public String getAuthToken() {
-            // Clear previous basic credentials
+            return "";
-            HttpClient.deleteHeaderForAllRequests(HttpConstants.AUTHORIZATION_HEADER);
-            HttpClient.deleteHeaderForAllRequests(HttpConstants.COOKIE_HEADER);
         }
 
         @Override
-        public String getAuthToken() {
+        public String getHeaderAuth() {
             return "";
         }
 

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

@@ -0,0 +1,62 @@
+/* ownCloud Android Library is available under MIT license
+ *   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
+ *   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.common.http
+
+import okhttp3.Cookie
+import okhttp3.CookieJar
+import okhttp3.HttpUrl
+
+class CookieJarImpl(
+    private val cookieStore: HashMap<String, List<Cookie>>
+) : CookieJar {
+
+    fun containsCookieWithName(cookies: List<Cookie>, name: String): Boolean {
+        for (cookie: Cookie in cookies) {
+            if (cookie.name == name) {
+                return true
+            }
+        }
+        return false
+    }
+
+    fun getUpdatedCookies(oldCookies: List<Cookie>, newCookies: List<Cookie>): List<Cookie> {
+        val updatedList = ArrayList<Cookie>(newCookies)
+        for (oldCookie: Cookie in oldCookies) {
+            if (!containsCookieWithName(updatedList, oldCookie.name)) {
+                updatedList.add(oldCookie)
+            }
+        }
+        return updatedList
+    }
+
+    override fun saveFromResponse(url: HttpUrl, cookies: List<Cookie>) {
+        // Avoid duplicated cookies but update
+        val currentCookies: List<Cookie> = cookieStore[url.host] ?: ArrayList()
+        val updatedCookies: List<Cookie> = getUpdatedCookies(currentCookies, cookies)
+        cookieStore[url.host] = updatedCookies
+    }
+
+    override fun loadForRequest(url: HttpUrl) =
+        cookieStore[url.host] ?: ArrayList()
+}

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

@@ -22,23 +22,10 @@
  *
  */
 
-package com.owncloud.android.lib.common.http.methods.nonwebdav;
+package com.owncloud.android.lib.common.http
 
-import java.io.IOException;
+import okhttp3.Interceptor
-import java.net.URL;
 
-public class PutMethod extends HttpMethod {
+class DummyInterceptor : Interceptor {
-
+    override fun intercept(chain: Interceptor.Chain) = chain.proceed(chain.request())
-    public PutMethod(URL url) {
-        super(url);
-    }
-
-    @Override
-    public int onExecute() throws IOException {
-        mRequest = mRequest.newBuilder()
-                .put(mRequestBody)
-                .build();
-
-        return super.onExecute();
-    }
 }

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

@@ -26,9 +26,6 @@ package com.owncloud.android.lib.common.http;
 
 import android.content.Context;
 
-import com.owncloud.android.lib.common.SingleSessionManager;
-import com.owncloud.android.lib.common.http.interceptors.HttpInterceptor;
-import com.owncloud.android.lib.common.http.interceptors.RequestHeaderInterceptor;
 import com.owncloud.android.lib.common.network.AdvancedX509TrustManager;
 import com.owncloud.android.lib.common.network.NetworkUtils;
 import okhttp3.Cookie;
@@ -36,6 +33,7 @@ import okhttp3.CookieJar;
 import okhttp3.HttpUrl;
 import okhttp3.OkHttpClient;
 import okhttp3.Protocol;
+import okhttp3.TlsVersion;
 import timber.log.Timber;
 
 import javax.net.ssl.SSLContext;
@@ -43,12 +41,9 @@ import javax.net.ssl.SSLSocketFactory;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
 import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
+import java.util.Collections;
-import java.util.Arrays;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -56,122 +51,97 @@ import java.util.concurrent.TimeUnit;
  *
  * @author David González Verdugo
  */
-public class HttpClient {
-    private static OkHttpClient sOkHttpClient;
-    private static HttpInterceptor sOkHttpInterceptor;
-    private static Context sContext;
-    private static HashMap<String, List<Cookie>> sCookieStore = new HashMap<>();
 
-    public static OkHttpClient getOkHttpClient() {
+public class HttpClient {
-        if (sOkHttpClient == null) {
+    private Context mContext;
+    private HashMap<String, List<Cookie>> mCookieStore = new HashMap<>();
+    private LogInterceptor mLogInterceptor = new LogInterceptor();
+
+    private OkHttpClient mOkHttpClient = null;
+
+    protected HttpClient(Context context) {
+        if (context == null) {
+            Timber.e("Context may not be NULL!");
+            throw new NullPointerException("Context may not be NULL!");
+        }
+        mContext = context;
+    }
+
+    public OkHttpClient getOkHttpClient() {
+        if (mOkHttpClient == null) {
             try {
                 final X509TrustManager trustManager = new AdvancedX509TrustManager(
-                        NetworkUtils.getKnownServersStore(sContext));
+                        NetworkUtils.getKnownServersStore(mContext));
-
-                SSLContext sslContext;
-
-                try {
-                    sslContext = SSLContext.getInstance("TLSv1.2");
-                } catch (NoSuchAlgorithmException tlsv12Exception) {
-                    try {
-                        Timber.w("TLSv1.2 is not supported in this device; falling through TLSv1.1");
-                        sslContext = SSLContext.getInstance("TLSv1.1");
-                    } catch (NoSuchAlgorithmException tlsv11Exception) {
-                        Timber.w("TLSv1.1 is not supported in this device; falling through TLSv1.0");
-                        sslContext = SSLContext.getInstance("TLSv1");
-                        // should be available in any device; see reference of supported protocols in
-                        // http://developer.android.com/reference/javax/net/ssl/SSLSocket.html
-                    }
-                }
 
+                final SSLContext sslContext = buildSSLContext();
                 sslContext.init(null, new TrustManager[]{trustManager}, null);
-
+                final SSLSocketFactory sslSocketFactory = sslContext.getSocketFactory();
-                SSLSocketFactory sslSocketFactory;
-
-                sslSocketFactory = sslContext.getSocketFactory();
 
                 // Automatic cookie handling, NOT PERSISTENT
-                CookieJar cookieJar = new CookieJar() {
+                final CookieJar cookieJar = new CookieJarImpl(mCookieStore);
-                    @Override
+                mOkHttpClient = buildNewOkHttpClient(sslSocketFactory, trustManager, cookieJar);
-                    public void saveFromResponse(HttpUrl url, List<Cookie> cookies) {
-                        // Avoid duplicated cookies
-                        Set<Cookie> nonDuplicatedCookiesSet = new HashSet<>(cookies);
-                        List<Cookie> nonDuplicatedCookiesList = new ArrayList<>(nonDuplicatedCookiesSet);
-
-                        sCookieStore.put(url.host(), nonDuplicatedCookiesList);
-                    }
-
-                    @Override
-                    public List<Cookie> loadForRequest(HttpUrl url) {
-                        List<Cookie> cookies = sCookieStore.get(url.host());
-                        return cookies != null ? cookies : new ArrayList<>();
-                    }
-                };
-
-                OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder()
-                        .addInterceptor(getOkHttpInterceptor())
-                        .protocols(Arrays.asList(Protocol.HTTP_1_1))
-                        .readTimeout(HttpConstants.DEFAULT_DATA_TIMEOUT, TimeUnit.MILLISECONDS)
-                        .writeTimeout(HttpConstants.DEFAULT_DATA_TIMEOUT, TimeUnit.MILLISECONDS)
-                        .connectTimeout(HttpConstants.DEFAULT_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
-                        .followRedirects(false)
-                        .sslSocketFactory(sslSocketFactory, trustManager)
-                        .hostnameVerifier((asdf, usdf) -> true)
-                        .cookieJar(cookieJar);
-                // TODO: Not verifying the hostname against certificate. ask owncloud security human if this is ok.
-                //.hostnameVerifier(new BrowserCompatHostnameVerifier());
-                sOkHttpClient = clientBuilder.build();
 
+            } catch (NoSuchAlgorithmException nsae) {
+                Timber.e(nsae, "Could not setup SSL system.");
+                throw new RuntimeException("Could not setup okHttp client.", nsae);
             } catch (Exception e) {
-                Timber.e(e, "Could not setup SSL system.");
+                Timber.e(e, "Could not setup okHttp client.");
+                throw new RuntimeException("Could not setup okHttp client.", e);
             }
         }
-        return sOkHttpClient;
+        return mOkHttpClient;
     }
 
-    private static HttpInterceptor getOkHttpInterceptor() {
+    private SSLContext buildSSLContext() throws NoSuchAlgorithmException {
-        if (sOkHttpInterceptor == null) {
+        try {
-            sOkHttpInterceptor = new HttpInterceptor();
+            return SSLContext.getInstance(TlsVersion.TLS_1_3.javaName());
-            addHeaderForAllRequests(HttpConstants.USER_AGENT_HEADER, SingleSessionManager.getUserAgent());
+        } catch (NoSuchAlgorithmException tlsv13Exception) {
-            addHeaderForAllRequests(HttpConstants.PARAM_SINGLE_COOKIE_HEADER, "true");
+            try {
-            addHeaderForAllRequests(HttpConstants.ACCEPT_ENCODING_HEADER, HttpConstants.ACCEPT_ENCODING_IDENTITY);
+                Timber.w("TLSv1.3 is not supported in this device; falling through TLSv1.2");
-        }
+                return SSLContext.getInstance(TlsVersion.TLS_1_2.javaName());
-        return sOkHttpInterceptor;
+            } catch (NoSuchAlgorithmException tlsv12Exception) {
-    }
+                try {
-
+                    Timber.w("TLSv1.2 is not supported in this device; falling through TLSv1.1");
-    /**
+                    return SSLContext.getInstance(TlsVersion.TLS_1_1.javaName());
-     * Add header that will be included for all the requests from now on
+                } catch (NoSuchAlgorithmException tlsv11Exception) {
-     *
+                    Timber.w("TLSv1.1 is not supported in this device; falling through TLSv1.0");
-     * @param headerName
+                    return SSLContext.getInstance(TlsVersion.TLS_1_0.javaName());
-     * @param headerValue
+                    // should be available in any device; see reference of supported protocols in
-     */
+                    // http://developer.android.com/reference/javax/net/ssl/SSLSocket.html
-    public static void addHeaderForAllRequests(String headerName, String headerValue) {
+                }
-        HttpInterceptor httpInterceptor = getOkHttpInterceptor();
+            }
-
-        if (getOkHttpInterceptor() != null) {
-            httpInterceptor.addRequestInterceptor(
-                    new RequestHeaderInterceptor(headerName, headerValue)
-            );
         }
     }
 
-    public static void deleteHeaderForAllRequests(String headerName) {
+    private OkHttpClient buildNewOkHttpClient(SSLSocketFactory sslSocketFactory, X509TrustManager trustManager,
-        getOkHttpInterceptor().deleteRequestHeaderInterceptor(headerName);
+                                              CookieJar cookieJar) {
+        return new OkHttpClient.Builder()
+                .addNetworkInterceptor(getLogInterceptor())
+                .addNetworkInterceptor(DebugInterceptorFactory.INSTANCE.getInterceptor())
+                .protocols(Collections.singletonList(Protocol.HTTP_1_1))
+                .readTimeout(HttpConstants.DEFAULT_DATA_TIMEOUT, TimeUnit.MILLISECONDS)
+                .writeTimeout(HttpConstants.DEFAULT_DATA_TIMEOUT, TimeUnit.MILLISECONDS)
+                .connectTimeout(HttpConstants.DEFAULT_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
+                .followRedirects(false)
+                .sslSocketFactory(sslSocketFactory, trustManager)
+                .hostnameVerifier((asdf, usdf) -> true)
+                .cookieJar(cookieJar)
+                .build();
     }
 
     public Context getContext() {
-        return sContext;
+        return mContext;
     }
 
-    public static void setContext(Context context) {
+    public LogInterceptor getLogInterceptor() {
-        sContext = context;
+        return mLogInterceptor;
     }
 
     public List<Cookie> getCookiesFromUrl(HttpUrl httpUrl) {
-        return sCookieStore.get(httpUrl.host());
+        return mCookieStore.get(httpUrl.host());
     }
 
     public void clearCookies() {
-        sCookieStore.clear();
+        mCookieStore.clear();
     }
 }

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

@@ -40,10 +40,10 @@ 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";
-    public static final String PARAM_SINGLE_COOKIE_HEADER = "http.protocol.single-cookie-header";
     public static final String OC_X_REQUEST_ID = "X-Request-ID";
     public static final String LOCATION_HEADER = "Location";
     public static final String LOCATION_HEADER_LOWER = "location";
@@ -52,6 +52,33 @@ public class HttpConstants {
     public static final String ACCEPT_ENCODING_IDENTITY = "identity";
     public static final String OC_FILE_REMOTE_ID = "OC-FileId";
 
+    // OAuth
+    public static final String OAUTH_HEADER_AUTHORIZATION_CODE = "code";
+    public static final String OAUTH_HEADER_GRANT_TYPE = "grant_type";
+    public static final String OAUTH_HEADER_REDIRECT_URI = "redirect_uri";
+    public static final String OAUTH_HEADER_REFRESH_TOKEN = "refresh_token";
+    public static final String OAUTH_HEADER_CODE_VERIFIER = "code_verifier";
+
+    /***********************************************************************************************************
+     ************************************************ CONTENT TYPES ********************************************
+     ***********************************************************************************************************/
+
+    public static final String CONTENT_TYPE_XML = "application/xml";
+    public static final String CONTENT_TYPE_JSON = "application/json";
+    public static final String CONTENT_TYPE_WWW_FORM = "application/x-www-form-urlencoded";
+
+    /***********************************************************************************************************
+     ************************************************ ARGUMENTS NAMES ********************************************
+     ***********************************************************************************************************/
+
+    public static final String PARAM_FORMAT = "format";
+
+    /***********************************************************************************************************
+     ************************************************ ARGUMENTS VALUES ********************************************
+     ***********************************************************************************************************/
+
+    public static final String VALUE_FORMAT = "json";
+
     /***********************************************************************************************************
      ************************************************ STATUS CODES *********************************************
      ***********************************************************************************************************/
@@ -158,6 +185,7 @@ public class HttpConstants {
     public static final int HTTP_LOCKED = 423;
     // 424 Failed Dependency (WebDAV - RFC 2518)
     public static final int HTTP_FAILED_DEPENDENCY = 424;
+    public static final int HTTP_TOO_EARLY = 425;
 
     /**
      * 5xx Client Error
@@ -191,4 +219,4 @@ public class HttpConstants {
      * Default timeout for establishing a connection
      */
     public static final int DEFAULT_CONNECTION_TIMEOUT = 60000;
-}
+}

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

@@ -0,0 +1,65 @@
+/* ownCloud Android Library is available under MIT license
+ *   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
+ *   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.common.http
+
+import com.owncloud.android.lib.common.http.HttpConstants.CONTENT_TYPE_JSON
+import com.owncloud.android.lib.common.http.HttpConstants.CONTENT_TYPE_WWW_FORM
+import com.owncloud.android.lib.common.http.HttpConstants.CONTENT_TYPE_XML
+import okhttp3.MediaType
+import timber.log.Timber
+import java.util.Locale
+
+object LogBuilder {
+    fun logHttp(
+        networkPetition: NetworkPetition,
+        networkNode: NetworkNode,
+        requestId: String? = "",
+        description: String
+    ) = Timber.d("[Network, $networkPetition] [$networkNode] [$requestId] $description")
+}
+
+enum class NetworkPetition {
+    REQUEST, RESPONSE;
+
+    override fun toString(): String = super.toString().lowercase(Locale.ROOT)
+}
+
+enum class NetworkNode {
+    INFO, HEADER, BODY;
+
+    override fun toString(): String = super.toString().lowercase(Locale.ROOT)
+}
+
+/**
+ * Check whether a media type is loggable.
+ *
+ * @return true if its type is text, xml, json, or x-www-form-urlencoded.
+ */
+fun MediaType?.isLoggable(): Boolean =
+    this?.let { mediaType ->
+        val mediaTypeString = mediaType.toString()
+        (mediaType.type == "text" ||
+                mediaTypeString.contains(CONTENT_TYPE_XML) ||
+                mediaTypeString.contains(CONTENT_TYPE_JSON) ||
+                mediaTypeString.contains(CONTENT_TYPE_WWW_FORM))
+    } ?: false

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

@@ -0,0 +1,179 @@
+/* ownCloud Android Library is available under MIT license
+ *   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
+ *   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.common.http
+
+import com.owncloud.android.lib.common.http.HttpConstants.AUTHORIZATION_HEADER
+import com.owncloud.android.lib.common.http.HttpConstants.OC_X_REQUEST_ID
+import com.owncloud.android.lib.common.http.LogBuilder.logHttp
+import com.owncloud.android.lib.common.http.NetworkNode.BODY
+import com.owncloud.android.lib.common.http.NetworkNode.HEADER
+import com.owncloud.android.lib.common.http.NetworkNode.INFO
+import com.owncloud.android.lib.common.http.NetworkPetition.REQUEST
+import com.owncloud.android.lib.common.http.NetworkPetition.RESPONSE
+import okhttp3.Headers
+import okhttp3.Interceptor
+import okhttp3.RequestBody
+import okhttp3.Response
+import okhttp3.ResponseBody
+import okio.Buffer
+import java.nio.charset.Charset
+import java.nio.charset.StandardCharsets
+import kotlin.math.max
+
+class LogInterceptor : Interceptor {
+
+    override fun intercept(chain: Interceptor.Chain): Response {
+
+        if (!httpLogsEnabled) {
+            return chain.proceed(chain.request())
+        }
+
+        val request = chain.request().also {
+            val requestId = it.headers[OC_X_REQUEST_ID]
+            logHttp(REQUEST, INFO, requestId, "Method: ${it.method} URL: ${it.url}")
+            logHeaders(requestId, it.headers, REQUEST)
+            logRequestBody(requestId, it.body)
+        }
+
+        val response = chain.proceed(request)
+
+        return response.also {
+            val requestId = it.request.headers[OC_X_REQUEST_ID]
+            logHttp(
+                RESPONSE,
+                INFO,
+                requestId,
+                "Method: ${request.method} URL: ${request.url} Code: ${it.code} Message: ${it.message}"
+            )
+            logHeaders(requestId, it.headers, RESPONSE)
+            logResponseBody(requestId, it.body)
+        }
+    }
+
+    private fun logHeaders(requestId: String?, headers: Headers, networkPetition: NetworkPetition) {
+        headers.forEach { header ->
+            val headerValue: String = if (header.first.equals(AUTHORIZATION_HEADER, true)) {
+                "[redacted]"
+            } else {
+                header.second
+            }
+            logHttp(networkPetition, HEADER, requestId, "${header.first}: $headerValue")
+        }
+    }
+
+    private fun logRequestBody(requestId: String?, requestBodyParam: RequestBody?) {
+        requestBodyParam?.let { requestBody ->
+
+            if (requestBody.isOneShot()) {
+                logHttp(REQUEST, BODY, requestId, "One shot body -- Omitted")
+                return@let
+            }
+
+            if (requestBody.isDuplex()) {
+                logHttp(REQUEST, BODY, requestId, "Duplex body -- Omitted")
+                return@let
+            }
+
+            val buffer = Buffer()
+            requestBody.writeTo(buffer)
+
+            val contentType = requestBody.contentType()
+            val charset: Charset = contentType?.charset(StandardCharsets.UTF_8) ?: StandardCharsets.UTF_8
+
+            logHttp(REQUEST, BODY, requestId, "Length: ${requestBody.contentLength()} byte body")
+            logHttp(REQUEST, BODY, requestId, "Type: ${requestBody.contentType()}")
+            logHttp(REQUEST, BODY, requestId, "--> Body start for request")
+
+            if (contentType.isLoggable()) {
+                if (requestBody.contentLength() < LIMIT_BODY_LOG) {
+                    logHttp(REQUEST, BODY, requestId, buffer.readString(charset))
+                } else {
+                    logHttp(REQUEST, BODY, requestId, buffer.readString(LIMIT_BODY_LOG, charset))
+                }
+                logHttp(
+                    REQUEST,
+                    BODY,
+                    requestId,
+                    "<-- Body end for request -- Omitted: ${max(0, requestBody.contentLength() - LIMIT_BODY_LOG)} bytes"
+                )
+            } else {
+                logHttp(
+                    REQUEST,
+                    BODY,
+                    requestId,
+                    "<-- Body end for request -- Binary -- Omitted: ${requestBody.contentLength()} bytes"
+                )
+            }
+
+        } ?: logHttp(REQUEST, BODY, requestId, "Empty body")
+    }
+
+    private fun logResponseBody(requestId: String?, responseBodyParam: ResponseBody?) {
+        responseBodyParam?.let { responseBody ->
+
+            val contentType = responseBody.contentType()
+            val charset: Charset = contentType?.charset(StandardCharsets.UTF_8) ?: StandardCharsets.UTF_8
+
+            logHttp(RESPONSE, BODY, requestId, "Length: ${responseBody.contentLength()} byte body")
+            logHttp(RESPONSE, BODY, requestId, "Type: ${responseBody.contentType()}")
+            logHttp(RESPONSE, BODY, requestId, "--> Body start for response")
+
+            val source = responseBody.source()
+            source.request(LIMIT_BODY_LOG)
+            val buffer = source.buffer
+
+            if (contentType.isLoggable()) {
+
+                if (responseBody.contentLength() < LIMIT_BODY_LOG) {
+                    logHttp(RESPONSE, BODY, requestId, buffer.clone().readString(charset))
+                } else {
+                    logHttp(RESPONSE, BODY, requestId, buffer.clone().readString(LIMIT_BODY_LOG, charset))
+                }
+                logHttp(
+                    RESPONSE,
+                    BODY,
+                    requestId,
+                    "<-- Body end for response -- Omitted: ${
+                        max(
+                            0,
+                            responseBody.contentLength() - LIMIT_BODY_LOG
+                        )
+                    } bytes"
+                )
+            } else {
+                logHttp(
+                    RESPONSE,
+                    BODY,
+                    requestId,
+                    "<-- Body end for response -- Binary -- Omitted: ${responseBody.contentLength()} bytes"
+                )
+            }
+        } ?: logHttp(RESPONSE, BODY, requestId, "Empty body")
+    }
+
+    companion object {
+        var httpLogsEnabled: Boolean = false
+        private const val LIMIT_BODY_LOG: Long = 1024
+    }
+}

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

@@ -74,8 +74,8 @@ public class TLSSocketFactory extends SSLSocketFactory {
     }
 
     private Socket enableTLSOnSocket(Socket socket) {
-        if(socket != null && (socket instanceof SSLSocket)) {
+        if((socket instanceof SSLSocket)) {
-            ((SSLSocket)socket).setEnabledProtocols(new String[] {"TLSv1.1", "TLSv1.2"});
+            ((SSLSocket)socket).setEnabledProtocols(new String[] {"TLSv1.1", "TLSv1.2", "TLSv1.3"});
         }
         return socket;
     }

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

@@ -1,116 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   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
- *   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.common.http.interceptors;
-
-import okhttp3.Interceptor;
-import okhttp3.Request;
-import okhttp3.Response;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.ListIterator;
-
-/**
- * Http interceptor to use multiple interceptors in the same {@link okhttp3.OkHttpClient} instance
- *
- * @author David González Verdugo
- */
-public class HttpInterceptor implements Interceptor {
-
-    private final ArrayList<RequestInterceptor> mRequestInterceptors = new ArrayList<>();
-    private final ArrayList<ResponseInterceptor> mResponseInterceptors = new ArrayList<>();
-
-    @Override
-    public Response intercept(Chain chain) throws IOException {
-        Request request = chain.request();
-
-        ListIterator<RequestInterceptor> requestInterceptorIterator = mRequestInterceptors.listIterator();
-
-        while (requestInterceptorIterator.hasNext()) {
-            RequestInterceptor currentRequestInterceptor = requestInterceptorIterator.next();
-            request = currentRequestInterceptor.intercept(request);
-        }
-
-        Response response = chain.proceed(request);
-
-        ListIterator<ResponseInterceptor> responseInterceptorIterator = mResponseInterceptors.listIterator();
-
-        while (responseInterceptorIterator.hasNext()) {
-            ResponseInterceptor currentResponseInterceptor = responseInterceptorIterator.next();
-            response = currentResponseInterceptor.intercept(response);
-        }
-
-        return response;
-    }
-
-    public HttpInterceptor addRequestInterceptor(RequestInterceptor requestInterceptor) {
-        mRequestInterceptors.listIterator().add(requestInterceptor);
-        return this;
-    }
-
-    public HttpInterceptor addResponseInterceptor(ResponseInterceptor responseInterceptor) {
-        mResponseInterceptors.listIterator().add(responseInterceptor);
-        return this;
-    }
-
-    public ArrayList<RequestInterceptor> getRequestInterceptors() {
-        return mRequestInterceptors;
-    }
-
-    private ArrayList<RequestHeaderInterceptor> getRequestHeaderInterceptors() {
-        ArrayList<RequestHeaderInterceptor> requestHeaderInterceptors = new ArrayList<>();
-
-        for (RequestInterceptor requestInterceptor : mRequestInterceptors) {
-            if (requestInterceptor instanceof RequestHeaderInterceptor) {
-                requestHeaderInterceptors.add((RequestHeaderInterceptor) requestInterceptor);
-            }
-        }
-
-        return requestHeaderInterceptors;
-    }
-
-    public void deleteRequestHeaderInterceptor(String headerName) {
-        ListIterator<RequestInterceptor> requestInterceptorIterator = mRequestInterceptors.listIterator();
-        while (requestInterceptorIterator.hasNext()) {
-            RequestInterceptor currentRequestInterceptor = requestInterceptorIterator.next();
-            if (currentRequestInterceptor instanceof RequestHeaderInterceptor &&
-                    ((RequestHeaderInterceptor) currentRequestInterceptor).getHeaderName().equals(headerName)) {
-                requestInterceptorIterator.remove();
-            }
-        }
-    }
-
-    public ArrayList<ResponseInterceptor> getResponseInterceptors() {
-        return mResponseInterceptors;
-    }
-
-    public interface RequestInterceptor {
-        Request intercept(Request request) throws IOException;
-    }
-
-    public interface ResponseInterceptor {
-        Response intercept(Response response) throws IOException;
-    }
-}

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

@@ -1,191 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   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
- *   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.common.http.methods;
-
-import com.owncloud.android.lib.common.http.HttpClient;
-import okhttp3.Call;
-import okhttp3.Headers;
-import okhttp3.HttpUrl;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.RequestBody;
-import okhttp3.Response;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.concurrent.TimeUnit;
-
-/**
- * Wrapper to perform http calls transparently by using:
- * - OkHttp for non webdav methods
- * - Dav4Android for webdav methods
- *
- * @author David González Verdugo
- */
-public abstract class HttpBaseMethod {
-    protected OkHttpClient mOkHttpClient;
-    protected Request mRequest;
-    protected RequestBody mRequestBody;
-    protected Response mResponse;
-    protected String mResponseBodyString;
-    protected Call mCall;
-
-    protected HttpBaseMethod(URL url) {
-        mOkHttpClient = HttpClient.getOkHttpClient();
-        mRequest = new Request.Builder()
-                .url(HttpUrl.parse(url.toString()))
-                .build();
-    }
-
-    public int execute() throws Exception {
-        return onExecute();
-    }
-
-    public void abort() {
-        mCall.cancel();
-    }
-
-    public boolean isAborted() {
-        return mCall.isCanceled();
-    }
-
-    //////////////////////////////
-    //         For override
-    //////////////////////////////
-
-    protected abstract int onExecute() throws Exception;
-
-    //////////////////////////////
-    //         Getter
-    //////////////////////////////
-
-    // Request
-
-    public Headers getRequestHeaders() {
-        return mRequest.headers();
-    }
-
-    public String getRequestHeader(String name) {
-        return mRequest.header(name);
-    }
-
-    // Response
-
-    public int getStatusCode() {
-        return mResponse.code();
-    }
-
-    public String getStatusMessage() {
-        return mResponse.message();
-    }
-
-    public String getResponseBodyAsString() throws IOException {
-        if (mResponseBodyString == null && mResponse.body() != null) {
-            mResponseBodyString = mResponse.body().string();
-        }
-
-        return mResponseBodyString;
-    }
-
-    public InputStream getResponseBodyAsStream() {
-        if (mResponse.body() != null) {
-            return mResponse.body().byteStream();
-        }
-        return null;
-    }
-
-    public Headers getResponseHeaders() {
-        return mResponse.headers();
-    }
-
-    public String getResponseHeader(String headerName) {
-        return mResponse.header(headerName);
-    }
-
-    public boolean getRetryOnConnectionFailure() {
-        return mOkHttpClient.retryOnConnectionFailure();
-    }
-
-    //////////////////////////////
-    //         Setter
-    //////////////////////////////
-
-    // Connection parameters
-
-    public void setRetryOnConnectionFailure(boolean retryOnConnectionFailure) {
-        mOkHttpClient = mOkHttpClient.newBuilder()
-                .retryOnConnectionFailure(retryOnConnectionFailure)
-                .build();
-    }
-
-    public void setReadTimeout(long readTimeout, TimeUnit timeUnit) {
-        mOkHttpClient = mOkHttpClient.newBuilder()
-                .readTimeout(readTimeout, timeUnit)
-                .build();
-    }
-
-    public void setConnectionTimeout(long connectionTimeout, TimeUnit timeUnit) {
-        mOkHttpClient = mOkHttpClient.newBuilder()
-                .readTimeout(connectionTimeout, timeUnit)
-                .build();
-    }
-
-    public void setFollowRedirects(boolean followRedirects) {
-        mOkHttpClient = mOkHttpClient.newBuilder()
-                .followRedirects(followRedirects)
-                .build();
-    }
-
-    // Request
-
-    public void addRequestHeader(String name, String value) {
-        mRequest = mRequest.newBuilder()
-                .addHeader(name, value)
-                .build();
-    }
-
-    /**
-     * Sets a header and replace it if already exists with that name
-     *
-     * @param name  header name
-     * @param value header value
-     */
-    public void setRequestHeader(String name, String value) {
-        mRequest = mRequest.newBuilder()
-                .header(name, value)
-                .build();
-    }
-
-    public void setRequestBody(RequestBody requestBody) {
-        mRequestBody = requestBody;
-    }
-
-    public void setUrl(HttpUrl url) {
-        mRequest = mRequest.newBuilder()
-                .url(url)
-                .build();
-    }
-}

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

@@ -0,0 +1,187 @@
+/* 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.common.http.methods
+
+import com.owncloud.android.lib.common.http.HttpClient
+import okhttp3.Call
+import okhttp3.Headers
+import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.Response
+import java.io.InputStream
+import java.net.MalformedURLException
+import java.net.URL
+import java.util.concurrent.TimeUnit
+
+abstract class HttpBaseMethod constructor(url: URL) {
+    var httpUrl: HttpUrl = url.toHttpUrlOrNull() ?: throw MalformedURLException()
+    var request: Request
+    var followPermanentRedirects = false
+    abstract var response: Response
+    var call: Call? = null
+
+    var followRedirects: Boolean = true
+    var retryOnConnectionFailure: Boolean = true
+    var connectionTimeoutVal: Long? = null
+    var connectionTimeoutUnit: TimeUnit? = null
+    var readTimeoutVal: Long? = null
+        private set
+    var readTimeoutUnit: TimeUnit? = null
+        private set
+
+    init {
+        request = Request.Builder()
+            .url(httpUrl)
+            .build()
+    }
+
+    @Throws(Exception::class)
+    open fun execute(httpClient: HttpClient): Int {
+        val okHttpClient = httpClient.okHttpClient.newBuilder().apply {
+            retryOnConnectionFailure(retryOnConnectionFailure)
+            followRedirects(followRedirects)
+            readTimeoutUnit?.let { unit ->
+                readTimeoutVal?.let { readTimeout(it, unit) }
+            }
+            connectionTimeoutUnit?.let { unit ->
+               connectionTimeoutVal?.let { connectTimeout(it, unit) }
+            }
+        }.build()
+
+        return onExecute(okHttpClient)
+    }
+
+    open fun setUrl(url: HttpUrl) {
+        request = request.newBuilder()
+            .url(url)
+            .build()
+    }
+
+    /****************
+     *** Requests ***
+     ****************/
+
+    fun getRequestHeader(name: String): String? {
+        return request.header(name)
+    }
+
+    fun getRequestHeadersAsHashMap(): HashMap<String, String?> {
+        val headers: HashMap<String, String?> = HashMap()
+        val superHeaders: Set<String> = request.headers.names()
+        superHeaders.forEach {
+            headers[it] = getRequestHeader(it)
+        }
+        return headers
+    }
+
+    open fun addRequestHeader(name: String, value: String) {
+        request = request.newBuilder()
+            .addHeader(name, value)
+            .build()
+    }
+
+    /**
+     * Sets a header and replace it if already exists with that name
+     *
+     * @param name  header name
+     * @param value header value
+     */
+    open fun setRequestHeader(name: String, value: String) {
+        request = request.newBuilder()
+            .header(name, value)
+            .build()
+    }
+
+    /****************
+     *** Response ***
+     ****************/
+    val statusCode: Int
+        get() = response.code
+
+    val statusMessage: String
+        get() = response.message
+
+    // Headers
+    open fun getResponseHeaders(): Headers? {
+        return response.headers
+    }
+
+    open fun getResponseHeader(headerName: String): String? {
+        return response.header(headerName)
+    }
+
+    // Body
+    fun getResponseBodyAsString(): String? = response.body?.string()
+
+    open fun getResponseBodyAsStream(): InputStream? {
+        return response.body?.byteStream()
+    }
+
+    /**
+     * returns the final url after following the last redirect.
+     */
+    open fun getFinalUrl() = response.request.url
+
+    /*************************
+     *** Connection Params ***
+     *************************/
+
+    //////////////////////////////
+    //         Setter
+    //////////////////////////////
+    // Connection parameters
+
+
+    open fun setReadTimeout(readTimeout: Long, timeUnit: TimeUnit) {
+        readTimeoutVal = readTimeout
+        readTimeoutUnit = timeUnit
+    }
+
+    open fun setConnectionTimeout(
+        connectionTimeout: Long,
+        timeUnit: TimeUnit
+    ) {
+        connectionTimeoutVal = connectionTimeout
+        connectionTimeoutUnit = timeUnit
+    }
+
+    /************
+     *** Call ***
+     ************/
+    open fun abort() {
+        call?.cancel()
+    }
+
+    open val isAborted: Boolean
+        get() = call?.isCanceled() ?: false
+
+    //////////////////////////////
+    //         For override
+    //////////////////////////////
+    @Throws(Exception::class)
+    protected abstract fun onExecute(okHttpClient: OkHttpClient): Int
+}

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/DeleteMethod.kt

@@ -21,29 +21,23 @@
  *   THE SOFTWARE.
  *
  */
+package com.owncloud.android.lib.common.http.methods.nonwebdav
 
-package com.owncloud.android.lib.common.http.methods.nonwebdav;
+import okhttp3.OkHttpClient
-
+import java.io.IOException
-import java.io.IOException;
+import java.net.URL
-import java.net.URL;
 
 /**
  * OkHttp delete calls wrapper
  *
  * @author David González Verdugo
  */
-public class DeleteMethod extends HttpMethod {
+class DeleteMethod(url: URL) : HttpMethod(url) {
-
+    @Throws(IOException::class)
-    public DeleteMethod(URL url) {
+    override fun onExecute(okHttpClient: OkHttpClient): Int {
-        super(url);
+        request = request.newBuilder()
+            .delete()
+            .build()
+        return super.onExecute(okHttpClient)
     }
-
+}
-    @Override
-    public int onExecute() throws IOException {
-        mRequest = mRequest.newBuilder()
-                .delete()
-                .build();
-
-        return super.onExecute();
-    }
-}

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/GetMethod.kt

@@ -21,29 +21,23 @@
  *   THE SOFTWARE.
  *
  */
+package com.owncloud.android.lib.common.http.methods.nonwebdav
 
-package com.owncloud.android.lib.common.http.methods.nonwebdav;
+import okhttp3.OkHttpClient
-
+import java.io.IOException
-import java.io.IOException;
+import java.net.URL
-import java.net.URL;
 
 /**
  * OkHttp get calls wrapper
  *
  * @author David González Verdugo
  */
-public class GetMethod extends HttpMethod {
+class GetMethod(url: URL) : HttpMethod(url) {
-
+    @Throws(IOException::class)
-    public GetMethod(URL url) {
+    override fun onExecute(okHttpClient: OkHttpClient): Int {
-        super(url);
+        request = request.newBuilder()
+            .get()
+            .build()
+        return super.onExecute(okHttpClient)
     }
-
+}
-    @Override
-    public int onExecute() throws IOException {
-        mRequest = mRequest.newBuilder()
-                .get()
-                .build();
-
-        return super.onExecute();
-    }
-}

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/HttpMethod.kt

@@ -21,29 +21,27 @@
  *   THE SOFTWARE.
  *
  */
+package com.owncloud.android.lib.common.http.methods.nonwebdav
 
-package com.owncloud.android.lib.common.http.methods.nonwebdav;
+import com.owncloud.android.lib.common.http.methods.HttpBaseMethod
-
+import okhttp3.OkHttpClient
-import com.owncloud.android.lib.common.http.methods.HttpBaseMethod;
+import okhttp3.Response
-
+import java.net.URL
-import java.io.IOException;
-import java.net.URL;
 
 /**
  * Wrapper to perform OkHttp calls
  *
  * @author David González Verdugo
  */
-public abstract class HttpMethod extends HttpBaseMethod {
+abstract class HttpMethod(
+    url: URL
+) : HttpBaseMethod(url) {
 
-    public HttpMethod(URL url) {
+    override lateinit var response: Response
-        super(url);
-    }
 
-    @Override
+    public override fun onExecute(okHttpClient: OkHttpClient): Int {
-    public int onExecute() throws IOException {
+        call = okHttpClient.newCall(request)
-        mCall = mOkHttpClient.newCall(mRequest);
+        call?.let { response = it.execute() }
-        mResponse = mCall.execute();
+        return super.statusCode
-        return super.getStatusCode();
     }
-}
+}

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/PostMethod.kt

@@ -21,29 +21,27 @@
  *   THE SOFTWARE.
  *
  */
+package com.owncloud.android.lib.common.http.methods.nonwebdav
 
-package com.owncloud.android.lib.common.http.methods.nonwebdav;
+import okhttp3.OkHttpClient
-
+import okhttp3.RequestBody
-import java.io.IOException;
+import java.io.IOException
-import java.net.URL;
+import java.net.URL
 
 /**
  * OkHttp post calls wrapper
  *
  * @author David González Verdugo
  */
-public class PostMethod extends HttpMethod {
+class PostMethod(
-
+    url: URL,
-    public PostMethod(URL url) {
+    private val postRequestBody: RequestBody
-        super(url);
+) : HttpMethod(url) {
+    @Throws(IOException::class)
+    override fun onExecute(okHttpClient: OkHttpClient): Int {
+        request = request.newBuilder()
+            .post(postRequestBody)
+            .build()
+        return super.onExecute(okHttpClient)
     }
-
+}
-    @Override
-    public int onExecute() throws IOException {
-        mRequest = mRequest.newBuilder()
-                .post(mRequestBody)
-                .build();
-
-        return super.onExecute();
-    }
-}

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/PutMethod.kt

@@ -0,0 +1,47 @@
+/* ownCloud Android Library is available under MIT license
+ *   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
+ *   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.common.http.methods.nonwebdav
+
+import okhttp3.OkHttpClient
+import okhttp3.RequestBody
+import java.io.IOException
+import java.net.URL
+
+/**
+ * OkHttp put calls wrapper
+ *
+ * @author David González Verdugo
+ */
+class PutMethod(
+    url: URL,
+    private val putRequestBody: RequestBody
+) : HttpMethod(url) {
+    @Throws(IOException::class)
+    override fun onExecute(okHttpClient: OkHttpClient): Int {
+        request = request.newBuilder()
+            .put(putRequestBody)
+            .build()
+        return super.onExecute(okHttpClient)
+    }
+}

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

@@ -21,12 +21,11 @@
  *   THE SOFTWARE.
  *
  */
+package com.owncloud.android.lib.common.http.methods.webdav
 
-package com.owncloud.android.lib.common.http.methods.webdav;
+import at.bitfire.dav4jvm.DavOCResource
-
+import okhttp3.Response
-import kotlin.Unit;
+import java.net.URL
-
-import java.net.URL;
 
 /**
  * Copy calls wrapper
@@ -34,24 +33,20 @@ import java.net.URL;
  * @author Christian Schabesberger
  * @author David González Verdugo
  */
-public class CopyMethod extends DavMethod {
+class CopyMethod(
-
+    val url: URL,
-    final String destinationUrl;
+    private val destinationUrl: String,
-    final boolean forceOverride;
+    val forceOverride: Boolean = false
-
+) : DavMethod(url) {
-    public CopyMethod(URL url, String destinationUrl, boolean forceOverride) {
+    @Throws(Exception::class)
-        super(url);
+    public override fun onDavExecute(davResource: DavOCResource): Int {
-        this.destinationUrl = destinationUrl;
+        davResource.copy(
-        this.forceOverride = forceOverride;
+            destinationUrl,
+            forceOverride,
+            super.getRequestHeadersAsHashMap()
+        ) { callBackResponse: Response ->
+            response = callBackResponse
+        }
+        return super.statusCode
     }
-
+}
-    @Override
-    public int onExecute() throws Exception {
-        mDavResource.copy(destinationUrl, forceOverride, response -> {
-            mResponse = response;
-            return Unit.INSTANCE;
-        });
-
-        return super.getStatusCode();
-    }
-}

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

@@ -21,13 +21,12 @@
  *   THE SOFTWARE.
  *
  */
-
+package com.owncloud.android.lib.common.http.methods.webdav
-package com.owncloud.android.lib.common.http.methods.webdav;
 
 /**
  * @author David González Verdugo
  */
-public class DavConstants {
+object DavConstants {
-    public static final int DEPTH_0 = 0;
+    const val DEPTH_0 = 0
-    public static final int DEPTH_1 = 1;
+    const val DEPTH_1 = 1
 }

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

@@ -1,162 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   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
- *   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.common.http.methods.webdav;
-
-import at.bitfire.dav4android.Constants;
-import at.bitfire.dav4android.DavOCResource;
-import at.bitfire.dav4android.exception.HttpException;
-import at.bitfire.dav4android.exception.RedirectException;
-import com.owncloud.android.lib.common.http.HttpConstants;
-import com.owncloud.android.lib.common.http.methods.HttpBaseMethod;
-import okhttp3.HttpUrl;
-import okhttp3.Protocol;
-import okhttp3.Response;
-import okhttp3.ResponseBody;
-
-import java.net.URL;
-import java.util.concurrent.TimeUnit;
-
-/**
- * Wrapper to perform WebDAV (dav4android) calls
- *
- * @author David González Verdugo
- */
-public abstract class DavMethod extends HttpBaseMethod {
-
-    protected DavOCResource mDavResource;
-
-    protected DavMethod(URL url) {
-        super(url);
-        mDavResource = new DavOCResource(
-                mOkHttpClient,
-                HttpUrl.parse(url.toString()),
-                Constants.INSTANCE.getLog());
-    }
-
-    @Override
-    public void abort() {
-        mDavResource.cancelCall();
-    }
-
-    @Override
-    public int execute() throws Exception {
-        try {
-            return onExecute();
-        } catch (HttpException httpException) {
-            // Modify responses with information gathered from exceptions
-            if (httpException instanceof RedirectException) {
-                mResponse = new Response.Builder()
-                        .header(
-                                HttpConstants.LOCATION_HEADER, ((RedirectException) httpException).getRedirectLocation()
-                        )
-                        .code(httpException.getCode())
-                        .request(mRequest)
-                        .message(httpException.getMessage())
-                        .protocol(Protocol.HTTP_1_1)
-                        .build();
-
-            } else if (mResponse != null) {
-                // The check below should be included in okhttp library, method ResponseBody.create(
-                // TODO check most recent versions of okhttp to see if this is already fixed and try to update if so
-                if (mResponse.body().contentType() != null) {
-                    ResponseBody responseBody = ResponseBody.create(
-                            mResponse.body().contentType(),
-                            httpException.getResponseBody()
-                    );
-
-                    mResponse = mResponse.newBuilder()
-                            .body(responseBody)
-                            .build();
-                }
-            }
-
-            return httpException.getCode();
-        }
-    }
-
-    //////////////////////////////
-    //         Setter
-    //////////////////////////////
-
-    // Connection parameters
-    @Override
-    public void setReadTimeout(long readTimeout, TimeUnit timeUnit) {
-        super.setReadTimeout(readTimeout, timeUnit);
-        mDavResource = new DavOCResource(
-                mOkHttpClient,
-                HttpUrl.parse(mRequest.url().toString()),
-                Constants.INSTANCE.getLog());
-    }
-
-    @Override
-    public void setConnectionTimeout(long connectionTimeout, TimeUnit timeUnit) {
-        super.setConnectionTimeout(connectionTimeout, timeUnit);
-        mDavResource = new DavOCResource(
-                mOkHttpClient,
-                HttpUrl.parse(mRequest.url().toString()),
-                Constants.INSTANCE.getLog());
-    }
-
-    @Override
-    public void setFollowRedirects(boolean followRedirects) {
-        super.setFollowRedirects(followRedirects);
-        mDavResource = new DavOCResource(
-                mOkHttpClient,
-                HttpUrl.parse(mRequest.url().toString()),
-                Constants.INSTANCE.getLog());
-    }
-
-    @Override
-    public void setUrl(HttpUrl url) {
-        super.setUrl(url);
-        mDavResource = new DavOCResource(
-                mOkHttpClient,
-                HttpUrl.parse(mRequest.url().toString()),
-                Constants.INSTANCE.getLog());
-    }
-
-    @Override
-    public boolean getRetryOnConnectionFailure() {
-        return false; //TODO: implement me
-    }
-
-    //////////////////////////////
-    //         Getter
-    //////////////////////////////
-
-    @Override
-    public void setRetryOnConnectionFailure(boolean retryOnConnectionFailure) {
-        super.setRetryOnConnectionFailure(retryOnConnectionFailure);
-        mDavResource = new DavOCResource(
-                mOkHttpClient,
-                HttpUrl.parse(mRequest.url().toString()),
-                Constants.INSTANCE.getLog());
-    }
-
-    @Override
-    public boolean isAborted() {
-        return mDavResource.isCallAborted();
-    }
-}

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

@@ -0,0 +1,97 @@
+/* ownCloud Android Library is available under MIT license
+ *   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
+ *   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.common.http.methods.webdav
+
+import at.bitfire.dav4jvm.Dav4jvm.log
+import at.bitfire.dav4jvm.DavOCResource
+import at.bitfire.dav4jvm.exception.HttpException
+import at.bitfire.dav4jvm.exception.RedirectException
+import com.owncloud.android.lib.common.http.HttpConstants
+import com.owncloud.android.lib.common.http.methods.HttpBaseMethod
+import okhttp3.OkHttpClient
+import okhttp3.Protocol
+import okhttp3.Response
+import okhttp3.ResponseBody.Companion.toResponseBody
+import java.net.URL
+
+/**
+ * Wrapper to perform WebDAV (dav4android) calls
+ *
+ * @author David González Verdugo
+ */
+abstract class DavMethod protected constructor(url: URL) : HttpBaseMethod(url) {
+    override lateinit var response: Response
+    private var davResource: DavOCResource? = null
+
+    override fun abort() {
+        davResource?.cancelCall()
+    }
+
+    protected abstract fun onDavExecute(davResource: DavOCResource): Int
+
+    @Throws(Exception::class)
+    override fun onExecute(okHttpClient: OkHttpClient): Int {
+        return try {
+             davResource = DavOCResource(
+                okHttpClient.newBuilder().followRedirects(false).build(),
+                httpUrl,
+                log
+            )
+
+            onDavExecute(davResource!!)
+        } catch (httpException: HttpException) {
+            // Modify responses with information gathered from exceptions
+            if (httpException is RedirectException) {
+                response = Response.Builder()
+                    .header(
+                        HttpConstants.LOCATION_HEADER, httpException.redirectLocation
+                    )
+                    .code(httpException.code)
+                    .request(request)
+                    .message(httpException.message ?: "")
+                    .protocol(Protocol.HTTP_1_1)
+                    .build()
+            } else {
+                // The check below should be included in okhttp library, method ResponseBody.create(
+                // TODO check most recent versions of okhttp to see if this is already fixed and try to update if so
+                if (response.body?.contentType() != null) {
+                    val responseBody = (httpException.responseBody ?: "").toResponseBody(response.body?.contentType())
+                    response = response.newBuilder()
+                        .body(responseBody)
+                        .build()
+                }
+            }
+            httpException.code
+        }
+    }
+
+    //////////////////////////////
+    //         Getter
+    //////////////////////////////
+
+
+    override val isAborted: Boolean
+        get() = davResource?.isCallAborted() ?: false
+
+}

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

@@ -1,15 +0,0 @@
-package com.owncloud.android.lib.common.http.methods.webdav;
-
-import at.bitfire.dav4android.Property;
-import at.bitfire.dav4android.PropertyUtils;
-
-public class DavUtils {
-
-    public static final Property.Name[] getAllPropset() {
-        return PropertyUtils.INSTANCE.getAllPropSet();
-    }
-
-    public static final Property.Name[] getQuotaPropSet() {
-        return PropertyUtils.INSTANCE.getQuotaPropset();
-    }
-}

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

@@ -0,0 +1,60 @@
+/* ownCloud Android Library is available under MIT license
+ *   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
+ *   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.common.http.methods.webdav
+
+import at.bitfire.dav4jvm.Property
+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,
+        )
+
+    val quotaPropSet: Array<Property.Name>
+        get() = getQuotaPropset()
+}

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

@@ -21,12 +21,11 @@
  *   THE SOFTWARE.
  *
  */
+package com.owncloud.android.lib.common.http.methods.webdav
 
-package com.owncloud.android.lib.common.http.methods.webdav;
+import at.bitfire.dav4jvm.DavOCResource
-
+import okhttp3.Response
-import kotlin.Unit;
+import java.net.URL
-
-import java.net.URL;
 
 /**
  * MkCol calls wrapper
@@ -34,18 +33,15 @@ import java.net.URL;
  * @author Christian Schabesberger
  * @author David González Verdugo
  */
-public class MkColMethod extends DavMethod {
+class MkColMethod(url: URL) : DavMethod(url) {
-    public MkColMethod(URL url) {
+    @Throws(Exception::class)
-        super(url);
+    public override fun onDavExecute(davResource: DavOCResource): Int {
+        davResource.mkCol(
+            xmlBody = null,
+            listOfHeaders = super.getRequestHeadersAsHashMap()
+        ) { callBackResponse: Response ->
+            response = callBackResponse
+        }
+        return super.statusCode
     }
-
+}
-    @Override
-    public int onExecute() throws Exception {
-        mDavResource.mkCol(null, response -> {
-            mResponse = response;
-            return Unit.INSTANCE;
-        });
-
-        return super.getStatusCode();
-    }
-}

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

@@ -1,61 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   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
- *   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.common.http.methods.webdav;
-
-import com.owncloud.android.lib.common.http.HttpConstants;
-import kotlin.Unit;
-
-import java.net.URL;
-
-/**
- * Move calls wrapper
- *
- * @author Christian Schabesberger
- * @author David González Verdugo
- */
-public class MoveMethod extends DavMethod {
-    final String destinationUrl;
-    final boolean forceOverride;
-
-    public MoveMethod(URL url, String destinationUrl, boolean forceOverride) {
-        super(url);
-        this.destinationUrl = destinationUrl;
-        this.forceOverride = forceOverride;
-    }
-
-    @Override
-    public int onExecute() throws Exception {
-        mDavResource.move(
-                destinationUrl,
-                forceOverride,
-                super.getRequestHeader(HttpConstants.OC_TOTAL_LENGTH_HEADER),
-                super.getRequestHeader(HttpConstants.OC_X_OC_MTIME_HEADER), response -> {
-                    mResponse = response;
-                    return Unit.INSTANCE;
-                });
-
-        return super.getStatusCode();
-    }
-}

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

@@ -0,0 +1,53 @@
+/* ownCloud Android Library is available under MIT license
+ *   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
+ *   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.common.http.methods.webdav
+
+import at.bitfire.dav4jvm.DavOCResource
+import okhttp3.Response
+import java.net.URL
+
+/**
+ * Move calls wrapper
+ *
+ * @author Christian Schabesberger
+ * @author David González Verdugo
+ */
+class MoveMethod(
+    url: URL,
+    private val destinationUrl: String,
+    val forceOverride: Boolean = false
+) : DavMethod(url) {
+    @Throws(Exception::class)
+    override fun onDavExecute(davResource: DavOCResource): Int {
+        davResource.move(
+            destinationUrl,
+            forceOverride,
+            super.getRequestHeadersAsHashMap()
+        ) { callBackResponse: Response ->
+            response = callBackResponse
+        }
+        return super.statusCode
+    }
+
+}

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

@@ -1,94 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   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
- *   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.common.http.methods.webdav;
-
-import at.bitfire.dav4android.Property;
-import at.bitfire.dav4android.Response;
-import at.bitfire.dav4android.exception.DavException;
-import kotlin.Unit;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Propfind calls wrapper
- *
- * @author David González Verdugo
- */
-public class PropfindMethod extends DavMethod {
-
-    // request
-    private final int mDepth;
-    private final Property.Name[] mPropertiesToRequest;
-
-    // response
-    private final List<Response> mMembers;
-    private Response mRoot;
-
-    public PropfindMethod(URL url, int depth, Property.Name[] propertiesToRequest) {
-        super(url);
-        mDepth = depth;
-        mPropertiesToRequest = propertiesToRequest;
-        mMembers = new ArrayList<>();
-        mRoot = null;
-    }
-
-    @Override
-    public int onExecute() throws IOException, DavException {
-        mDavResource.propfind(mDepth, mPropertiesToRequest,
-                (Response response, Response.HrefRelation hrefRelation) -> {
-                    switch (hrefRelation) {
-                        case MEMBER:
-                            mMembers.add(response);
-                            break;
-                        case SELF:
-                            mRoot = response;
-                            break;
-                        case OTHER:
-                        default:
-                    }
-                    return Unit.INSTANCE;
-                }, response -> {
-                    mResponse = response;
-                    return Unit.INSTANCE;
-                });
-
-        return getStatusCode();
-    }
-
-    public int getDepth() {
-        return mDepth;
-    }
-
-    public List<Response> getMembers() {
-        return mMembers;
-    }
-
-    public Response getRoot() {
-        return mRoot;
-    }
-}

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

@@ -0,0 +1,73 @@
+/* ownCloud Android Library is available under MIT license
+ *   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
+ *   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.common.http.methods.webdav
+
+import at.bitfire.dav4jvm.DavOCResource
+import at.bitfire.dav4jvm.Property
+import at.bitfire.dav4jvm.Response
+import at.bitfire.dav4jvm.Response.HrefRelation
+import at.bitfire.dav4jvm.exception.DavException
+import java.io.IOException
+import java.net.URL
+
+/**
+ * Propfind calls wrapper
+ *
+ * @author David González Verdugo
+ */
+class PropfindMethod(
+    url: URL,
+    private val depth: Int,
+    private val propertiesToRequest: Array<Property.Name>
+) : DavMethod(url) {
+
+    // response
+    val members: MutableList<Response>
+    var root: Response?
+        private set
+
+    @Throws(IOException::class, DavException::class)
+    public override fun onDavExecute(davResource: DavOCResource): Int {
+        davResource.propfind(
+            depth = depth,
+            reqProp = propertiesToRequest,
+            listOfHeaders = super.getRequestHeadersAsHashMap(),
+            callback = { response: Response, hrefRelation: HrefRelation ->
+                when (hrefRelation) {
+                    HrefRelation.MEMBER -> members.add(response)
+                    HrefRelation.SELF -> this.root = response
+                    HrefRelation.OTHER -> {
+                    }
+                }
+            }, rawCallback = { callBackResponse: okhttp3.Response ->
+                response = callBackResponse
+            })
+        return statusCode
+    }
+
+    init {
+        members = arrayListOf()
+        this.root = null
+    }
+}

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

@@ -1,61 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   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
- *   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.common.http.methods.webdav;
-
-import at.bitfire.dav4android.exception.HttpException;
-import com.owncloud.android.lib.common.http.HttpConstants;
-import kotlin.Unit;
-
-import java.io.IOException;
-import java.net.URL;
-
-/**
- * Put calls wrapper
- *
- * @author David González Verdugo
- */
-public class PutMethod extends DavMethod {
-
-    public PutMethod(URL url) {
-        super(url);
-    }
-
-    ;
-
-    @Override
-    public int onExecute() throws IOException, HttpException {
-        mDavResource.put(
-                mRequestBody,
-                super.getRequestHeader(HttpConstants.IF_MATCH_HEADER),
-                super.getRequestHeader(HttpConstants.CONTENT_TYPE_HEADER),
-                super.getRequestHeader(HttpConstants.OC_TOTAL_LENGTH_HEADER),
-                super.getRequestHeader(HttpConstants.OC_X_OC_MTIME_HEADER), response -> {
-                    mResponse = response;
-                    return Unit.INSTANCE;
-                });
-
-        return super.getStatusCode();
-    }
-}

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

@@ -0,0 +1,53 @@
+/* ownCloud Android Library is available under MIT license
+ *   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
+ *   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.common.http.methods.webdav
+
+import at.bitfire.dav4jvm.DavOCResource
+import at.bitfire.dav4jvm.exception.HttpException
+import com.owncloud.android.lib.common.http.HttpConstants
+import okhttp3.RequestBody
+import java.io.IOException
+import java.net.URL
+
+/**
+ * Put calls wrapper
+ *
+ * @author David González Verdugo
+ */
+class PutMethod(
+    url: URL,
+    private val putRequestBody: RequestBody
+) : DavMethod(url) {
+    @Throws(IOException::class, HttpException::class)
+    public override fun onDavExecute(davResource: DavOCResource): Int {
+        davResource.put(
+            putRequestBody,
+            super.getRequestHeader(HttpConstants.IF_MATCH_HEADER),
+            getRequestHeadersAsHashMap()
+        ) { callBackResponse ->
+            response = callBackResponse
+        }
+        return super.statusCode
+    }
+}

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

@@ -0,0 +1,44 @@
+/* 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.common.http.methods.webdav.properties
+
+import at.bitfire.dav4jvm.Property
+import at.bitfire.dav4jvm.XmlUtils
+import org.xmlpull.v1.XmlPullParser
+
+class OCShareTypes : ShareTypeListProperty() {
+
+    class Factory : ShareTypeListProperty.Factory() {
+
+        override fun create(parser: XmlPullParser) =
+            create(parser, OCShareTypes())
+
+        override fun getName(): Property.Name = NAME
+    }
+
+    companion object {
+        @JvmField
+        val NAME = Property.Name(XmlUtils.NS_OWNCLOUD, "share-types")
+    }
+}

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

@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2020 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,26 +21,26 @@
  *   THE SOFTWARE.
  *
  */
-package com.owncloud.android.lib.sampleclient;
+package com.owncloud.android.lib.common.http.methods.webdav.properties
 
-import android.content.Context;
+import at.bitfire.dav4jvm.Property
-import android.view.View;
+import at.bitfire.dav4jvm.PropertyFactory
-import android.view.ViewGroup;
+import at.bitfire.dav4jvm.XmlUtils
-import android.widget.ArrayAdapter;
+import org.xmlpull.v1.XmlPullParser
-import android.widget.TextView;
+import java.util.LinkedList
 
-import com.owncloud.android.lib.resources.files.RemoteFile;
+abstract class ShareTypeListProperty : Property {
 
-public class FilesArrayAdapter extends ArrayAdapter<RemoteFile> {
+    val shareTypes = LinkedList<String>()
 
-    public FilesArrayAdapter(Context context, int resource) {
+    override fun toString() = "share types =[" + shareTypes.joinToString(", ") + "]"
-        super(context, resource);
+
-    }
+    abstract class Factory : PropertyFactory {
+
+        fun create(parser: XmlPullParser, list: ShareTypeListProperty): ShareTypeListProperty {
+            XmlUtils.readTextPropertyList(parser, Property.Name(XmlUtils.NS_OWNCLOUD, "share-type"), list.shareTypes)
+            return list
+        }
 
-    public View getView(int position, View convertView, ViewGroup parent) {
-        TextView textView = (TextView) super.getView(position, convertView, parent);
-        textView.setText(getItem(position).getRemotePath());
-        return textView;
     }
 }
-

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/network/AdvancedX509TrustManager.java

@@ -45,6 +45,7 @@ public class AdvancedX509TrustManager implements X509TrustManager {
 
     private X509TrustManager mStandardTrustManager;
     private KeyStore mKnownServersKeyStore;
+
     /**
      * Constructor for AdvancedX509TrustManager
      *
@@ -66,7 +67,7 @@ public class AdvancedX509TrustManager implements X509TrustManager {
      * @return The first X509TrustManager found in factory.
      */
     private X509TrustManager findX509TrustManager(TrustManagerFactory factory) {
-        TrustManager tms[] = factory.getTrustManagers();
+        TrustManager[] tms = factory.getTrustManagers();
         for (TrustManager tm : tms) {
             if (tm instanceof X509TrustManager) {
                 return (X509TrustManager) tm;

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/network/ChunkFromFileRequestBody.java

@@ -1,121 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   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
- *   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.common.network;
-
-import okhttp3.MediaType;
-import okio.BufferedSink;
-import timber.log.Timber;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.channels.FileChannel;
-import java.util.Iterator;
-
-/**
- * A Request body that represents a file chunk and include information about the progress when uploading it
- *
- * @author David González Verdugo
- */
-public class ChunkFromFileRequestBody extends FileRequestBody {
-
-    private final FileChannel mChannel;
-    private final long mChunkSize;
-    private long mOffset;
-    private long mTransferred;
-    private ByteBuffer mBuffer = ByteBuffer.allocate(4096);
-
-    public ChunkFromFileRequestBody(File file, MediaType contentType, FileChannel channel, long chunkSize) {
-        super(file, contentType);
-        if (channel == null) {
-            throw new IllegalArgumentException("File may not be null");
-        }
-        if (chunkSize <= 0) {
-            throw new IllegalArgumentException("Chunk size must be greater than zero");
-        }
-        this.mChannel = channel;
-        this.mChunkSize = chunkSize;
-        mOffset = 0;
-        mTransferred = 0;
-    }
-
-    @Override
-    public long contentLength() {
-        try {
-            return Math.min(mChunkSize, mChannel.size() - mChannel.position());
-        } catch (IOException e) {
-            return mChunkSize;
-        }
-    }
-
-    @Override
-    public void writeTo(BufferedSink sink) {
-        int readCount;
-        Iterator<OnDatatransferProgressListener> it;
-
-        try {
-            mChannel.position(mOffset);
-            long size = mFile.length();
-            if (size == 0) {
-                size = -1;
-            }
-            long maxCount = Math.min(mOffset + mChunkSize, mChannel.size());
-            while (mChannel.position() < maxCount) {
-
-                Timber.v("Sink buffer size: %s", sink.buffer().size());
-
-                readCount = mChannel.read(mBuffer);
-
-                Timber.v("Read " + readCount + " bytes from file channel to " + mBuffer.toString());
-
-                sink.buffer().write(mBuffer.array(), 0, readCount);
-
-                sink.flush();
-
-                Timber.v("Write " + readCount + " bytes to sink buffer with size " + sink.buffer().size());
-
-                mBuffer.clear();
-                if (mTransferred < maxCount) {  // condition to avoid accumulate progress for repeated chunks
-                    mTransferred += readCount;
-                }
-                synchronized (mDataTransferListeners) {
-                    it = mDataTransferListeners.iterator();
-                    while (it.hasNext()) {
-                        it.next().onTransferProgress(readCount, mTransferred, size, mFile.getAbsolutePath());
-                    }
-                }
-            }
-
-            Timber.v("Chunk with size " + mChunkSize + " written in request body");
-
-        } catch (Exception exception) {
-            Timber.e(exception);
-        }
-    }
-
-    public void setOffset(long offset) {
-        this.mOffset = offset;
-    }
-}

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/network/ChunkFromFileRequestBody.kt

@@ -0,0 +1,92 @@
+/* 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.common.network
+
+import com.owncloud.android.lib.resources.files.chunks.ChunkedUploadFromFileSystemOperation.Companion.CHUNK_SIZE
+import okhttp3.MediaType
+import okio.BufferedSink
+import timber.log.Timber
+import java.io.File
+import java.nio.ByteBuffer
+import java.nio.channels.FileChannel
+
+/**
+ * A Request body that represents a file chunk and include information about the progress when uploading it
+ *
+ * @author David González Verdugo
+ */
+class ChunkFromFileRequestBody(
+    file: File,
+    contentType: MediaType?,
+    private val channel: FileChannel,
+    private val chunkSize: Long = CHUNK_SIZE
+) : FileRequestBody(file, contentType) {
+
+    private var offset: Long = 0
+    private var alreadyTransferred: Long = 0
+    private val buffer = ByteBuffer.allocate(4_096)
+
+    init {
+        require(chunkSize > 0) { "Chunk size must be greater than zero" }
+    }
+
+    override fun contentLength(): Long {
+        return chunkSize.coerceAtMost(channel.size() - channel.position())
+    }
+
+    override fun writeTo(sink: BufferedSink) {
+        var readCount: Int
+        var iterator: Iterator<OnDatatransferProgressListener>
+        try {
+            channel.position(offset)
+
+            val maxCount = (offset + chunkSize).coerceAtMost(channel.size())
+            while (channel.position() < maxCount) {
+                readCount = channel.read(buffer)
+                val bytesToWriteInBuffer = readCount.toLong().coerceAtMost(file.length() - alreadyTransferred).toInt()
+                sink.buffer.write(buffer.array(), 0, bytesToWriteInBuffer)
+                sink.flush()
+                buffer.clear()
+
+                if (alreadyTransferred < maxCount) {  // condition to avoid accumulate progress for repeated chunks
+                    alreadyTransferred += readCount.toLong()
+                }
+
+                synchronized(dataTransferListeners) {
+                    iterator = dataTransferListeners.iterator()
+                    while (iterator.hasNext()) {
+                        iterator.next().onTransferProgress(readCount.toLong(), alreadyTransferred, file.length(), file.absolutePath)
+                    }
+                }
+            }
+        } catch (exception: Exception) {
+            Timber.e(exception, "Transferred " + alreadyTransferred + " bytes from a total of " + file.length())
+        }
+    }
+
+    fun setOffset(newOffset: Long) {
+        offset = newOffset
+    }
+
+}

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/network/ContentUriRequestBody.kt

@@ -0,0 +1,117 @@
+/* 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.common.network
+
+import android.content.ContentResolver
+import android.net.Uri
+import android.provider.OpenableColumns
+import okhttp3.MediaType
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.RequestBody
+import okio.BufferedSink
+import okio.Source
+import okio.source
+import timber.log.Timber
+import java.io.IOException
+
+class ContentUriRequestBody(
+    private val contentResolver: ContentResolver,
+    private val contentUri: Uri
+) : RequestBody(), ProgressiveDataTransferer {
+
+    private val dataTransferListeners: MutableSet<OnDatatransferProgressListener> = HashSet()
+
+    val fileSize: Long = contentResolver.query(contentUri, null, null, null, null)?.use { cursor ->
+        val sizeIndex = cursor.getColumnIndex(OpenableColumns.SIZE)
+        cursor.moveToFirst()
+        cursor.getLong(sizeIndex)
+    } ?: -1
+
+    override fun contentType(): MediaType? {
+        val contentType = contentResolver.getType(contentUri) ?: return null
+        return contentType.toMediaTypeOrNull()
+    }
+
+    override fun contentLength(): Long {
+        return fileSize
+    }
+
+    override fun writeTo(sink: BufferedSink) {
+        val inputStream = contentResolver.openInputStream(contentUri)
+            ?: throw IOException("Couldn't open content URI for reading: $contentUri")
+
+        val previousTime = System.currentTimeMillis()
+
+        sink.writeAndUpdateProgress(inputStream.source())
+        inputStream.source().close()
+
+        val laterTime = System.currentTimeMillis()
+
+        Timber.d("Difference - ${laterTime - previousTime} milliseconds")
+    }
+
+    private fun BufferedSink.writeAndUpdateProgress(source: Source) {
+        var iterator: Iterator<OnDatatransferProgressListener>
+
+        try {
+            var totalBytesRead = 0L
+            var read: Long
+            while (source.read(this.buffer, BYTES_TO_READ).also { read = it } != -1L) {
+                totalBytesRead += read
+                this.flush()
+                synchronized(dataTransferListeners) {
+                    iterator = dataTransferListeners.iterator()
+                    while (iterator.hasNext()) {
+                        iterator.next().onTransferProgress(read, totalBytesRead, fileSize, contentUri.toString())
+                    }
+                }
+            }
+        } catch (e: Exception) {
+            Timber.e(e)
+        }
+    }
+
+    override fun addDatatransferProgressListener(listener: OnDatatransferProgressListener) {
+        synchronized(dataTransferListeners) {
+            dataTransferListeners.add(listener)
+        }
+    }
+
+    override fun addDatatransferProgressListeners(listeners: MutableCollection<OnDatatransferProgressListener>) {
+        synchronized(dataTransferListeners) {
+            dataTransferListeners.addAll(listeners)
+        }
+    }
+
+    override fun removeDatatransferProgressListener(listener: OnDatatransferProgressListener) {
+        synchronized(dataTransferListeners) {
+            dataTransferListeners.remove(listener)
+        }
+    }
+
+    companion object {
+        private const val BYTES_TO_READ = 4_096L
+    }
+}

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/network/FileRequestBody.java

@@ -1,114 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   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
- *   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.common.network;
-
-import okhttp3.MediaType;
-import okhttp3.RequestBody;
-import okio.BufferedSink;
-import okio.Okio;
-import okio.Source;
-import timber.log.Timber;
-
-import java.io.File;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-/**
- * A Request body that represents a file and include information about the progress when uploading it
- *
- * @author David González Verdugo
- */
-public class FileRequestBody extends RequestBody implements ProgressiveDataTransferer {
-
-    protected File mFile;
-    private MediaType mContentType;
-    final Set<OnDatatransferProgressListener> mDataTransferListeners = new HashSet<>();
-
-    public FileRequestBody(File file, MediaType contentType) {
-        mFile = file;
-        mContentType = contentType;
-    }
-
-    @Override
-    public MediaType contentType() {
-        return mContentType;
-    }
-
-    @Override
-    public long contentLength() {
-        return mFile.length();
-    }
-
-    @Override
-    public void writeTo(BufferedSink sink) {
-        Source source;
-        Iterator<OnDatatransferProgressListener> it;
-        try {
-            source = Okio.source(mFile);
-
-            long transferred = 0;
-            long read;
-
-            while ((read = source.read(sink.buffer(), 4096)) != -1) {
-                transferred += read;
-                sink.flush();
-                synchronized (mDataTransferListeners) {
-                    it = mDataTransferListeners.iterator();
-                    while (it.hasNext()) {
-                        it.next().onTransferProgress(read, transferred, mFile.length(), mFile.getAbsolutePath());
-                    }
-                }
-            }
-
-            Timber.d("File with name " + mFile.getName() + " and size " + mFile.length() + " written in request body");
-
-        } catch (Exception e) {
-            Timber.e(e);
-        }
-    }
-
-    @Override
-    public void addDatatransferProgressListener(OnDatatransferProgressListener listener) {
-        synchronized (mDataTransferListeners) {
-            mDataTransferListeners.add(listener);
-        }
-    }
-
-    @Override
-    public void addDatatransferProgressListeners(Collection<OnDatatransferProgressListener> listeners) {
-        synchronized (mDataTransferListeners) {
-            mDataTransferListeners.addAll(listeners);
-        }
-    }
-
-    @Override
-    public void removeDatatransferProgressListener(OnDatatransferProgressListener listener) {
-        synchronized (mDataTransferListeners) {
-            mDataTransferListeners.remove(listener);
-        }
-    }
-}

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/network/FileRequestBody.kt

@@ -0,0 +1,97 @@
+/* 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.common.network
+
+import okhttp3.MediaType
+import okhttp3.RequestBody
+import okio.BufferedSink
+import okio.Source
+import okio.source
+import timber.log.Timber
+import java.io.File
+import java.util.HashSet
+
+/**
+ * A Request body that represents a file and include information about the progress when uploading it
+ *
+ * @author David González Verdugo
+ */
+open class FileRequestBody(
+    val file: File,
+    private val contentType: MediaType?,
+) : RequestBody(), ProgressiveDataTransferer {
+
+    val dataTransferListeners: MutableSet<OnDatatransferProgressListener> = HashSet()
+
+    override fun isOneShot(): Boolean = true
+
+    override fun contentType(): MediaType? = contentType
+
+    override fun contentLength(): Long = file.length()
+
+    override fun writeTo(sink: BufferedSink) {
+        val source: Source
+        var it: Iterator<OnDatatransferProgressListener>
+        try {
+            source = file.source()
+            var transferred: Long = 0
+            var read: Long
+            while (source.read(sink.buffer, BYTES_TO_READ).also { read = it } != -1L) {
+                transferred += read
+                sink.flush()
+                synchronized(dataTransferListeners) {
+                    it = dataTransferListeners.iterator()
+                    while (it.hasNext()) {
+                        it.next().onTransferProgress(read, transferred, file.length(), file.absolutePath)
+                    }
+                }
+            }
+            Timber.d("File with name ${file.name} and size ${file.length()} written in request body")
+        } catch (e: Exception) {
+            Timber.e(e)
+        }
+    }
+
+    override fun addDatatransferProgressListener(listener: OnDatatransferProgressListener) {
+        synchronized(dataTransferListeners) {
+            dataTransferListeners.add(listener)
+        }
+    }
+
+    override fun addDatatransferProgressListeners(listeners: Collection<OnDatatransferProgressListener>) {
+        synchronized(dataTransferListeners) {
+            dataTransferListeners.addAll(listeners)
+        }
+    }
+
+    override fun removeDatatransferProgressListener(listener: OnDatatransferProgressListener) {
+        synchronized(dataTransferListeners) {
+            dataTransferListeners.remove(listener)
+        }
+    }
+
+    companion object {
+        private const val BYTES_TO_READ = 4_096L
+    }
+}

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/network/WebdavUtils.java

@@ -34,9 +34,6 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
 
-import static com.owncloud.android.lib.common.OwnCloudClient.WEBDAV_FILES_PATH_4_0;
-import static com.owncloud.android.lib.common.OwnCloudClient.WEBDAV_PATH_4_0_AND_LATER;
-
 public class WebdavUtils {
 
     private static final SimpleDateFormat[] DATETIME_FORMATS = {

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

@@ -1,3 +1,27 @@
+/* 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.common.operations;
 
 import android.accounts.Account;
@@ -135,7 +159,7 @@ public abstract class RemoteOperation<T> implements Runnable {
             if (mAccount != null && mContext != null) {
                 OwnCloudAccount ocAccount = new OwnCloudAccount(mAccount, mContext);
                 mClient = SingleSessionManager.getDefaultSingleton().
-                        getClientFor(ocAccount, mContext);
+                        getClientFor(ocAccount, mContext, SingleSessionManager.getConnectionValidator());
             } else {
                 throw new IllegalStateException("Trying to run a remote operation " +
                         "asynchronously with no client and no chance to create one (no account)");
@@ -258,11 +282,6 @@ public abstract class RemoteOperation<T> implements Runnable {
 
         final RemoteOperationResult resultToSend = runOperation();
 
-        if (mAccount != null && mContext != null) {
-            // Save Client Cookies
-            AccountUtils.saveClient(mClient, mAccount, mContext);
-        }
-
         if (mListenerHandler != null && mListener != null) {
             mListenerHandler.post(() ->
                     mListener.onRemoteOperationFinish(RemoteOperation.this, resultToSend));
@@ -270,4 +289,4 @@ public abstract class RemoteOperation<T> implements Runnable {
             mListener.onRemoteOperationFinish(RemoteOperation.this, resultToSend);
         }
     }
-}
+}

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

@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2020 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
@@ -27,13 +27,14 @@ package com.owncloud.android.lib.common.operations;
 import android.accounts.Account;
 import android.accounts.AccountsException;
 
-import at.bitfire.dav4android.exception.DavException;
+import at.bitfire.dav4jvm.exception.DavException;
-import at.bitfire.dav4android.exception.HttpException;
+import at.bitfire.dav4jvm.exception.HttpException;
 import com.owncloud.android.lib.common.accounts.AccountUtils;
 import com.owncloud.android.lib.common.http.HttpConstants;
 import com.owncloud.android.lib.common.http.methods.HttpBaseMethod;
 import com.owncloud.android.lib.common.network.CertificateCombinedException;
 import okhttp3.Headers;
+import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.json.JSONException;
 import timber.log.Timber;
 
@@ -45,6 +46,7 @@ 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;
@@ -59,13 +61,15 @@ public class RemoteOperationResult<T>
      * Generated - should be refreshed every time the class changes!!
      */
     private static final long serialVersionUID = 4968939884332372230L;
+    private static final String LOCATION = "location";
+    private static final String WWW_AUTHENTICATE = "www-authenticate";
 
     private boolean mSuccess = false;
     private int mHttpCode = -1;
     private String mHttpPhrase = null;
     private Exception mException = null;
     private ResultCode mCode = ResultCode.UNKNOWN_ERROR;
-    private String mRedirectedLocation;
+    private String mRedirectedLocation = "";
     private List<String> mAuthenticate = new ArrayList<>();
     private String mLastPermanentLocation = null;
     private T mData = null;
@@ -112,6 +116,14 @@ public class RemoteOperationResult<T>
      */
     public RemoteOperationResult(Exception e) {
         mException = e;
+        //TODO: Do propper exception handling and remove this
+        Timber.e("---------------------------------" +
+                        "\nCreate RemoteOperationResult from exception." +
+                        "\n Message: %s" +
+                        "\n Stacktrace: %s" +
+                        "\n---------------------------------",
+                ExceptionUtils.getMessage(e),
+                ExceptionUtils.getStackTrace(e));
 
         if (e instanceof OperationCancelledException) {
             mCode = ResultCode.CANCELLED;
@@ -155,7 +167,10 @@ public class RemoteOperationResult<T>
         } else if (e instanceof FileNotFoundException) {
             mCode = ResultCode.LOCAL_FILE_NOT_FOUND;
 
-        } else {
+        } else if (e instanceof ProtocolException) {
+            mCode = ResultCode.NETWORK_ERROR;
+        }
+        else {
             mCode = ResultCode.UNKNOWN_ERROR;
         }
     }
@@ -226,6 +241,10 @@ public class RemoteOperationResult<T>
                         httpMethod.getResponseBodyAsString(),
                         ResultCode.SPECIFIC_METHOD_NOT_ALLOWED
                 );
+                break;
+            case HttpConstants.HTTP_TOO_EARLY:
+                mCode = ResultCode.TOO_EARLY;
+                break;
             default:
                 break;
         }
@@ -248,11 +267,11 @@ public class RemoteOperationResult<T>
         this(httpCode, httpPhrase);
         if (headers != null) {
             for (Map.Entry<String, List<String>> header : headers.toMultimap().entrySet()) {
-                if ("location".equals(header.getKey().toLowerCase())) {
+                if (LOCATION.equalsIgnoreCase(header.getKey())) {
                     mRedirectedLocation = header.getValue().get(0);
                     continue;
                 }
-                if ("www-authenticate".equals(header.getKey().toLowerCase())) {
+                if (WWW_AUTHENTICATE.equalsIgnoreCase(header.getKey())) {
                     for (String value: header.getValue()) {
                         mAuthenticate.add(value.toLowerCase());
                     }
@@ -321,7 +340,7 @@ public class RemoteOperationResult<T>
                     mHttpPhrase = errorMessage;
                 }
             } catch (Exception e) {
-                Timber.w("Error reading exception from server: %s", e.getMessage());
+                Timber.w("Error reading exception from server: %s\nTrace: %s", e.getMessage(), ExceptionUtils.getStackTrace(e));
                 // mCode stays as set in this(success, httpCode, headers)
             }
         }
@@ -572,6 +591,8 @@ public class RemoteOperationResult<T>
         SPECIFIC_SERVICE_UNAVAILABLE,
         SPECIFIC_UNSUPPORTED_MEDIA_TYPE,
         SPECIFIC_METHOD_NOT_ALLOWED,
-        SPECIFIC_BAD_REQUEST
+        SPECIFIC_BAD_REQUEST,
+        TOO_EARLY,
+        NETWORK_ERROR,
     }
 }

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/utils/AnyExt.kt

@@ -22,20 +22,8 @@
  *
  */
 
-package com.owncloud.android.lib.resources.shares;
+package com.owncloud.android.lib.common.utils
 
-/**
+fun Any.isOneOf(vararg values: Any): Boolean {
- * Contains Constants for Share Operation
+    return this in values
- *
- * @author masensio
- * @author David González Verdugo
- */
-
-public class ShareUtils {
-
-    // OCS Route
-    public static final String SHARING_API_PATH = "ocs/v2.php/apps/files_sharing/api/v1/shares";
-
-    // String to build the link with the token of a share:
-    public static final String SHARING_LINK_PATH = "/index.php/s/";
 }

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/utils/LoggingHelper.kt

@@ -1,3 +1,27 @@
+/* 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.common.utils
 
 import info.hannes.timber.FileLoggingTree
@@ -9,7 +33,7 @@ object LoggingHelper {
 
     fun startLogging(directory: File, storagePath: String) {
         fileLoggingTree()?.let {
-            Timber.forest().drop(Timber.forest().indexOf(it))
+            Timber.uproot(it)
         }
         if (!directory.exists())
             directory.mkdirs()
@@ -18,7 +42,7 @@ object LoggingHelper {
 
     fun stopLogging() {
         fileLoggingTree()?.let {
-            Timber.forest().drop(Timber.forest().indexOf(it))
+            Timber.uproot(it)
         }
     }
 }

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

@@ -21,8 +21,9 @@
  *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *   THE SOFTWARE.
  */
-package com.owncloud.android.lib.resources.response
+package com.owncloud.android.lib.resources
 
+import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
 // Response retrieved by OCS Rest API, used to obtain capabilities, shares and user info among others.
@@ -35,12 +36,17 @@ data class CommonOcsResponse<T>(
 @JsonClass(generateAdapter = true)
 data class OCSResponse<T>(
     val meta: MetaData,
-    val data: T
+    val data: T?
 )
 
 @JsonClass(generateAdapter = true)
 data class MetaData(
     val status: String,
-    val statuscode: Int,
+    @Json(name = "statuscode")
-    val message: String?
+    val statusCode: Int,
+    val message: String?,
+    @Json(name = "itemsperpage")
+    val itemsPerPage: String?,
+    @Json(name = "totalitems")
+    val totalItems: String?
 )

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

@@ -1,21 +1,27 @@
-/**
+/* ownCloud Android Library is available under MIT license
- * ownCloud Android client application
+ *   Copyright (C) 2022 ownCloud GmbH.
  *
- * @author David González Verdugo
+ *   @author David González Verdugo
  *
- * 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
+ *   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:
  *
- * This program is free software: you can redistribute it and/or modify
+ *   The above copyright notice and this permission notice shall be included in
- * it under the terms of the GNU General Public License version 2,
+ *   all copies or substantial portions of the Software.
- * as published by the Free Software Foundation.
+ *
+ *   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.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * <p>
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package com.owncloud.android.lib.resources

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

@@ -0,0 +1,108 @@
+/* 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

@@ -0,0 +1,78 @@
+/* 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/GetUrlToOpenInWebRemoteOperation.kt

@@ -0,0 +1,107 @@
+/* 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.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 GetUrlToOpenInWebRemoteOperation(
+    private val openWithWebEndpoint: String,
+    private val fileId: String,
+    private val appName: String,
+) : RemoteOperation<String>() {
+
+    override fun run(client: OwnCloudClient): RemoteOperationResult<String> {
+        return try {
+
+            val openInWebRequestBody = OpenInWebParams(fileId, appName).toRequestBody()
+
+            val stringUrl =
+                client.baseUri.toString() + WebdavUtils.encodePath(openWithWebEndpoint)
+
+            val postMethod = PostMethod(URL(stringUrl), openInWebRequestBody).apply {
+                setReadTimeout(TIMEOUT, TimeUnit.MILLISECONDS)
+                setConnectionTimeout(TIMEOUT, TimeUnit.MILLISECONDS)
+            }
+
+            val status = client.executeHttpMethod(postMethod)
+            Timber.d("Open in web for file: $fileId - $status${if (!isSuccess(status)) "(FAIL)" else ""}")
+
+            if (isSuccess(status)) RemoteOperationResult<String>(ResultCode.OK).apply {
+                val moshi = Moshi.Builder().build()
+                val adapter: JsonAdapter<OpenInWebResponse> = moshi.adapter(OpenInWebResponse::class.java)
+
+                data = postMethod.getResponseBodyAsString()?.let { adapter.fromJson(it)!!.uri }
+            }
+            else RemoteOperationResult<String>(postMethod).apply { data = "" }
+
+        } catch (e: Exception) {
+            val result = RemoteOperationResult<String>(e)
+            Timber.e(e, "Open in web for file: $fileId failed")
+            result
+        }
+    }
+
+    private fun isSuccess(status: Int) = status == HttpConstants.HTTP_OK
+
+    data class OpenInWebParams(
+        val fileId: String,
+        val appName: String,
+    ) {
+        fun toRequestBody(): RequestBody =
+            FormBody.Builder()
+                .add(PARAM_FILE_ID, fileId)
+                .add(PARAM_APP_NAME, appName)
+                .build()
+
+        companion object {
+            const val PARAM_FILE_ID = "file_id"
+            const val PARAM_APP_NAME = "app_name"
+        }
+    }
+
+    @JsonClass(generateAdapter = true)
+    data class OpenInWebResponse(val uri: String)
+
+    companion object {
+        /**
+         * Maximum time to wait for a response from the server in milliseconds.
+         */
+        private const val TIMEOUT = 5_000L
+    }
+}

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

@@ -0,0 +1,56 @@
+/* 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

@@ -0,0 +1,44 @@
+/* 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

@@ -0,0 +1,54 @@
+/* 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) 2020 ownCloud GmbH.
+*   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
@@ -25,9 +25,8 @@ 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
+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.RedirectionPath
 import com.owncloud.android.lib.common.network.WebdavUtils
 import com.owncloud.android.lib.common.operations.RemoteOperation
 import com.owncloud.android.lib.common.operations.RemoteOperationResult
@@ -42,41 +41,29 @@ 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 isUserLogged    When `true`, the username won't be added at the end of the PROPFIND url since is not
+ * @param isUserLoggedIn    When `true`, the username won't be added at the end of the PROPFIND url since is not
  *                        needed to check user credentials
  */
 class CheckPathExistenceRemoteOperation(
     val remotePath: String? = "",
-    val isUserLogged: Boolean
+    val isUserLoggedIn: Boolean,
+    val spaceWebDavUrl: String? = null,
 ) : RemoteOperation<Boolean>() {
-    /**
-     * Gets the sequence of redirections followed during the execution of the operation.
-     *
-     * @return Sequence of redirections followed, if any, or NULL if the operation was not executed.
-     */
-    var redirectionPath: RedirectionPath? = null
-        private set
 
     override fun run(client: OwnCloudClient): RemoteOperationResult<Boolean> {
-        val previousFollowRedirects = client.followRedirects()
+        val baseStringUrl = spaceWebDavUrl ?: if (isUserLoggedIn) client.userFilesWebDavUri.toString() else client.baseFilesWebDavUri.toString()
-        return try {
+        val stringUrl = if (isUserLoggedIn) baseStringUrl + WebdavUtils.encodePath(remotePath) else baseStringUrl
-            val stringUrl =
-                if (isUserLogged) client.baseFilesWebDavUri.toString()
-                else client.userFilesWebDavUri.toString() + WebdavUtils.encodePath(remotePath)
 
-            val propFindMethod = PropfindMethod(URL(stringUrl), 0, DavUtils.getAllPropset()).apply {
+        return try {
+            val propFindMethod = PropfindMethod(URL(stringUrl), 0, allPropSet).apply {
                 setReadTimeout(TIMEOUT.toLong(), TimeUnit.SECONDS)
                 setConnectionTimeout(TIMEOUT.toLong(), TimeUnit.SECONDS)
             }
 
-            client.setFollowRedirects(false)
+            val status = client.executeHttpMethod(propFindMethod)
-            var status = client.executeHttpMethod(propFindMethod)
-            if (previousFollowRedirects) {
-                redirectionPath = client.followRedirection(propFindMethod)
-                status = redirectionPath?.lastStatus!!
-            }
             /* PROPFIND method
              * 404 NOT FOUND: path doesn't exist,
              * 207 MULTI_STATUS: path exists.
@@ -91,19 +78,13 @@ class CheckPathExistenceRemoteOperation(
             val result = RemoteOperationResult<Boolean>(e)
             Timber.e(
                 e,
-                "Existence check for ${client.userFilesWebDavUri}${WebdavUtils.encodePath(remotePath)} : ${result.logMessage}"
+                "Existence check for $stringUrl : ${result.logMessage}"
             )
+            result.data = false
             result
-        } finally {
-            client.setFollowRedirects(previousFollowRedirects)
         }
     }
 
-    /**
-     * @return 'True' if the operation was executed and at least one redirection was followed.
-     */
-    fun wasRedirected() = redirectionPath?.redirectionsCount ?: 0 > 0
-
     private fun isSuccess(status: Int) = status == HttpConstants.HTTP_OK || status == HttpConstants.HTTP_MULTI_STATUS
 
     companion object {

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

@@ -1,129 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   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
- *   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.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.CopyMethod;
-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 timber.log.Timber;
-
-import java.net.URL;
-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.
- *
- * Allows renaming the moving file/folder at the same time.
- *
- * @author David A. Velasco
- * @author Christian Schabesberger
- * @author David González V.
- */
-public class CopyRemoteFileOperation extends RemoteOperation<String> {
-
-    private static final int COPY_READ_TIMEOUT = 600000;
-    private static final int COPY_CONNECTION_TIMEOUT = 5000;
-
-    private String mSrcRemotePath;
-    private String mTargetRemotePath;
-
-    private boolean mOverwrite;
-
-    /**
-     * Constructor.
-     * <p/>
-     * TODO Paths should finish in "/" in the case of folders. ?
-     *
-     * @param srcRemotePath    Remote path of the file/folder to move.
-     * @param targetRemotePath Remove path desired for the file/folder after moving it.
-     */
-    public CopyRemoteFileOperation(String srcRemotePath, String targetRemotePath, boolean overwrite
-    ) {
-        mSrcRemotePath = srcRemotePath;
-        mTargetRemotePath = targetRemotePath;
-        mOverwrite = overwrite;
-    }
-
-    /**
-     * Performs the rename operation.
-     *
-     * @param client Client object to communicate with the remote ownCloud server.
-     */
-    @Override
-    protected RemoteOperationResult<String> run(OwnCloudClient client) {
-
-        if (mTargetRemotePath.equals(mSrcRemotePath)) {
-            // nothing to do!
-            return new RemoteOperationResult<>(ResultCode.OK);
-        }
-
-        if (mTargetRemotePath.startsWith(mSrcRemotePath)) {
-            return new RemoteOperationResult<>(ResultCode.INVALID_COPY_INTO_DESCENDANT);
-        }
-
-        /// perform remote operation
-        RemoteOperationResult result;
-        try {
-            CopyMethod copyMethod =
-                    new CopyMethod(new URL(client.getUserFilesWebDavUri() + WebdavUtils.encodePath(mSrcRemotePath)),
-                    client.getUserFilesWebDavUri() + WebdavUtils.encodePath(mTargetRemotePath),
-                    mOverwrite);
-
-            copyMethod.setReadTimeout(COPY_READ_TIMEOUT, TimeUnit.SECONDS);
-            copyMethod.setConnectionTimeout(COPY_CONNECTION_TIMEOUT, TimeUnit.SECONDS);
-
-            final int status = client.executeHttpMethod(copyMethod);
-
-            if (status == HttpConstants.HTTP_CREATED || status == HttpConstants.HTTP_NO_CONTENT) {
-                String fileRemoteId = copyMethod.getResponseHeader(HttpConstants.OC_FILE_REMOTE_ID);
-                result = new RemoteOperationResult<>(ResultCode.OK);
-                result.setData(fileRemoteId);
-            } else if (status == HttpConstants.HTTP_PRECONDITION_FAILED && !mOverwrite) {
-                result = new RemoteOperationResult<>(ResultCode.INVALID_OVERWRITE);
-                client.exhaustResponse(copyMethod.getResponseBodyAsStream());
-
-                /// for other errors that could be explicitly handled, check first:
-                /// http://www.webdav.org/specs/rfc4918.html#rfc.section.9.9.4
-            } else {
-
-                result = new RemoteOperationResult<>(copyMethod);
-                client.exhaustResponse(copyMethod.getResponseBodyAsStream());
-            }
-
-            Timber.i("Copy " + mSrcRemotePath + " to " + mTargetRemotePath + ": " + result.getLogMessage());
-
-        } catch (Exception e) {
-            result = new RemoteOperationResult<>(e);
-            Timber.e(e, "Copy " + mSrcRemotePath + " to " + mTargetRemotePath + ": " + result.getLogMessage());
-        }
-
-        return result;
-    }
-}

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

@@ -0,0 +1,133 @@
+/* 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.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.CopyMethod
+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.common.utils.isOneOf
+import timber.log.Timber
+import java.net.URL
+import java.util.concurrent.TimeUnit
+
+/**
+ * Remote operation copying a remote file or folder in the ownCloud server to a different folder
+ * in the same account.
+ *
+ * Allows renaming the copying file/folder at the same time.
+ *
+ * @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 targetRemotePath Remote path desired for the file/folder to copy it.
+ */
+class CopyRemoteFileOperation(
+    private val sourceRemotePath: 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) {
+            // nothing to do!
+            return RemoteOperationResult(ResultCode.OK)
+        }
+        if (targetRemotePath.startsWith(sourceRemotePath) && sourceSpaceWebDavUrl == targetSpaceWebDavUrl) {
+            return RemoteOperationResult(ResultCode.INVALID_COPY_INTO_DESCENDANT)
+        }
+
+        /// perform remote operation
+        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,
+            ).apply {
+                addRequestHeaders(this)
+                setReadTimeout(COPY_READ_TIMEOUT, TimeUnit.SECONDS)
+                setConnectionTimeout(COPY_CONNECTION_TIMEOUT, TimeUnit.SECONDS)
+            }
+            val status = client.executeHttpMethod(copyMethod)
+            when {
+                isSuccess(status) -> {
+                    val fileRemoteId = copyMethod.getResponseHeader(HttpConstants.OC_FILE_REMOTE_ID)
+                    result = RemoteOperationResult(ResultCode.OK)
+                    result.setData(fileRemoteId)
+                }
+
+                isPreconditionFailed(status) -> {
+                    result = RemoteOperationResult(ResultCode.INVALID_OVERWRITE)
+                    client.exhaustResponse(copyMethod.getResponseBodyAsStream())
+
+                    /// 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}")
+        } catch (e: Exception) {
+            result = RemoteOperationResult(e)
+            Timber.e(e, "Copy $sourceRemotePath 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
+
+    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.java

@@ -1,113 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2019 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.files;
-
-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.webdav.MkColMethod;
-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 timber.log.Timber;
-
-import java.net.URL;
-import java.util.concurrent.TimeUnit;
-
-/**
- * Remote operation performing the creation of a new folder in the ownCloud server.
- *
- * @author David A. Velasco
- * @author masensio
- */
-public class CreateRemoteFolderOperation extends RemoteOperation {
-
-    private static final int READ_TIMEOUT = 30000;
-    private static final int CONNECTION_TIMEOUT = 5000;
-
-    private String mRemotePath;
-    private boolean mCreateFullPath;
-    protected boolean createChunksFolder;
-
-    /**
-     * Constructor
-     *
-     * @param remotePath     Full path to the new directory to create in the remote server.
-     * @param createFullPath 'True' means that all the ancestor folders should be created.
-     */
-    public CreateRemoteFolderOperation(String remotePath, boolean createFullPath) {
-        mRemotePath = remotePath;
-        mCreateFullPath = createFullPath;
-        createChunksFolder = false;
-    }
-
-    /**
-     * Performs the operation
-     *
-     * @param client Client object to communicate with the remote ownCloud server.
-     */
-    @Override
-    protected RemoteOperationResult run(OwnCloudClient client) {
-        RemoteOperationResult result = createFolder(client);
-        if (!result.isSuccess() && mCreateFullPath &&
-                RemoteOperationResult.ResultCode.CONFLICT == result.getCode()) {
-            result = createParentFolder(FileUtils.getParentPath(mRemotePath), client);
-            if (result.isSuccess()) {
-                result = createFolder(client);    // second (and last) try
-            }
-        }
-        return result;
-    }
-
-    private RemoteOperationResult createFolder(OwnCloudClient client) {
-        RemoteOperationResult result;
-        try {
-            Uri webDavUri = createChunksFolder ? client.getUploadsWebDavUri() : client.getUserFilesWebDavUri();
-            final MkColMethod mkcol = new MkColMethod(new URL(webDavUri + WebdavUtils.encodePath(mRemotePath)));
-            mkcol.setReadTimeout(READ_TIMEOUT, TimeUnit.SECONDS);
-            mkcol.setConnectionTimeout(CONNECTION_TIMEOUT, TimeUnit.SECONDS);
-            final int status = client.executeHttpMethod(mkcol);
-
-            result = (status == HttpConstants.HTTP_CREATED)
-                    ? new RemoteOperationResult<>(ResultCode.OK)
-                    : new RemoteOperationResult<>(mkcol);
-            Timber.d("Create directory " + mRemotePath + ": " + result.getLogMessage());
-            client.exhaustResponse(mkcol.getResponseBodyAsStream());
-
-        } catch (Exception e) {
-            result = new RemoteOperationResult<>(e);
-            Timber.e(e, "Create directory " + mRemotePath + ": " + result.getLogMessage());
-        }
-
-        return result;
-    }
-
-    private RemoteOperationResult createParentFolder(String parentPath, OwnCloudClient client) {
-        RemoteOperation operation = new CreateRemoteFolderOperation(parentPath, mCreateFullPath);
-        return operation.execute(client);
-    }
-}

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

@@ -0,0 +1,110 @@
+/* ownCloud Android Library is available under MIT license
+ *   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
+ *   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.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.MkColMethod
+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 timber.log.Timber
+import java.net.URL
+import java.util.concurrent.TimeUnit
+
+/**
+ * Remote operation performing the creation of a new folder in the ownCloud server.
+ *
+ * @author David A. Velasco
+ * @author masensio
+ *
+ * @param remotePath     Full path to the new directory to create in the remote server.
+ * @param createFullPath 'True' means that all the ancestor folders should be created.
+ */
+class CreateRemoteFolderOperation(
+    val remotePath: String,
+    private val createFullPath: Boolean,
+    private val isChunksFolder: Boolean = false,
+    val spaceWebDavUrl: String? = null,
+) : RemoteOperation<Unit>() {
+
+    override fun run(client: OwnCloudClient): RemoteOperationResult<Unit> {
+
+        var result = createFolder(client)
+        if (!result.isSuccess && createFullPath && result.code == ResultCode.CONFLICT) {
+            result = createParentFolder(FileUtils.getParentPath(remotePath), client)
+
+            if (result.isSuccess) {
+                // Second and last try
+                result = createFolder(client)
+            }
+        }
+        return result
+    }
+
+    private fun createFolder(client: OwnCloudClient): RemoteOperationResult<Unit> {
+        var result: RemoteOperationResult<Unit>
+        try {
+            val webDavUri = if (isChunksFolder) {
+                client.uploadsWebDavUri.toString()
+            } else {
+                spaceWebDavUrl ?: client.userFilesWebDavUri.toString()
+            }
+
+            val mkCol = MkColMethod(
+                URL(webDavUri + WebdavUtils.encodePath(remotePath))
+            ).apply {
+                setReadTimeout(READ_TIMEOUT, TimeUnit.SECONDS)
+                setConnectionTimeout(CONNECTION_TIMEOUT, TimeUnit.SECONDS)
+            }
+
+            val status = client.executeHttpMethod(mkCol)
+            result =
+                if (status == HttpConstants.HTTP_CREATED) {
+                    RemoteOperationResult(ResultCode.OK)
+                } else {
+                    RemoteOperationResult(mkCol)
+                }
+
+            Timber.d("Create directory $remotePath: ${result.logMessage}")
+            client.exhaustResponse(mkCol.getResponseBodyAsStream())
+
+        } catch (e: Exception) {
+            result = RemoteOperationResult(e)
+            Timber.e(e, "Create directory $remotePath: ${result.logMessage}")
+        }
+        return result
+    }
+
+    private fun createParentFolder(parentPath: String, client: OwnCloudClient): RemoteOperationResult<Unit> {
+        val operation: RemoteOperation<Unit> = CreateRemoteFolderOperation(parentPath, createFullPath)
+        return operation.execute(client)
+    }
+
+    companion object {
+        private const val READ_TIMEOUT: Long = 30_000
+        private const val CONNECTION_TIMEOUT: Long = 5_000
+    }
+}

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

@@ -1,219 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   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
- *   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.files;
-
-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.network.OnDatatransferProgressListener;
-import com.owncloud.android.lib.common.network.WebdavUtils;
-import com.owncloud.android.lib.common.operations.OperationCancelledException;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
-import com.owncloud.android.lib.common.operations.RemoteOperationResult;
-import timber.log.Timber;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.net.URL;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-/**
- * Remote operation performing the download of a remote file in the ownCloud server.
- *
- * @author David A. Velasco
- * @author masensio
- */
-
-public class DownloadRemoteFileOperation extends RemoteOperation {
-
-    private static final int FORBIDDEN_ERROR = 403;
-    private static final int SERVICE_UNAVAILABLE_ERROR = 503;
-    private final AtomicBoolean mCancellationRequested = new AtomicBoolean(false);
-    private Set<OnDatatransferProgressListener> mDataTransferListeners = new HashSet<>();
-    private long mModificationTimestamp = 0;
-    private String mEtag = "";
-    private GetMethod mGet;
-
-    private String mRemotePath;
-    private String mLocalFolderPath;
-
-    public DownloadRemoteFileOperation(String remotePath, String localFolderPath) {
-        mRemotePath = remotePath;
-        mLocalFolderPath = localFolderPath;
-    }
-
-    @Override
-    protected RemoteOperationResult run(OwnCloudClient client) {
-        RemoteOperationResult result;
-
-        /// download will be performed to a temporal file, then moved to the final location
-        File tmpFile = new File(getTmpPath());
-
-        /// perform the download
-        try {
-            tmpFile.getParentFile().mkdirs();
-            result = downloadFile(client, tmpFile);
-            Timber.i("Download of " + mRemotePath + " to " + getTmpPath() + ": " + result.getLogMessage());
-
-        } catch (Exception e) {
-            result = new RemoteOperationResult<>(e);
-            Timber.e(e, "Download of " + mRemotePath + " to " + getTmpPath() + ": " + result.getLogMessage());
-        }
-
-        return result;
-    }
-
-    private RemoteOperationResult downloadFile(OwnCloudClient client, File targetFile) throws
-            Exception {
-
-        RemoteOperationResult result;
-        int status;
-        boolean savedFile = false;
-        mGet = new GetMethod(new URL(client.getUserFilesWebDavUri() + WebdavUtils.encodePath(mRemotePath)));
-        Iterator<OnDatatransferProgressListener> it;
-
-        FileOutputStream fos = null;
-        BufferedInputStream bis = null;
-        try {
-            status = client.executeHttpMethod(mGet);
-            if (isSuccess(status)) {
-                targetFile.createNewFile();
-                bis = new BufferedInputStream(mGet.getResponseBodyAsStream());
-                fos = new FileOutputStream(targetFile);
-                long transferred = 0;
-
-                String contentLength = mGet.getResponseHeader(HttpConstants.CONTENT_LENGTH_HEADER);
-                long totalToTransfer =
-                        (contentLength != null
-                                && contentLength.length() > 0)
-                                ? Long.parseLong(contentLength)
-                                : 0;
-
-                byte[] bytes = new byte[4096];
-                int readResult;
-                while ((readResult = bis.read(bytes)) != -1) {
-                    synchronized (mCancellationRequested) {
-                        if (mCancellationRequested.get()) {
-                            mGet.abort();
-                            throw new OperationCancelledException();
-                        }
-                    }
-                    fos.write(bytes, 0, readResult);
-                    transferred += readResult;
-                    synchronized (mDataTransferListeners) {
-                        it = mDataTransferListeners.iterator();
-                        while (it.hasNext()) {
-                            it.next().onTransferProgress(readResult, transferred, totalToTransfer,
-                                    targetFile.getName());
-                        }
-                    }
-                }
-                if (transferred == totalToTransfer) {  // Check if the file is completed
-                    savedFile = true;
-                    final String modificationTime =
-                            mGet.getResponseHeaders().get("Last-Modified") != null
-                                    ? mGet.getResponseHeaders().get("Last-Modified")
-                                    : mGet.getResponseHeader("last-modified");
-
-                    if (modificationTime != null) {
-                        final Date d = WebdavUtils.parseResponseDate(modificationTime);
-                        mModificationTimestamp = (d != null) ? d.getTime() : 0;
-                    } else {
-                        Timber.e("Could not read modification time from response downloading %s", mRemotePath);
-                    }
-
-                    mEtag = WebdavUtils.getEtagFromResponse(mGet);
-
-                    // Get rid of extra quotas
-                    mEtag = mEtag.replace("\"", "");
-
-                    if (mEtag.length() == 0) {
-                        Timber.e("Could not read eTag from response downloading %s", mRemotePath);
-                    }
-
-                } else {
-                    client.exhaustResponse(mGet.getResponseBodyAsStream());
-                    // TODO some kind of error control!
-                }
-
-            } else if (status != FORBIDDEN_ERROR && status != SERVICE_UNAVAILABLE_ERROR) {
-                client.exhaustResponse(mGet.getResponseBodyAsStream());
-
-            } // else, body read by RemoteOperationResult constructor
-
-            result = isSuccess(status)
-                    ? new RemoteOperationResult<>(RemoteOperationResult.ResultCode.OK)
-                    : new RemoteOperationResult<>(mGet);
-        } finally {
-            if (fos != null) {
-                fos.close();
-            }
-            if (bis != null) {
-                bis.close();
-            }
-            if (!savedFile && targetFile.exists()) {
-                targetFile.delete();
-            }
-        }
-        return result;
-    }
-
-    private boolean isSuccess(int status) {
-        return (status == HttpConstants.HTTP_OK);
-    }
-
-    private String getTmpPath() {
-        return mLocalFolderPath + mRemotePath;
-    }
-
-    public void addDatatransferProgressListener(OnDatatransferProgressListener listener) {
-        synchronized (mDataTransferListeners) {
-            mDataTransferListeners.add(listener);
-        }
-    }
-
-    public void removeDatatransferProgressListener(OnDatatransferProgressListener listener) {
-        synchronized (mDataTransferListeners) {
-            mDataTransferListeners.remove(listener);
-        }
-    }
-
-    public void cancel() {
-        mCancellationRequested.set(true);   // atomic set; there is no need of synchronizing it
-    }
-
-    public long getModificationTimestamp() {
-        return mModificationTimestamp;
-    }
-
-    public String getEtag() {
-        return mEtag;
-    }
-}

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

@@ -0,0 +1,185 @@
+/* ownCloud Android Library is available under MIT license
+ *   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
+ *   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.files
+
+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.network.OnDatatransferProgressListener
+import com.owncloud.android.lib.common.network.WebdavUtils
+import com.owncloud.android.lib.common.operations.OperationCancelledException
+import com.owncloud.android.lib.common.operations.RemoteOperation
+import com.owncloud.android.lib.common.operations.RemoteOperationResult
+import timber.log.Timber
+import java.io.BufferedInputStream
+import java.io.File
+import java.io.FileOutputStream
+import java.net.URL
+import java.util.concurrent.atomic.AtomicBoolean
+
+/**
+ * Remote operation performing the download of a remote file in the ownCloud server.
+ *
+ * @author David A. Velasco
+ * @author masensio
+ */
+class DownloadRemoteFileOperation(
+    private val remotePath: String,
+    localFolderPath: String,
+    private val spaceWebDavUrl: String? = null,
+) : RemoteOperation<Unit>() {
+
+    private val cancellationRequested = AtomicBoolean(false)
+    private val dataTransferListeners: MutableSet<OnDatatransferProgressListener> = HashSet()
+
+    var modificationTimestamp: Long = 0
+        private set
+
+    var etag: String = ""
+        private set
+
+    override fun run(client: OwnCloudClient): RemoteOperationResult<Unit> {
+        // download will be performed to a temporal file, then moved to the final location
+        val tmpFile = File(tmpPath)
+
+        // perform the download
+        return try {
+            tmpFile.parentFile?.mkdirs()
+            downloadFile(client, tmpFile).also { result ->
+                Timber.i("Download of $remotePath to $tmpPath: ${result.logMessage}")
+            }
+        } catch (e: Exception) {
+            RemoteOperationResult<Unit>(e).also { result ->
+                Timber.e(e, "Download of $remotePath to $tmpPath: ${result.logMessage}")
+            }
+        }
+    }
+
+    @Throws(Exception::class)
+    private fun downloadFile(client: OwnCloudClient, targetFile: File): RemoteOperationResult<Unit> {
+        val result: RemoteOperationResult<Unit>
+        var it: Iterator<OnDatatransferProgressListener>
+        var fos: FileOutputStream? = null
+        var bis: BufferedInputStream? = null
+        var savedFile = false
+
+        val webDavUri = spaceWebDavUrl ?: client.userFilesWebDavUri.toString()
+        val getMethod = GetMethod(URL(webDavUri + WebdavUtils.encodePath(remotePath)))
+
+        try {
+            val status = client.executeHttpMethod(getMethod)
+
+            if (isSuccess(status)) {
+                targetFile.createNewFile()
+                bis = BufferedInputStream(getMethod.getResponseBodyAsStream())
+                fos = FileOutputStream(targetFile)
+                var transferred: Long = 0
+                val contentLength = getMethod.getResponseHeader(HttpConstants.CONTENT_LENGTH_HEADER)
+                val totalToTransfer = if (!contentLength.isNullOrEmpty()) {
+                    contentLength.toLong()
+                } else {
+                    0
+                }
+                val bytes = ByteArray(4096)
+                var readResult: Int
+                while (bis.read(bytes).also { readResult = it } != -1) {
+                    synchronized(cancellationRequested) {
+                        if (cancellationRequested.get()) {
+                            getMethod.abort()
+                            throw OperationCancelledException()
+                        }
+                    }
+                    fos.write(bytes, 0, readResult)
+                    transferred += readResult.toLong()
+                    synchronized(dataTransferListeners) {
+                        it = dataTransferListeners.iterator()
+                        while (it.hasNext()) {
+                            it.next()
+                                .onTransferProgress(readResult.toLong(), transferred, totalToTransfer, targetFile.name)
+                        }
+                    }
+                }
+
+                if (transferred == totalToTransfer) {  // Check if the file is completed
+                    savedFile = true
+                    val modificationTime =
+                        getMethod.getResponseHeaders()?.get("Last-Modified")
+                            ?: getMethod.getResponseHeader("last-modified")
+
+                    if (modificationTime != null) {
+                        val modificationDate = WebdavUtils.parseResponseDate(modificationTime)
+                        modificationTimestamp = modificationDate?.time ?: 0
+                    } else {
+                        Timber.e("Could not read modification time from response downloading %s", remotePath)
+                    }
+                    etag = WebdavUtils.getEtagFromResponse(getMethod)
+
+                    // Get rid of extra quotas
+                    etag = etag.replace("\"", "")
+                    if (etag.isEmpty()) {
+                        Timber.e("Could not read eTag from response downloading %s", remotePath)
+                    }
+                } else {
+                    Timber.e("Content-Length not equal to transferred bytes.")
+                    Timber.d("totalToTransfer = $totalToTransfer, transferred = $transferred")
+                    client.exhaustResponse(getMethod.getResponseBodyAsStream())
+                    // TODO some kind of error control!
+                }
+
+            } else if (status != HttpConstants.HTTP_FORBIDDEN && status != HttpConstants.HTTP_SERVICE_UNAVAILABLE) {
+                client.exhaustResponse(getMethod.getResponseBodyAsStream())
+            } // else, body read by RemoteOperationResult constructor
+
+            result =
+                if (isSuccess(status)) {
+                    RemoteOperationResult(RemoteOperationResult.ResultCode.OK)
+                } else {
+                    RemoteOperationResult(getMethod)
+                }
+        } finally {
+            fos?.close()
+            bis?.close()
+            if (!savedFile && targetFile.exists()) {
+                targetFile.delete()
+            }
+        }
+        return result
+    }
+
+    private fun isSuccess(status: Int) = status == HttpConstants.HTTP_OK
+
+    private val tmpPath: String = localFolderPath + remotePath
+
+    fun addDatatransferProgressListener(listener: OnDatatransferProgressListener) {
+        synchronized(dataTransferListeners) { dataTransferListeners.add(listener) }
+    }
+
+    fun removeDatatransferProgressListener(listener: OnDatatransferProgressListener?) {
+        synchronized(dataTransferListeners) { dataTransferListeners.remove(listener) }
+    }
+
+    fun cancel() {
+        cancellationRequested.set(true) // atomic set; there is no need of synchronizing it
+    }
+}

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

@@ -29,12 +29,14 @@ import timber.log.Timber;
 import java.io.File;
 
 public class FileUtils {
-    public static final String PATH_SEPARATOR = "/";
     public static final String FINAL_CHUNKS_FILE = ".file";
+    public static final String MIME_DIR = "DIR";
+    public static final String MIME_DIR_UNIX = "httpd/unix-directory";
+    public static final String MODE_READ_ONLY = "r";
 
     static String getParentPath(String remotePath) {
         String parentPath = new File(remotePath).getParent();
-        parentPath = parentPath.endsWith(PATH_SEPARATOR) ? parentPath : parentPath + PATH_SEPARATOR;
+        parentPath = parentPath.endsWith(File.separator) ? parentPath : parentPath + File.separator;
         return parentPath;
     }
 
@@ -42,14 +44,12 @@ public class FileUtils {
      * Validate the fileName to detect if contains any forbidden character: / , \ , < , > ,
      * : , " , | , ? , *
      *
-     * @param fileName
-     * @return
      */
     public static boolean isValidName(String fileName) {
         boolean result = true;
 
         Timber.d("fileName =======%s", fileName);
-        if (fileName.contains(PATH_SEPARATOR)) {
+        if (fileName.contains(File.separator)) {
             result = false;
         }
         return result;

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

@@ -0,0 +1,77 @@
+/* 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.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
+import com.owncloud.android.lib.common.http.methods.webdav.PropfindMethod
+import com.owncloud.android.lib.common.operations.RemoteOperation
+import com.owncloud.android.lib.common.operations.RemoteOperationResult
+import timber.log.Timber
+import java.net.URL
+import java.util.concurrent.TimeUnit
+
+/**
+ * Operation to get the base url, which might differ in case of a redirect.
+ *
+ * @author Christian Schabesberger
+ */
+
+class GetBaseUrlRemoteOperation : RemoteOperation<String?>() {
+    override fun run(client: OwnCloudClient): RemoteOperationResult<String?> {
+        return try {
+            val stringUrl = client.baseFilesWebDavUri.toString()
+
+            val propFindMethod = PropfindMethod(URL(stringUrl), 0, DavUtils.allPropSet).apply {
+                setReadTimeout(TIMEOUT, TimeUnit.SECONDS)
+                setConnectionTimeout(TIMEOUT, TimeUnit.SECONDS)
+            }
+
+            val status = client.executeHttpMethod(propFindMethod)
+
+            if (isSuccess(status)) {
+                RemoteOperationResult<String?>(RemoteOperationResult.ResultCode.OK).apply {
+                    data = propFindMethod.getFinalUrl().toString()
+                }
+            } else {
+                RemoteOperationResult<String?>(propFindMethod).apply {
+                    data = null
+                }
+            }
+        } catch (e: Exception) {
+            Timber.e(e, "Could not get actuall (or redirected) base URL from base url (/).")
+            RemoteOperationResult<String?>(e)
+        }
+    }
+
+    private fun isSuccess(status: Int) = status == HttpConstants.HTTP_OK || status == HttpConstants.HTTP_MULTI_STATUS
+
+    companion object {
+        /**
+         * Maximum time to wait for a response from the server in milliseconds.
+         */
+        private const val TIMEOUT = 10_000L
+    }
+}

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

@@ -1,146 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   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
- *   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.files;
-
-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.webdav.MoveMethod;
-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 timber.log.Timber;
-
-import java.net.URL;
-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.
- * <p>
- * Allows renaming the moving file/folder at the same time.
- *
- * @author David A. Velasco
- * @author David González Verdugo
- */
-public class MoveRemoteFileOperation extends RemoteOperation {
-
-    private static final int MOVE_READ_TIMEOUT = 600000;
-    private static final int MOVE_CONNECTION_TIMEOUT = 5000;
-
-    private String mSrcRemotePath;
-    private String mTargetRemotePath;
-    private boolean mOverwrite;
-
-    protected boolean moveChunkedFile = false;
-    protected String mFileLastModifTimestamp;
-    protected long mFileLength;
-
-    /**
-     * Constructor.
-     * <p>
-     * TODO Paths should finish in "/" in the case of folders. ?
-     *
-     * @param srcRemotePath    Remote path of the file/folder to move.
-     * @param targetRemotePath Remote path desired for the file/folder after moving it.
-     */
-    public MoveRemoteFileOperation(String srcRemotePath,
-                                   String targetRemotePath,
-                                   boolean overwrite) {
-
-        mSrcRemotePath = srcRemotePath;
-        mTargetRemotePath = targetRemotePath;
-        mOverwrite = overwrite;
-    }
-
-    /**
-     * Performs the rename operation.
-     *
-     * @param client Client object to communicate with the remote ownCloud server.
-     */
-    @Override
-    protected RemoteOperationResult run(OwnCloudClient client) {
-        if (mTargetRemotePath.equals(mSrcRemotePath)) {
-            // nothing to do!
-            return new RemoteOperationResult<>(ResultCode.OK);
-        }
-
-        if (mTargetRemotePath.startsWith(mSrcRemotePath)) {
-            return new RemoteOperationResult<>(ResultCode.INVALID_MOVE_INTO_DESCENDANT);
-        }
-
-        /// perform remote operation
-        RemoteOperationResult result;
-        try {
-            // After finishing a chunked upload, we have to move the resulting file from uploads folder to files one,
-            // so this uri has to be customizable
-            Uri srcWebDavUri = moveChunkedFile ? client.getUploadsWebDavUri() : client.getUserFilesWebDavUri();
-
-            final MoveMethod move = new MoveMethod(
-                    new URL(srcWebDavUri + WebdavUtils.encodePath(mSrcRemotePath)),
-                    client.getUserFilesWebDavUri() + WebdavUtils.encodePath(mTargetRemotePath),
-                    mOverwrite);
-
-            if (moveChunkedFile) {
-                move.addRequestHeader(HttpConstants.OC_X_OC_MTIME_HEADER, mFileLastModifTimestamp);
-                move.addRequestHeader(HttpConstants.OC_TOTAL_LENGTH_HEADER, String.valueOf(mFileLength));
-            }
-
-            move.setReadTimeout(MOVE_READ_TIMEOUT, TimeUnit.SECONDS);
-            move.setConnectionTimeout(MOVE_CONNECTION_TIMEOUT, TimeUnit.SECONDS);
-
-            final int status = client.executeHttpMethod(move);
-            /// process response
-            if (isSuccess(status)) {
-                result = new RemoteOperationResult<>(ResultCode.OK);
-            } else if (status == HttpConstants.HTTP_PRECONDITION_FAILED && !mOverwrite) {
-
-                result = new RemoteOperationResult<>(ResultCode.INVALID_OVERWRITE);
-                client.exhaustResponse(move.getResponseBodyAsStream());
-
-                /// for other errors that could be explicitly handled, check first:
-                /// http://www.webdav.org/specs/rfc4918.html#rfc.section.9.9.4
-
-            } else {
-                result = new RemoteOperationResult<>(move);
-                client.exhaustResponse(move.getResponseBodyAsStream());
-            }
-
-            Timber.i("Move " + mSrcRemotePath + " to " + mTargetRemotePath + ": " + result.getLogMessage());
-
-        } catch (Exception e) {
-            result = new RemoteOperationResult<>(e);
-            Timber.e(e, "Move " + mSrcRemotePath + " to " + mTargetRemotePath + ": " + result.getLogMessage());
-        }
-
-        return result;
-    }
-
-    protected boolean isSuccess(int status) {
-        return status == HttpConstants.HTTP_CREATED || status == HttpConstants.HTTP_NO_CONTENT;
-    }
-}

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

@@ -0,0 +1,149 @@
+/* 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.files
+
+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.webdav.MoveMethod
+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.common.utils.isOneOf
+import timber.log.Timber
+import java.net.URL
+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.
+ *
+ * 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>() {
+
+    /**
+     * Performs the rename operation.
+     *
+     * @param client Client object to communicate with the remote ownCloud server.
+     */
+    override fun run(client: OwnCloudClient): RemoteOperationResult<Unit> {
+        if (targetRemotePath == sourceRemotePath) {
+            // nothing to do!
+            return RemoteOperationResult(ResultCode.OK)
+        }
+
+        if (targetRemotePath.startsWith(sourceRemotePath)) {
+            return RemoteOperationResult(ResultCode.INVALID_MOVE_INTO_DESCENDANT)
+        }
+
+        /// perform remote operation
+        var result: RemoteOperationResult<Unit>
+        try {
+            // After finishing a chunked upload, we have to move the resulting file from uploads folder to files one,
+            // 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,
+            ).apply {
+                addRequestHeaders(this)
+                setReadTimeout(MOVE_READ_TIMEOUT, TimeUnit.SECONDS)
+                setConnectionTimeout(MOVE_CONNECTION_TIMEOUT, TimeUnit.SECONDS)
+            }
+
+            val status = client.executeHttpMethod(moveMethod)
+
+            when {
+                isSuccess(status) -> {
+                    result = RemoteOperationResult<Unit>(ResultCode.OK)
+                }
+
+                isPreconditionFailed(status) -> {
+                    result = RemoteOperationResult<Unit>(ResultCode.INVALID_OVERWRITE)
+                    client.exhaustResponse(moveMethod.getResponseBodyAsStream())
+
+                    /// 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())
+                }
+            }
+
+            Timber.i("Move $sourceRemotePath to $targetRemotePath: ${result.logMessage}")
+        } catch (e: Exception) {
+            result = RemoteOperationResult<Unit>(e)
+            Timber.e(e, "Move $sourceRemotePath to $targetRemotePath: ${result.logMessage}")
+
+        }
+        return result
+    }
+
+    /**
+     * For standard moves, we will use [OwnCloudClient.getUserFilesWebDavUri].
+     * In case we need a different source Uri, override this method.
+     */
+    open fun getSrcWebDavUriForClient(client: OwnCloudClient): Uri = client.userFilesWebDavUri
+
+    /**
+     * For standard moves, we won't need any special headers.
+     * 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)
+
+    private fun isPreconditionFailed(status: Int) = status == HttpConstants.HTTP_PRECONDITION_FAILED
+
+    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.java

@@ -1,107 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   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
- *   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.files;
-
-import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.accounts.AccountUtils;
-import com.owncloud.android.lib.common.http.HttpConstants;
-import com.owncloud.android.lib.common.http.methods.webdav.DavUtils;
-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;
-import com.owncloud.android.lib.common.operations.RemoteOperationResult;
-import timber.log.Timber;
-
-import java.net.URL;
-import java.util.concurrent.TimeUnit;
-
-import static com.owncloud.android.lib.common.http.methods.webdav.DavConstants.DEPTH_0;
-import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
-
-/**
- * Remote operation performing the read a file from the ownCloud server.
- *
- * @author David A. Velasco
- * @author masensio
- * @author David González Verdugo
- */
-
-public class ReadRemoteFileOperation extends RemoteOperation<RemoteFile> {
-
-    private static final int SYNC_READ_TIMEOUT = 40000;
-    private static final int SYNC_CONNECTION_TIMEOUT = 5000;
-
-    private String mRemotePath;
-
-    /**
-     * Constructor
-     *
-     * @param remotePath Remote path of the file.
-     */
-    public ReadRemoteFileOperation(String remotePath) {
-        mRemotePath = remotePath;
-    }
-
-    /**
-     * Performs the read operation.
-     *
-     * @param client Client object to communicate with the remote ownCloud server.
-     */
-    @Override
-    protected RemoteOperationResult<RemoteFile> run(OwnCloudClient client) {
-        PropfindMethod propfind;
-        RemoteOperationResult<RemoteFile> result;
-
-        /// take the duty of check the server for the current state of the file there
-        try {
-            // remote request
-            propfind = new PropfindMethod(new URL(client.getUserFilesWebDavUri() + WebdavUtils.encodePath(mRemotePath)),
-                    DEPTH_0,
-                    DavUtils.getAllPropset());
-
-            propfind.setReadTimeout(SYNC_READ_TIMEOUT, TimeUnit.SECONDS);
-            propfind.setConnectionTimeout(SYNC_CONNECTION_TIMEOUT, TimeUnit.SECONDS);
-            final int status = client.executeHttpMethod(propfind);
-
-            if (status == HttpConstants.HTTP_MULTI_STATUS
-                    || status == HttpConstants.HTTP_OK) {
-
-                final RemoteFile file = new RemoteFile(propfind.getRoot(), AccountUtils.getUserId(mAccount, mContext));
-
-                result = new RemoteOperationResult<>(OK);
-                result.setData(file);
-
-            } else {
-                result = new RemoteOperationResult<>(propfind);
-                client.exhaustResponse(propfind.getResponseBodyAsStream());
-            }
-
-        } catch (Exception e) {
-            result = new RemoteOperationResult<>(e);
-            Timber.e(e, "Synchronizing  file %s", mRemotePath);
-        }
-
-        return result;
-    }
-}

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

@@ -0,0 +1,107 @@
+/* ownCloud Android Library is available under MIT license
+ *   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
+ *   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.files
+
+import com.owncloud.android.lib.common.OwnCloudClient
+import com.owncloud.android.lib.common.accounts.AccountUtils
+import com.owncloud.android.lib.common.http.HttpConstants.HTTP_MULTI_STATUS
+import com.owncloud.android.lib.common.http.HttpConstants.HTTP_OK
+import com.owncloud.android.lib.common.http.methods.webdav.DavConstants.DEPTH_0
+import com.owncloud.android.lib.common.http.methods.webdav.DavUtils
+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
+import com.owncloud.android.lib.common.operations.RemoteOperationResult
+import com.owncloud.android.lib.common.utils.isOneOf
+import timber.log.Timber
+import java.net.URL
+import java.util.concurrent.TimeUnit
+
+/**
+ * Remote operation performing the read a file from the ownCloud server.
+ *
+ * @author David A. Velasco
+ * @author masensio
+ * @author David González Verdugo
+ */
+
+class ReadRemoteFileOperation(
+    val remotePath: String,
+    val spaceWebDavUrl: String? = null,
+) : RemoteOperation<RemoteFile>() {
+
+    /**
+     * Performs the read operation.
+     *
+     * @param client Client object to communicate with the remote ownCloud server.
+     */
+    @Override
+    override fun run(client: OwnCloudClient): RemoteOperationResult<RemoteFile> {
+        try {
+            val propFind = PropfindMethod(
+                url = getFinalWebDavUrl(),
+                depth = DEPTH_0,
+                propertiesToRequest = DavUtils.allPropSet
+            ).apply {
+                setReadTimeout(SYNC_READ_TIMEOUT, TimeUnit.SECONDS)
+                setConnectionTimeout(SYNC_CONNECTION_TIMEOUT, TimeUnit.SECONDS)
+            }
+
+            val status = client.executeHttpMethod(propFind)
+            Timber.i("Read remote file $remotePath with status ${propFind.statusCode}")
+
+            return if (isSuccess(status)) {
+                val remoteFile = RemoteFile.getRemoteFileFromDav(
+                    davResource = propFind.root!!,
+                    userId = AccountUtils.getUserId(mAccount, mContext),
+                    userName = mAccount.name,
+                    spaceWebDavUrl = spaceWebDavUrl,
+                )
+
+                RemoteOperationResult<RemoteFile>(RemoteOperationResult.ResultCode.OK).apply {
+                    data = remoteFile
+                }
+            } else {
+                RemoteOperationResult<RemoteFile>(propFind).also {
+                    client.exhaustResponse(propFind.getResponseBodyAsStream())
+                }
+            }
+        } catch (exception: Exception) {
+            return RemoteOperationResult(exception)
+        }
+    }
+
+    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 {
+        private const val SYNC_READ_TIMEOUT = 40_000L
+        private const val SYNC_CONNECTION_TIMEOUT = 5_000L
+    }
+}

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

@@ -1,128 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   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
- *   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.files;
-
-import at.bitfire.dav4android.Response;
-import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.accounts.AccountUtils;
-import com.owncloud.android.lib.common.http.HttpConstants;
-import com.owncloud.android.lib.common.http.methods.webdav.DavConstants;
-import com.owncloud.android.lib.common.http.methods.webdav.DavUtils;
-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;
-import com.owncloud.android.lib.common.operations.RemoteOperationResult;
-import timber.log.Timber;
-
-import java.net.URL;
-import java.util.ArrayList;
-
-import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
-
-/**
- * Remote operation performing the read of remote file or folder in the ownCloud server.
- *
- * @author David A. Velasco
- * @author masensio
- * @author David González Verdugo
- */
-
-public class ReadRemoteFolderOperation extends RemoteOperation<ArrayList<RemoteFile>> {
-
-    private String mRemotePath;
-
-    /**
-     * Constructor
-     *
-     * @param remotePath Remote path of the file.
-     */
-    public ReadRemoteFolderOperation(String remotePath) {
-        mRemotePath = remotePath;
-    }
-
-    /**
-     * Performs the read operation.
-     *
-     * @param client Client object to communicate with the remote ownCloud server.
-     */
-    @Override
-    protected RemoteOperationResult<ArrayList<RemoteFile>> run(OwnCloudClient client) {
-        RemoteOperationResult<ArrayList<RemoteFile>> result = null;
-
-        try {
-            PropfindMethod propfindMethod = new PropfindMethod(
-                    new URL(client.getUserFilesWebDavUri() + WebdavUtils.encodePath(mRemotePath)),
-                    DavConstants.DEPTH_1,
-                    DavUtils.getAllPropset());
-
-            client.setFollowRedirects(true);
-
-            int status = client.executeHttpMethod(propfindMethod);
-
-            if (isSuccess(status)) {
-                ArrayList<RemoteFile> mFolderAndFiles = new ArrayList<>();
-
-                // parse data from remote folder
-                mFolderAndFiles.add(
-                        new RemoteFile(propfindMethod.getRoot(), AccountUtils.getUserId(mAccount, mContext))
-                );
-
-                // loop to update every child
-                for (Response resource : propfindMethod.getMembers()) {
-                    RemoteFile file = new RemoteFile(resource, AccountUtils.getUserId(mAccount, mContext));
-                    mFolderAndFiles.add(file);
-                }
-
-                // Result of the operation
-                result = new RemoteOperationResult<>(OK);
-                result.setData(mFolderAndFiles);
-
-            } else { // synchronization failed
-                result = new RemoteOperationResult<>(propfindMethod);
-            }
-
-        } catch (Exception e) {
-            result = new RemoteOperationResult<>(e);
-        } finally {
-            if (result == null) {
-                Timber.e("Synchronized " + mRemotePath + ": result is null");
-            } else if (result.isSuccess()) {
-                Timber.i("Synchronized " + mRemotePath + ": " + result.getLogMessage());
-            } else {
-                if (result.isException()) {
-                    Timber.e(result.getException(), "Synchronized " + mRemotePath + ": " + result.getLogMessage());
-                } else {
-                    Timber.e("Synchronized " + mRemotePath + ": " + result.getLogMessage());
-                }
-            }
-        }
-        return result;
-    }
-
-    private boolean isSuccess(int status) {
-        return status == HttpConstants.HTTP_MULTI_STATUS ||
-                status == HttpConstants.HTTP_OK;
-    }
-}

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

@@ -0,0 +1,118 @@
+/* ownCloud Android Library is available under MIT license
+ *   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
+ *   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.files
+
+import at.bitfire.dav4jvm.PropertyRegistry
+import com.owncloud.android.lib.common.OwnCloudClient
+import com.owncloud.android.lib.common.accounts.AccountUtils
+import com.owncloud.android.lib.common.http.HttpConstants.HTTP_MULTI_STATUS
+import com.owncloud.android.lib.common.http.HttpConstants.HTTP_OK
+import com.owncloud.android.lib.common.http.methods.webdav.DavConstants
+import com.owncloud.android.lib.common.http.methods.webdav.DavUtils
+import com.owncloud.android.lib.common.http.methods.webdav.PropfindMethod
+import com.owncloud.android.lib.common.http.methods.webdav.properties.OCShareTypes
+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.common.utils.isOneOf
+import timber.log.Timber
+import java.net.URL
+
+/**
+ * Remote operation performing the read of remote file or folder in the ownCloud server.
+ *
+ * @author David A. Velasco
+ * @author masensio
+ * @author David González Verdugo
+ */
+class ReadRemoteFolderOperation(
+    val remotePath: String,
+    val spaceWebDavUrl: String? = null,
+) : RemoteOperation<ArrayList<RemoteFile>>() {
+
+    /**
+     * Performs the read operation.
+     *
+     * @param client Client object to communicate with the remote ownCloud server.
+     */
+    override fun run(client: OwnCloudClient): RemoteOperationResult<ArrayList<RemoteFile>> {
+        try {
+            PropertyRegistry.register(OCShareTypes.Factory())
+
+            val propfindMethod = PropfindMethod(
+                getFinalWebDavUrl(),
+                DavConstants.DEPTH_1,
+                DavUtils.allPropSet
+            )
+
+            val status = client.executeHttpMethod(propfindMethod)
+
+            if (isSuccess(status)) {
+                val mFolderAndFiles = ArrayList<RemoteFile>()
+
+                val remoteFolder = RemoteFile.getRemoteFileFromDav(
+                    davResource = propfindMethod.root!!,
+                    userId = AccountUtils.getUserId(mAccount, mContext),
+                    userName = mAccount.name,
+                    spaceWebDavUrl = spaceWebDavUrl,
+                )
+                mFolderAndFiles.add(remoteFolder)
+
+                // loop to update every child
+                propfindMethod.members.forEach { resource ->
+                    val remoteFile = RemoteFile.getRemoteFileFromDav(
+                        davResource = resource,
+                        userId = AccountUtils.getUserId(mAccount, mContext),
+                        userName = mAccount.name,
+                        spaceWebDavUrl = spaceWebDavUrl,
+                    )
+                    mFolderAndFiles.add(remoteFile)
+                }
+
+                // Result of the operation
+                return RemoteOperationResult<ArrayList<RemoteFile>>(ResultCode.OK).apply {
+                    data = mFolderAndFiles
+                    Timber.i("Synchronized $remotePath with ${mFolderAndFiles.size} files. ${this.logMessage}")
+                }
+            } else { // synchronization failed
+                return RemoteOperationResult<ArrayList<RemoteFile>>(propfindMethod).also {
+                    Timber.w("Synchronized $remotePath ${it.logMessage}")
+                }
+            }
+        } catch (e: Exception) {
+            return RemoteOperationResult<ArrayList<RemoteFile>>(e).also {
+                Timber.e(it.exception, "Synchronized $remotePath")
+            }
+        }
+    }
+
+    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.java

@@ -1,312 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   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
- *   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.files;
-
-import android.os.Parcel;
-import android.os.Parcelable;
-
-import at.bitfire.dav4android.Property;
-import at.bitfire.dav4android.Response;
-import at.bitfire.dav4android.property.CreationDate;
-import at.bitfire.dav4android.property.GetContentLength;
-import at.bitfire.dav4android.property.GetContentType;
-import at.bitfire.dav4android.property.GetETag;
-import at.bitfire.dav4android.property.GetLastModified;
-import at.bitfire.dav4android.property.QuotaAvailableBytes;
-import at.bitfire.dav4android.property.QuotaUsedBytes;
-import at.bitfire.dav4android.property.owncloud.OCId;
-import at.bitfire.dav4android.property.owncloud.OCPermissions;
-import at.bitfire.dav4android.property.owncloud.OCPrivatelink;
-import at.bitfire.dav4android.property.owncloud.OCSize;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.List;
-
-/**
- * Contains the data of a Remote File from a WebDavEntry
- *
- * @author masensio
- * @author Christian Schabesberger
- */
-
-public class RemoteFile implements Parcelable, Serializable {
-
-    /**
-     * Parcelable Methods
-     */
-    public static final Parcelable.Creator<RemoteFile> CREATOR = new Parcelable.Creator<RemoteFile>() {
-        @Override
-        public RemoteFile createFromParcel(Parcel source) {
-            return new RemoteFile(source);
-        }
-
-        @Override
-        public RemoteFile[] newArray(int size) {
-            return new RemoteFile[size];
-        }
-    };
-    /**
-     * Generated - should be refreshed every time the class changes!!
-     */
-    private static final long serialVersionUID = -8965995357413958539L;
-    private String mRemotePath;
-    private String mMimeType;
-    private long mLength;
-    private long mCreationTimestamp;
-    private long mModifiedTimestamp;
-    private String mEtag;
-    private String mPermissions;
-    private String mRemoteId;
-    private long mSize;
-    private BigDecimal mQuotaUsedBytes;
-    private BigDecimal mQuotaAvailableBytes;
-    private String mPrivateLink;
-
-    public RemoteFile() {
-        resetData();
-    }
-
-    /**
-     * Create new {@link RemoteFile} with given path.
-     * <p>
-     * The path received must be URL-decoded. Path separator must be OCFile.PATH_SEPARATOR, and it must be the first character in 'path'.
-     *
-     * @param path The remote path of the file.
-     */
-    public RemoteFile(String path) {
-        resetData();
-        if (path == null || path.length() <= 0 || !path.startsWith(FileUtils.PATH_SEPARATOR)) {
-            throw new IllegalArgumentException("Trying to create a OCFile with a non valid remote path: " + path);
-        }
-        mRemotePath = path;
-        mCreationTimestamp = 0;
-        mLength = 0;
-        mMimeType = "DIR";
-        mQuotaUsedBytes = BigDecimal.ZERO;
-        mQuotaAvailableBytes = BigDecimal.ZERO;
-        mPrivateLink = null;
-    }
-
-    public RemoteFile(final Response davResource, String userId) {
-        this(RemoteFileUtil.Companion.getRemotePathFromUrl(davResource.getHref(), userId));
-        final List<Property> properties = davResource.getProperties();
-
-        for (Property property : properties) {
-            if (property instanceof CreationDate) {
-                this.setCreationTimestamp(
-                        Long.parseLong(((CreationDate) property).getCreationDate()));
-            }
-            if (property instanceof GetContentLength) {
-                this.setLength(((GetContentLength) property).getContentLength());
-            }
-            if (property instanceof GetContentType) {
-                this.setMimeType(((GetContentType) property).getType());
-            }
-            if (property instanceof GetLastModified) {
-                this.setModifiedTimestamp(((GetLastModified) property).getLastModified());
-            }
-            if (property instanceof GetETag) {
-                this.setEtag(((GetETag) property).getETag());
-            }
-            if (property instanceof OCPermissions) {
-                this.setPermissions(((OCPermissions) property).getPermission());
-            }
-            if (property instanceof OCId) {
-                this.setRemoteId(((OCId) property).getId());
-            }
-            if (property instanceof OCSize) {
-                this.setSize(((OCSize) property).getSize());
-            }
-            if (property instanceof QuotaUsedBytes) {
-                this.setQuotaUsedBytes(
-                        BigDecimal.valueOf(((QuotaUsedBytes) property).getQuotaUsedBytes()));
-            }
-            if (property instanceof QuotaAvailableBytes) {
-                this.setQuotaAvailableBytes(
-                        BigDecimal.valueOf(((QuotaAvailableBytes) property).getQuotaAvailableBytes()));
-            }
-            if (property instanceof OCPrivatelink) {
-                this.setPrivateLink(((OCPrivatelink) property).getLink());
-            }
-        }
-    }
-
-    /**
-     * Reconstruct from parcel
-     *
-     * @param source The source parcel
-     */
-    protected RemoteFile(Parcel source) {
-        readFromParcel(source);
-    }
-
-
-    /**
-     * Getters and Setters
-     */
-
-    public String getRemotePath() {
-        return mRemotePath;
-    }
-
-    public void setRemotePath(String remotePath) {
-        this.mRemotePath = remotePath;
-    }
-
-    public String getMimeType() {
-        return mMimeType;
-    }
-
-    public void setMimeType(String mimeType) {
-        this.mMimeType = mimeType;
-    }
-
-    public long getLength() {
-        return mLength;
-    }
-
-    public void setLength(long length) {
-        this.mLength = length;
-    }
-
-    public long getCreationTimestamp() {
-        return mCreationTimestamp;
-    }
-
-    public void setCreationTimestamp(long creationTimestamp) {
-        this.mCreationTimestamp = creationTimestamp;
-    }
-
-    public long getModifiedTimestamp() {
-        return mModifiedTimestamp;
-    }
-
-    public void setModifiedTimestamp(long modifiedTimestamp) {
-        this.mModifiedTimestamp = modifiedTimestamp;
-    }
-
-    public String getEtag() {
-        return mEtag;
-    }
-
-    public void setEtag(String etag) {
-        this.mEtag = etag;
-    }
-
-    public String getPermissions() {
-        return mPermissions;
-    }
-
-    public void setPermissions(String permissions) {
-        this.mPermissions = permissions;
-    }
-
-    public String getRemoteId() {
-        return mRemoteId;
-    }
-
-    public void setRemoteId(String remoteId) {
-        this.mRemoteId = remoteId;
-    }
-
-    public long getSize() {
-        return mSize;
-    }
-
-    public void setSize(long size) {
-        mSize = size;
-    }
-
-    public void setQuotaUsedBytes(BigDecimal quotaUsedBytes) {
-        mQuotaUsedBytes = quotaUsedBytes;
-    }
-
-    public void setQuotaAvailableBytes(BigDecimal quotaAvailableBytes) {
-        mQuotaAvailableBytes = quotaAvailableBytes;
-    }
-
-    public String getPrivateLink() {
-        return mPrivateLink;
-    }
-
-    public void setPrivateLink(String privateLink) {
-        mPrivateLink = privateLink;
-    }
-
-    /**
-     * Used internally. Reset all file properties
-     */
-    private void resetData() {
-        mRemotePath = null;
-        mMimeType = null;
-        mLength = 0;
-        mCreationTimestamp = 0;
-        mModifiedTimestamp = 0;
-        mEtag = null;
-        mPermissions = null;
-        mRemoteId = null;
-        mSize = 0;
-        mQuotaUsedBytes = null;
-        mQuotaAvailableBytes = null;
-        mPrivateLink = null;
-    }
-
-    public void readFromParcel(Parcel source) {
-        mRemotePath = source.readString();
-        mMimeType = source.readString();
-        mLength = source.readLong();
-        mCreationTimestamp = source.readLong();
-        mModifiedTimestamp = source.readLong();
-        mEtag = source.readString();
-        mPermissions = source.readString();
-        mRemoteId = source.readString();
-        mSize = source.readLong();
-        mQuotaUsedBytes = (BigDecimal) source.readSerializable();
-        mQuotaAvailableBytes = (BigDecimal) source.readSerializable();
-        mPrivateLink = source.readString();
-    }
-
-    @Override
-    public int describeContents() {
-        return this.hashCode();
-    }
-
-    @Override
-    public void writeToParcel(Parcel dest, int flags) {
-        dest.writeString(mRemotePath);
-        dest.writeString(mMimeType);
-        dest.writeLong(mLength);
-        dest.writeLong(mCreationTimestamp);
-        dest.writeLong(mModifiedTimestamp);
-        dest.writeString(mEtag);
-        dest.writeString(mPermissions);
-        dest.writeString(mRemoteId);
-        dest.writeLong(mSize);
-        dest.writeSerializable(mQuotaUsedBytes);
-        dest.writeSerializable(mQuotaAvailableBytes);
-        dest.writeString(mPrivateLink);
-    }
-}

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

@@ -0,0 +1,194 @@
+/* ownCloud Android Library is available under MIT license
+ *   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
+ *   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.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
+import at.bitfire.dav4jvm.property.CreationDate
+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 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
+import com.owncloud.android.lib.common.utils.isOneOf
+import com.owncloud.android.lib.resources.shares.ShareType
+import com.owncloud.android.lib.resources.shares.ShareType.Companion.fromValue
+import kotlinx.parcelize.Parcelize
+import okhttp3.HttpUrl
+import timber.log.Timber
+import java.io.File
+
+/**
+ * Contains the data of a Remote File from a WebDavEntry
+ *
+ * The path received must be URL-decoded. Path separator must be File.separator, and it must be the first character in 'path'.
+ *
+ * @author masensio
+ * @author Christian Schabesberger
+ * @author Abel García de Prada
+ */
+@Parcelize
+data class RemoteFile(
+    var remotePath: String,
+    var mimeType: String = "DIR",
+    var length: Long = 0,
+    var creationTimestamp: Long = 0,
+    var modifiedTimestamp: Long = 0,
+    var etag: String? = null,
+    var permissions: String? = null,
+    var remoteId: String? = null,
+    var size: Long = 0,
+    var privateLink: String? = null,
+    var owner: String,
+    var sharedByLink: Boolean = false,
+    var sharedWithSharee: Boolean = false,
+) : Parcelable {
+
+    // TODO: Quotas not used. Use or remove them.
+    init {
+        require(
+            !(remotePath.isEmpty() || !remotePath.startsWith(File.separator))
+        ) { "Trying to create a OCFile with a non valid remote path: $remotePath" }
+    }
+
+    /**
+     * Use this to find out if this file is a folder.
+     *
+     * @return true if it is a folder
+     */
+    val isFolder
+        get() = mimeType.isOneOf(MIME_DIR, MIME_DIR_UNIX)
+
+    companion object {
+
+        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)
+            val remoteFile = RemoteFile(remotePath = remotePath, owner = userName)
+            val properties = getPropertiesEvenIfPostProcessing(davResource)
+
+            for (property in properties) {
+                when (property) {
+                    is CreationDate -> {
+                        remoteFile.creationTimestamp = property.creationDate.toLong()
+                    }
+                    is GetContentLength -> {
+                        remoteFile.length = property.contentLength
+                    }
+                    is GetContentType -> {
+                        property.type?.let { remoteFile.mimeType = it }
+                    }
+                    is GetLastModified -> {
+                        remoteFile.modifiedTimestamp = property.lastModified
+                    }
+                    is GetETag -> {
+                        remoteFile.etag = property.eTag
+                    }
+                    is OCPermissions -> {
+                        remoteFile.permissions = property.permission
+                    }
+                    is OCId -> {
+                        remoteFile.remoteId = property.id
+                    }
+                    is OCSize -> {
+                        remoteFile.size = property.size
+                    }
+                    is OCPrivatelink -> {
+                        remoteFile.privateLink = property.link
+                    }
+                    is OCShareTypes -> {
+                        val list = property.shareTypes
+                        for (i in list.indices) {
+                            val shareType = fromValue(list[i].toInt())
+                            if (shareType == null) {
+                                Timber.d("Illegal share type value: " + list[i])
+                                continue
+                            }
+                            if (shareType == ShareType.PUBLIC_LINK) {
+                                remoteFile.sharedByLink = true
+                            } else if (shareType == ShareType.USER || shareType == ShareType.FEDERATED || shareType == ShareType.GROUP) {
+                                remoteFile.sharedWithSharee = true
+                            }
+                        }
+                    }
+                }
+            }
+            return 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
+         *
+         * @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)
+            val pathToOc = absoluteDavPath.split(davFilesPath).first()
+            return absoluteDavPath.replace(pathToOc + davFilesPath, "")
+        }
+
+        private fun getPropertiesEvenIfPostProcessing(response: Response): List<Property> {
+            return if (response.isSuccess())
+                response.propstat.filter { propStat -> propStat.isSuccessOrPostProcessing() }.map { it.properties }.flatten()
+            else
+                emptyList()
+        }
+
+        private fun PropStat.isSuccessOrPostProcessing() = (status.code / 100 == 2 || status.code == HttpConstants.HTTP_TOO_EARLY)
+    }
+}

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

@@ -1,96 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   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
- *   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.files;
-
-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.DeleteMethod;
-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 timber.log.Timber;
-
-import java.net.URL;
-
-import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
-
-/**
- * Remote operation performing the removal of a remote file or folder in the ownCloud server.
- *
- * @author David A. Velasco
- * @author masensio
- * @author David González Verdugo
- */
-public class RemoveRemoteFileOperation extends RemoteOperation {
-    private String mRemotePath;
-
-    protected boolean removeChunksFolder = false;
-
-    /**
-     * Constructor
-     *
-     * @param remotePath RemotePath of the remote file or folder to remove from the server
-     */
-    public RemoveRemoteFileOperation(String remotePath) {
-        mRemotePath = remotePath;
-    }
-
-    /**
-     * Performs the rename operation.
-     *
-     * @param client Client object to communicate with the remote ownCloud server.
-     */
-    @Override
-    protected RemoteOperationResult run(OwnCloudClient client) {
-        RemoteOperationResult result;
-
-        try {
-            Uri srcWebDavUri = removeChunksFolder ? client.getUploadsWebDavUri() : client.getUserFilesWebDavUri();
-
-            DeleteMethod deleteMethod = new DeleteMethod(
-                    new URL(srcWebDavUri + WebdavUtils.encodePath(mRemotePath)));
-
-            int status = client.executeHttpMethod(deleteMethod);
-
-            result = isSuccess(status) ?
-                    new RemoteOperationResult<>(OK) :
-                    new RemoteOperationResult<>(deleteMethod);
-
-            Timber.i("Remove " + mRemotePath + ": " + result.getLogMessage());
-
-        } catch (Exception e) {
-            result = new RemoteOperationResult<>(e);
-            Timber.e(e, "Remove " + mRemotePath + ": " + result.getLogMessage());
-        }
-
-        return result;
-    }
-
-    private boolean isSuccess(int status) {
-        return status == HttpConstants.HTTP_OK || status == HttpConstants.HTTP_NO_CONTENT;
-    }
-}

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

@@ -0,0 +1,81 @@
+/* ownCloud Android Library is available under MIT license
+ *   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
+ *   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.files
+
+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
+import com.owncloud.android.lib.common.http.methods.nonwebdav.DeleteMethod
+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.common.utils.isOneOf
+import timber.log.Timber
+import java.net.URL
+
+/**
+ * Remote operation performing the removal of a remote file or folder in the ownCloud server.
+ *
+ * @author David A. Velasco
+ * @author masensio
+ * @author David González Verdugo
+ * @author Abel García de Prada
+ */
+open class RemoveRemoteFileOperation(
+    private val remotePath: String,
+    val spaceWebDavUrl: String? = null,
+) : RemoteOperation<Unit>() {
+
+    override fun run(client: OwnCloudClient): RemoteOperationResult<Unit> {
+        var result: RemoteOperationResult<Unit>
+        try {
+            val srcWebDavUri = getSrcWebDavUriForClient(client)
+            val deleteMethod = DeleteMethod(
+                URL(srcWebDavUri + WebdavUtils.encodePath(remotePath))
+            )
+            val status = client.executeHttpMethod(deleteMethod)
+
+            result = if (isSuccess(status)) {
+                RemoteOperationResult<Unit>(ResultCode.OK)
+            } else {
+                RemoteOperationResult<Unit>(deleteMethod)
+            }
+            Timber.i("Remove $remotePath: ${result.logMessage}")
+        } catch (e: Exception) {
+            result = RemoteOperationResult<Unit>(e)
+            Timber.e(e, "Remove $remotePath: ${result.logMessage}")
+        }
+        return result
+    }
+
+    /**
+     * 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()
+
+    private fun isSuccess(status: Int) = status.isOneOf(HTTP_OK, HTTP_NO_CONTENT)
+}

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

@@ -1,131 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2019 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.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.MoveMethod;
-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 timber.log.Timber;
-
-import java.io.File;
-import java.net.URL;
-import java.util.concurrent.TimeUnit;
-
-/**
- * Remote operation performing the rename of a remote file or folder in the ownCloud server.
- *
- * @author David A. Velasco
- * @author masensio
- */
-public class RenameRemoteFileOperation extends RemoteOperation {
-
-    private static final int RENAME_READ_TIMEOUT = 600000;
-    private static final int RENAME_CONNECTION_TIMEOUT = 5000;
-
-    private String mOldName;
-    private String mOldRemotePath;
-    private String mNewName;
-    private String mNewRemotePath;
-
-    /**
-     * Constructor
-     *
-     * @param oldName       Old name of the file.
-     * @param oldRemotePath Old remote path of the file.
-     * @param newName       New name to set as the name of file.
-     * @param isFolder      'true' for folder and 'false' for files
-     */
-    public RenameRemoteFileOperation(String oldName, String oldRemotePath, String newName,
-                                     boolean isFolder) {
-        mOldName = oldName;
-        mOldRemotePath = oldRemotePath;
-        mNewName = newName;
-
-        String parent = (new File(mOldRemotePath)).getParent();
-        parent = (parent.endsWith(FileUtils.PATH_SEPARATOR)) ? parent : parent +
-                FileUtils.PATH_SEPARATOR;
-        mNewRemotePath = parent + mNewName;
-        if (isFolder) {
-            mNewRemotePath += FileUtils.PATH_SEPARATOR;
-        }
-    }
-
-    /**
-     * Performs the rename operation.
-     *
-     * @param client Client object to communicate with the remote ownCloud server.
-     */
-    @Override
-    protected RemoteOperationResult run(OwnCloudClient client) {
-        try {
-            if (mNewName.equals(mOldName)) {
-                return new RemoteOperationResult<>(ResultCode.OK);
-            }
-
-            if (targetPathIsUsed(client)) {
-                return new RemoteOperationResult<>(ResultCode.INVALID_OVERWRITE);
-            }
-
-            final MoveMethod move = new MoveMethod(new URL(client.getUserFilesWebDavUri() +
-                    WebdavUtils.encodePath(mOldRemotePath)),
-                    client.getUserFilesWebDavUri() + WebdavUtils.encodePath(mNewRemotePath), false);
-
-            move.setReadTimeout(RENAME_READ_TIMEOUT, TimeUnit.SECONDS);
-            move.setConnectionTimeout(RENAME_READ_TIMEOUT, TimeUnit.SECONDS);
-
-            final int status = client.executeHttpMethod(move);
-            final RemoteOperationResult result =
-                    (status == HttpConstants.HTTP_CREATED || status == HttpConstants.HTTP_NO_CONTENT)
-                            ? new RemoteOperationResult<>(ResultCode.OK)
-                            : new RemoteOperationResult<>(move);
-
-            Timber.i("Rename " + mOldRemotePath + " to " + mNewRemotePath + ": " + result.getLogMessage());
-            client.exhaustResponse(move.getResponseBodyAsStream());
-            return result;
-        } catch (Exception e) {
-            final RemoteOperationResult result = new RemoteOperationResult<>(e);
-            Timber.e(e,
-                    "Rename " + mOldRemotePath + " to " + ((mNewRemotePath == null) ? mNewName : mNewRemotePath) + ":" +
-                            " " + result.getLogMessage());
-            return result;
-        }
-    }
-
-    /**
-     * Checks if a file with the new name already exists.
-     *
-     * @return 'True' if the target path is already used by an existing file.
-     */
-    private boolean targetPathIsUsed(OwnCloudClient client) {
-        CheckPathExistenceRemoteOperation checkPathExistenceRemoteOperation =
-                new CheckPathExistenceRemoteOperation(mNewRemotePath, false);
-        RemoteOperationResult exists = checkPathExistenceRemoteOperation.execute(client);
-        return exists.isSuccess();
-    }
-}

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

@@ -0,0 +1,120 @@
+/* ownCloud Android Library is available under MIT license
+ *   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
+ *   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.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.MoveMethod
+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.common.utils.isOneOf
+import timber.log.Timber
+import java.io.File
+import java.net.URL
+import java.util.concurrent.TimeUnit
+
+/**
+ * Remote operation performing the rename of a remote file or folder in the ownCloud server.
+ *
+ * @author David A. Velasco
+ * @author masensio
+ */
+class RenameRemoteFileOperation(
+    private val oldName: String,
+    private val oldRemotePath: String,
+    private val newName: String,
+    isFolder: Boolean,
+    val spaceWebDavUrl: String? = null,
+) : RemoteOperation<Unit>() {
+
+    private var newRemotePath: String
+
+    init {
+        var parent = (File(oldRemotePath)).parent ?: throw IllegalArgumentException()
+        if (!parent.endsWith(File.separator)) {
+            parent = parent.plus(File.separator)
+        }
+        newRemotePath = parent.plus(newName)
+        if (isFolder) {
+            newRemotePath.plus(File.separator)
+        }
+    }
+
+    override fun run(client: OwnCloudClient): RemoteOperationResult<Unit> {
+        var result: RemoteOperationResult<Unit>
+        try {
+            if (newName == oldName) {
+                return RemoteOperationResult<Unit>(ResultCode.OK)
+            }
+
+            if (targetPathIsUsed(client)) {
+                return RemoteOperationResult<Unit>(ResultCode.INVALID_OVERWRITE)
+            }
+
+            val moveMethod: MoveMethod = MoveMethod(
+                url = URL((spaceWebDavUrl ?: client.userFilesWebDavUri.toString()) + WebdavUtils.encodePath(oldRemotePath)),
+                destinationUrl = (spaceWebDavUrl ?: client.userFilesWebDavUri.toString()) + WebdavUtils.encodePath(newRemotePath),
+            ).apply {
+                setReadTimeout(RENAME_READ_TIMEOUT, TimeUnit.MILLISECONDS)
+                setConnectionTimeout(RENAME_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
+            }
+            val status = client.executeHttpMethod(moveMethod)
+
+            result = if (isSuccess(status)) {
+                RemoteOperationResult<Unit>(ResultCode.OK)
+            } else {
+                RemoteOperationResult<Unit>(moveMethod)
+            }
+
+            Timber.i("Rename $oldRemotePath to $newRemotePath: ${result.logMessage}")
+            client.exhaustResponse(moveMethod.getResponseBodyAsStream())
+            return result
+        } catch (exception: Exception) {
+            result = RemoteOperationResult<Unit>(exception)
+            Timber.e(exception, "Rename $oldRemotePath to $newName: ${result.logMessage}")
+            return result
+        }
+    }
+
+    /**
+     * Checks if a file with the new name already exists.
+     *
+     * @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 exists = checkPathExistenceRemoteOperation.execute(client)
+        return exists.isSuccess
+    }
+
+    private fun isSuccess(status: Int) = status.isOneOf(HttpConstants.HTTP_CREATED, HttpConstants.HTTP_NO_CONTENT)
+
+    companion object {
+        private const val RENAME_READ_TIMEOUT = 10_000L
+        private const val RENAME_CONNECTION_TIMEOUT = 5_000L
+    }
+}

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

@@ -0,0 +1,68 @@
+/* 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.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.PutMethod
+import com.owncloud.android.lib.common.network.ContentUriRequestBody
+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.utils.isOneOf
+import timber.log.Timber
+import java.net.URL
+
+class UploadFileFromContentUriOperation(
+    private val uploadPath: String,
+    private val lastModified: String,
+    private val requestBody: ContentUriRequestBody
+) : RemoteOperation<Unit>() {
+
+    override fun run(client: OwnCloudClient): RemoteOperationResult<Unit> {
+        val putMethod = PutMethod(URL(client.userFilesWebDavUri.toString() + WebdavUtils.encodePath(uploadPath)), requestBody).apply {
+            retryOnConnectionFailure = false
+            addRequestHeader(HttpConstants.OC_TOTAL_LENGTH_HEADER, requestBody.contentLength().toString())
+            addRequestHeader(HttpConstants.OC_X_OC_MTIME_HEADER, lastModified)
+        }
+
+        return try {
+            val status = client.executeHttpMethod(putMethod)
+            if (isSuccess(status)) {
+                RemoteOperationResult<Unit>(RemoteOperationResult.ResultCode.OK).apply { data = Unit }
+            } else {
+                RemoteOperationResult<Unit>(putMethod)
+            }
+        } catch (e: Exception) {
+            val result = RemoteOperationResult<Unit>(e)
+            Timber.e(e, "Upload from content uri failed : ${result.logMessage}")
+            result
+        }
+    }
+
+    fun isSuccess(status: Int): Boolean {
+        return status.isOneOf(HttpConstants.HTTP_OK, HttpConstants.HTTP_CREATED, HttpConstants.HTTP_NO_CONTENT)
+    }
+}

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

@@ -0,0 +1,148 @@
+/* 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
+ *   NONINFINGEMENT. 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.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.PutMethod
+import com.owncloud.android.lib.common.network.FileRequestBody
+import com.owncloud.android.lib.common.network.OnDatatransferProgressListener
+import com.owncloud.android.lib.common.network.WebdavUtils
+import com.owncloud.android.lib.common.operations.OperationCancelledException
+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.common.utils.isOneOf
+import okhttp3.MediaType
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import timber.log.Timber
+import java.io.File
+import java.net.URL
+import java.util.concurrent.atomic.AtomicBoolean
+
+/**
+ * Remote operation performing the upload of a remote file to the ownCloud server.
+ *
+ * @author David A. Velasco
+ * @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,
+    val remotePath: String,
+    val mimeType: String,
+    val lastModifiedTimestamp: String,
+    val requiredEtag: String?,
+    val spaceWebDavUrl: String? = null,
+) : RemoteOperation<Unit>() {
+
+    protected val cancellationRequested = AtomicBoolean(false)
+    protected var putMethod: PutMethod? = null
+    protected val dataTransferListener: MutableSet<OnDatatransferProgressListener> = HashSet()
+    protected var fileRequestBody: FileRequestBody? = null
+
+    var etag: String = ""
+
+    override fun run(client: OwnCloudClient): RemoteOperationResult<Unit> {
+        var result: RemoteOperationResult<Unit>
+        try {
+            if (cancellationRequested.get()) {
+                // the operation was cancelled before getting it's turn to be executed in the queue of uploads
+                result = RemoteOperationResult<Unit>(OperationCancelledException())
+                Timber.i("Upload of $localPath to $remotePath has been cancelled")
+            } else {
+                // perform the upload
+                result = uploadFile(client)
+                Timber.i("Upload of $localPath to $remotePath: ${result.logMessage}")
+            }
+        } catch (e: Exception) {
+            if (putMethod?.isAborted == true) {
+                result = RemoteOperationResult<Unit>(OperationCancelledException())
+                Timber.e(result.exception, "Upload of $localPath to $remotePath has been aborted with this message: ${result.logMessage}")
+            } else {
+                result = RemoteOperationResult<Unit>(e)
+                Timber.e(result.exception, "Upload of $localPath to $remotePath has failed with this message: ${result.logMessage}")
+            }
+        }
+        return result
+    }
+
+    @Throws(Exception::class)
+    protected open fun uploadFile(client: OwnCloudClient): RemoteOperationResult<Unit> {
+        val fileToUpload = File(localPath)
+        val mediaType: MediaType? = mimeType.toMediaTypeOrNull()
+
+        fileRequestBody = FileRequestBody(fileToUpload, mediaType).also {
+            synchronized(dataTransferListener) { it.addDatatransferProgressListeners(dataTransferListener) }
+        }
+
+        val baseStringUrl = spaceWebDavUrl ?: client.userFilesWebDavUri.toString()
+        putMethod = PutMethod(URL(baseStringUrl + WebdavUtils.encodePath(remotePath)), fileRequestBody!!).apply {
+            retryOnConnectionFailure = false
+            if (!requiredEtag.isNullOrBlank()) {
+                addRequestHeader(HttpConstants.IF_MATCH_HEADER, requiredEtag)
+            }
+            addRequestHeader(HttpConstants.OC_TOTAL_LENGTH_HEADER, fileToUpload.length().toString())
+            addRequestHeader(HttpConstants.OC_X_OC_MTIME_HEADER, lastModifiedTimestamp)
+        }
+
+        val status = client.executeHttpMethod(putMethod)
+        return if (isSuccess(status)) {
+            etag = WebdavUtils.getEtagFromResponse(putMethod)
+            // Get rid of extra quotas
+            etag = etag.replace("\"", "")
+            if (etag.isEmpty()) {
+                Timber.e("Could not read eTag from response uploading %s", localPath)
+            } else {
+                Timber.d("File uploaded successfully. New etag for file ${fileToUpload.name} is $etag")
+            }
+            RemoteOperationResult<Unit>(ResultCode.OK).apply { data = Unit }
+        } else { // synchronization failed
+            RemoteOperationResult<Unit>(putMethod)
+        }
+    }
+
+    fun addDataTransferProgressListener(listener: OnDatatransferProgressListener) {
+        synchronized(dataTransferListener) { dataTransferListener.add(listener) }
+        fileRequestBody?.addDatatransferProgressListener(listener)
+    }
+
+    fun removeDataTransferProgressListener(listener: OnDatatransferProgressListener) {
+        synchronized(dataTransferListener) { dataTransferListener.remove(listener) }
+        fileRequestBody?.removeDatatransferProgressListener(listener)
+    }
+
+    fun cancel() {
+        synchronized(cancellationRequested) {
+            cancellationRequested.set(true)
+            putMethod?.abort()
+        }
+    }
+
+    fun isSuccess(status: Int): Boolean {
+        return status.isOneOf(HttpConstants.HTTP_OK, HttpConstants.HTTP_CREATED, HttpConstants.HTTP_NO_CONTENT)
+    }
+}

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

@@ -1,182 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   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
- *   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.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.PutMethod;
-import com.owncloud.android.lib.common.network.FileRequestBody;
-import com.owncloud.android.lib.common.network.OnDatatransferProgressListener;
-import com.owncloud.android.lib.common.network.WebdavUtils;
-import com.owncloud.android.lib.common.operations.OperationCancelledException;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
-import com.owncloud.android.lib.common.operations.RemoteOperationResult;
-import okhttp3.MediaType;
-import timber.log.Timber;
-
-import java.io.File;
-import java.net.URL;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
-
-/**
- * Remote operation performing the upload of a remote file to the ownCloud server.
- *
- * @author David A. Velasco
- * @author masensio
- * @author David González Verdugo
- */
-
-public class UploadRemoteFileOperation extends RemoteOperation {
-
-    protected final AtomicBoolean mCancellationRequested = new AtomicBoolean(false);
-    protected String mLocalPath;
-    protected String mRemotePath;
-    protected String mMimeType;
-    protected String mFileLastModifTimestamp;
-    protected PutMethod mPutMethod = null;
-    protected String mRequiredEtag = null;
-    protected Set<OnDatatransferProgressListener> mDataTransferListeners = new HashSet<>();
-
-    protected FileRequestBody mFileRequestBody = null;
-
-    public UploadRemoteFileOperation(String localPath, String remotePath, String mimeType,
-                                     String fileLastModifTimestamp) {
-        mLocalPath = localPath;
-        mRemotePath = remotePath;
-        mMimeType = mimeType;
-        mFileLastModifTimestamp = fileLastModifTimestamp;
-    }
-
-    public UploadRemoteFileOperation(String localPath, String remotePath, String mimeType,
-                                     String requiredEtag, String fileLastModifTimestamp) {
-        this(localPath, remotePath, mimeType, fileLastModifTimestamp);
-        mRequiredEtag = requiredEtag;
-    }
-
-    @Override
-    protected RemoteOperationResult run(OwnCloudClient client) {
-        RemoteOperationResult result;
-
-        try {
-            mPutMethod = new PutMethod(
-                    new URL(client.getUserFilesWebDavUri() + WebdavUtils.encodePath(mRemotePath)));
-
-            mPutMethod.setRetryOnConnectionFailure(false);
-
-            if (mCancellationRequested.get()) {
-                // the operation was cancelled before getting it's turn to be executed in the queue of uploads
-                result = new RemoteOperationResult<>(new OperationCancelledException());
-            } else {
-                // perform the upload
-                result = uploadFile(client);
-                Timber.i("Upload of " + mLocalPath + " to " + mRemotePath + ": " + result.getLogMessage());
-            }
-
-        } catch (Exception e) {
-
-            if (mPutMethod != null && mPutMethod.isAborted()) {
-                result = new RemoteOperationResult<>(new OperationCancelledException());
-                Timber.e(result.getException(),
-                        "Upload of " + mLocalPath + " to " + mRemotePath + ": " + result.getLogMessage());
-            } else {
-                result = new RemoteOperationResult<>(e);
-                Timber.e(e, "Upload of " + mLocalPath + " to " + mRemotePath + ": " + result.getLogMessage());
-            }
-        }
-
-        return result;
-    }
-
-    protected RemoteOperationResult<?> uploadFile(OwnCloudClient client) throws Exception {
-
-        File fileToUpload = new File(mLocalPath);
-
-        MediaType mediaType = MediaType.parse(mMimeType);
-
-        mFileRequestBody = new FileRequestBody(fileToUpload, mediaType);
-
-        synchronized (mDataTransferListeners) {
-            mFileRequestBody.addDatatransferProgressListeners(mDataTransferListeners);
-        }
-
-        if (mRequiredEtag != null && mRequiredEtag.length() > 0) {
-            mPutMethod.addRequestHeader(HttpConstants.IF_MATCH_HEADER, mRequiredEtag);
-        }
-
-        mPutMethod.addRequestHeader(HttpConstants.OC_TOTAL_LENGTH_HEADER, String.valueOf(fileToUpload.length()));
-        mPutMethod.addRequestHeader(HttpConstants.OC_X_OC_MTIME_HEADER, mFileLastModifTimestamp);
-
-        mPutMethod.setRequestBody(mFileRequestBody);
-
-        int status = client.executeHttpMethod(mPutMethod);
-
-        if (isSuccess(status)) {
-            return new RemoteOperationResult<>(OK);
-
-        } else { // synchronization failed
-            return new RemoteOperationResult<>(mPutMethod);
-        }
-    }
-
-    public Set<OnDatatransferProgressListener> getDataTransferListeners() {
-        return mDataTransferListeners;
-    }
-
-    public void addDatatransferProgressListener(OnDatatransferProgressListener listener) {
-        synchronized (mDataTransferListeners) {
-            mDataTransferListeners.add(listener);
-        }
-        if (mFileRequestBody != null) {
-            mFileRequestBody.addDatatransferProgressListener(listener);
-        }
-    }
-
-    public void removeDatatransferProgressListener(OnDatatransferProgressListener listener) {
-        synchronized (mDataTransferListeners) {
-            mDataTransferListeners.remove(listener);
-        }
-        if (mFileRequestBody != null) {
-            mFileRequestBody.removeDatatransferProgressListener(listener);
-        }
-    }
-
-    public void cancel() {
-        synchronized (mCancellationRequested) {
-            mCancellationRequested.set(true);
-            if (mPutMethod != null) {
-                mPutMethod.abort();
-            }
-        }
-    }
-
-    public boolean isSuccess(int status) {
-        return ((status == HttpConstants.HTTP_OK || status == HttpConstants.HTTP_CREATED ||
-                status == HttpConstants.HTTP_NO_CONTENT));
-    }
-}

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

@@ -0,0 +1,122 @@
+/* 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.files.chunks
+
+import com.owncloud.android.lib.common.OwnCloudClient
+import com.owncloud.android.lib.common.http.methods.webdav.PutMethod
+import com.owncloud.android.lib.common.network.ChunkFromFileRequestBody
+import com.owncloud.android.lib.common.operations.OperationCancelledException
+import com.owncloud.android.lib.common.operations.RemoteOperationResult
+import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode
+import com.owncloud.android.lib.resources.files.FileUtils.MODE_READ_ONLY
+import com.owncloud.android.lib.resources.files.UploadFileFromFileSystemOperation
+import okhttp3.MediaType
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import timber.log.Timber
+import java.io.File
+import java.io.RandomAccessFile
+import java.net.URL
+import java.nio.channels.FileChannel
+import java.util.concurrent.TimeUnit
+import kotlin.math.ceil
+
+/**
+ * Remote operation performing the chunked upload of a remote file to the ownCloud server.
+ *
+ * @author David A. Velasco
+ * @author David González Verdugo
+ * @author Abel García de Prada
+ */
+class ChunkedUploadFromFileSystemOperation(
+    private val transferId: String,
+    localPath: String,
+    remotePath: String,
+    mimeType: String,
+    lastModifiedTimestamp: String,
+    requiredEtag: String?,
+) : UploadFileFromFileSystemOperation(
+    localPath = localPath,
+    remotePath = remotePath,
+    mimeType = mimeType,
+    lastModifiedTimestamp = lastModifiedTimestamp,
+    requiredEtag = requiredEtag
+) {
+
+    @Throws(Exception::class)
+    override fun uploadFile(client: OwnCloudClient): RemoteOperationResult<Unit> {
+        lateinit var result: RemoteOperationResult<Unit>
+
+        val fileToUpload = File(localPath)
+        val mediaType: MediaType? = mimeType.toMediaTypeOrNull()
+        val raf = RandomAccessFile(fileToUpload, MODE_READ_ONLY)
+        val channel: FileChannel = raf.channel
+
+        val fileRequestBody = ChunkFromFileRequestBody(fileToUpload, mediaType, channel).also {
+            synchronized(dataTransferListener) { it.addDatatransferProgressListeners(dataTransferListener) }
+        }
+
+        val uriPrefix = client.uploadsWebDavUri.toString() + File.separator + transferId
+        val totalLength = fileToUpload.length()
+        val chunkCount = ceil(totalLength.toDouble() / CHUNK_SIZE).toLong()
+        var offset: Long = 0
+
+        for (chunkIndex in 0..chunkCount) {
+            fileRequestBody.setOffset(offset)
+
+            if (cancellationRequested.get()) {
+                result = RemoteOperationResult<Unit>(OperationCancelledException())
+                break
+            } else {
+                putMethod = PutMethod(URL(uriPrefix + File.separator + chunkIndex), fileRequestBody).apply {
+                    if (chunkIndex == chunkCount - 1) {
+                        // Added a high timeout to the last chunk due to when the last chunk
+                        // arrives to the server with the last PUT, all chunks get assembled
+                        // within that PHP request, so last one takes longer.
+                        setReadTimeout(LAST_CHUNK_TIMEOUT.toLong(), TimeUnit.MILLISECONDS)
+                    }
+                }
+
+                val status = client.executeHttpMethod(putMethod)
+
+                Timber.d("Upload of $localPath to $remotePath, chunk index $chunkIndex, count $chunkCount, HTTP result status $status")
+
+                if (isSuccess(status)) {
+                    result = RemoteOperationResult<Unit>(ResultCode.OK)
+                } else {
+                    result = RemoteOperationResult<Unit>(putMethod)
+                    break
+                }
+            }
+            offset += CHUNK_SIZE
+        }
+        channel.close()
+        raf.close()
+        return result
+    }
+
+    companion object {
+        const val CHUNK_SIZE = 10_240_000L // 10 MB
+        private const val LAST_CHUNK_TIMEOUT = 900_000 // 15 mins.
+    }
+}

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

@@ -1,138 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   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
- *   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.files.chunks;
-
-import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.http.methods.webdav.PutMethod;
-import com.owncloud.android.lib.common.network.ChunkFromFileRequestBody;
-import com.owncloud.android.lib.common.operations.OperationCancelledException;
-import com.owncloud.android.lib.common.operations.RemoteOperationResult;
-import com.owncloud.android.lib.resources.files.FileUtils;
-import com.owncloud.android.lib.resources.files.UploadRemoteFileOperation;
-import okhttp3.MediaType;
-import timber.log.Timber;
-
-import java.io.File;
-import java.io.RandomAccessFile;
-import java.net.URL;
-import java.nio.channels.FileChannel;
-import java.util.concurrent.TimeUnit;
-
-import static com.owncloud.android.lib.common.http.HttpConstants.IF_MATCH_HEADER;
-import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
-
-/**
- * Remote operation performing the chunked upload of a remote file to the ownCloud server.
- *
- * @author David A. Velasco
- * @author David González Verdugo
- */
-public class ChunkedUploadRemoteFileOperation extends UploadRemoteFileOperation {
-
-    public static final long CHUNK_SIZE = 1024000;
-    private static final int LAST_CHUNK_TIMEOUT = 900000; //15 mins.
-
-    private String mTransferId;
-
-    public ChunkedUploadRemoteFileOperation(String transferId, String localPath, String remotePath, String mimeType,
-                                            String requiredEtag, String fileLastModifTimestamp) {
-        super(localPath, remotePath, mimeType, requiredEtag, fileLastModifTimestamp);
-        mTransferId = transferId;
-    }
-
-    @Override
-    protected RemoteOperationResult uploadFile(OwnCloudClient client) throws Exception {
-        int status;
-        RemoteOperationResult result = null;
-        FileChannel channel;
-        RandomAccessFile raf;
-
-        File fileToUpload = new File(mLocalPath);
-        MediaType mediaType = MediaType.parse(mMimeType);
-
-        raf = new RandomAccessFile(fileToUpload, "r");
-        channel = raf.getChannel();
-
-        mFileRequestBody = new ChunkFromFileRequestBody(fileToUpload, mediaType, channel, CHUNK_SIZE);
-
-        synchronized (mDataTransferListeners) {
-            mFileRequestBody.addDatatransferProgressListeners(mDataTransferListeners);
-        }
-
-        long offset = 0;
-        String uriPrefix = client.getUploadsWebDavUri() + FileUtils.PATH_SEPARATOR + String.valueOf(mTransferId);
-        long totalLength = fileToUpload.length();
-        long chunkCount = (long) Math.ceil((double) totalLength / CHUNK_SIZE);
-
-        for (int chunkIndex = 0; chunkIndex < chunkCount; chunkIndex++, offset += CHUNK_SIZE) {
-            mPutMethod = new PutMethod(
-                    new URL(uriPrefix + FileUtils.PATH_SEPARATOR + chunkIndex)
-            );
-
-            if (mRequiredEtag != null && mRequiredEtag.length() > 0) {
-                mPutMethod.addRequestHeader(IF_MATCH_HEADER, "\"" + mRequiredEtag + "\"");
-            }
-
-            ((ChunkFromFileRequestBody) mFileRequestBody).setOffset(offset);
-
-            if (mCancellationRequested.get()) {
-                result = new RemoteOperationResult<>(new OperationCancelledException());
-                break;
-            } else {
-                if (chunkIndex == chunkCount - 1) {
-                    // Added a high timeout to the last chunk due to when the last chunk
-                    // arrives to the server with the last PUT, all chunks get assembled
-                    // within that PHP request, so last one takes longer.
-                    mPutMethod.setReadTimeout(LAST_CHUNK_TIMEOUT, TimeUnit.MILLISECONDS);
-                }
-
-                mPutMethod.setRequestBody(mFileRequestBody);
-
-                status = client.executeHttpMethod(mPutMethod);
-
-                Timber.d("Upload of " + mLocalPath + " to " + mRemotePath +
-                        ", chunk index " + chunkIndex + ", count " + chunkCount +
-                        ", HTTP result status " + status);
-
-                if (isSuccess(status)) {
-                    result = new RemoteOperationResult<>(OK);
-                } else {
-                    result = new RemoteOperationResult<>(mPutMethod);
-                    break;
-                }
-            }
-        }
-
-        if (channel != null) {
-            channel.close();
-        }
-
-        if (raf != null) {
-            raf.close();
-        }
-
-        return result;
-    }
-}

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

@@ -1,45 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   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
- *   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.files.chunks;
-
-import com.owncloud.android.lib.resources.files.CreateRemoteFolderOperation;
-
-/**
- * Remote operation performing the creation of a new folder to save chunks during an upload to the ownCloud server.
- *
- * @author David González Verdugo
- */
-public class CreateRemoteChunkFolderOperation extends CreateRemoteFolderOperation {
-    /**
-     * Constructor
-     *
-     * @param remotePath     Full path to the new directory to create in the remote server.
-     * @param createFullPath 'True' means that all the ancestor folders should be created.
-     */
-    public CreateRemoteChunkFolderOperation(String remotePath, boolean createFullPath) {
-        super(remotePath, createFullPath);
-        createChunksFolder = true;
-    }
-}

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

@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2020 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
@@ -21,30 +21,38 @@
  *   THE SOFTWARE.
  *
  */
+package com.owncloud.android.lib.resources.files.chunks
 
-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.MoveRemoteFileOperation;
+import com.owncloud.android.lib.common.http.HttpConstants
+import com.owncloud.android.lib.common.http.methods.webdav.MoveMethod
+import com.owncloud.android.lib.resources.files.MoveRemoteFileOperation
 
 /**
  * Remote operation to move the file built from chunks after uploading it
  *
  * @author David González Verdugo
+ * @author Abel García de Prada
  */
-public class MoveRemoteChunksFileOperation extends MoveRemoteFileOperation {
+class MoveRemoteChunksFileOperation(
+    sourceRemotePath: String,
+    targetRemotePath: String,
+    private val fileLastModificationTimestamp: String,
+    private val fileLength: Long
+) : MoveRemoteFileOperation(
+    sourceRemotePath = sourceRemotePath,
+    targetRemotePath = targetRemotePath,
+) {
 
-    /**
+    override fun getSrcWebDavUriForClient(client: OwnCloudClient): Uri = client.uploadsWebDavUri
-     * Constructor.
+
-     *
+    override fun addRequestHeaders(moveMethod: MoveMethod) {
-     * @param srcRemotePath    Remote path of the file/folder to move.
+        super.addRequestHeaders(moveMethod)
-     * @param targetRemotePath Remove path desired for the file/folder after moving it.
+
-     * @param overwrite
+        moveMethod.apply {
-     */
+            addRequestHeader(HttpConstants.OC_X_OC_MTIME_HEADER, fileLastModificationTimestamp)
-    public MoveRemoteChunksFileOperation(String srcRemotePath, String targetRemotePath, boolean overwrite,
+            addRequestHeader(HttpConstants.OC_TOTAL_LENGTH_HEADER, fileLength.toString())
-                                         String fileLastModifTimestamp, long fileLength) {
+        }
-        super(srcRemotePath, targetRemotePath, overwrite);
-        moveChunkedFile = true;
-        mFileLastModifTimestamp = fileLastModifTimestamp;
-        mFileLength = fileLength;
     }
-}
+}