.classpath

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="output" path="bin/classes"/>
+</classpath>

.editorconfig

@@ -1,5 +0,0 @@
-[*]
-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

@@ -1,17 +0,0 @@
-# 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

@@ -1,10 +0,0 @@
-name: "Validate Gradle Wrapper"
-on: [pull_request]
-
-jobs:
-  validation:
-    name: "Validation"
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: gradle/wrapper-validation-action@v1

.gitignore

@@ -19,6 +19,11 @@ gen/
 # Local configuration files (sdk path, etc)
 .gradle/
 local.properties
+sample_client/local.properties
 
 # Mac .DS_Store files
 .DS_Store
+
+# Proguard README
+proguard-project.txt
+sample_client/proguard-project.txt

.idea/codeStyles/Project.xml

@@ -2,11 +2,17 @@
   <code_scheme name="Project" version="173">
     <option name="LINE_SEPARATOR" value="&#10;" />
     <option name="RIGHT_MARGIN" value="150" />
+    <AndroidXmlCodeStyleSettings>
+      <option name="USE_CUSTOM_SETTINGS" value="true" />
+    </AndroidXmlCodeStyleSettings>
     <JavaCodeStyleSettings>
       <option name="FIELD_NAME_PREFIX" value="m" />
       <option name="STATIC_FIELD_NAME_PREFIX" value="s" />
       <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99999" />
       <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99999" />
+      <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
+        <value />
+      </option>
       <option name="IMPORT_LAYOUT_TABLE">
         <value>
           <package name="android" withSubpackages="true" static="false" />
@@ -34,9 +40,36 @@
     <MarkdownNavigatorCodeStyleSettings>
       <option name="RIGHT_MARGIN" value="72" />
     </MarkdownNavigatorCodeStyleSettings>
+    <Objective-C-extensions>
+      <file>
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
+      </file>
+      <class>
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
+      </class>
+      <extensions>
+        <pair source="cpp" header="h" fileNamingConvention="NONE" />
+        <pair source="c" header="h" fileNamingConvention="NONE" />
+      </extensions>
+    </Objective-C-extensions>
     <XML>
       <option name="XML_ATTRIBUTE_WRAP" value="0" />
       <option name="XML_KEEP_BLANK_LINES" value="1" />
+      <option name="XML_ALIGN_ATTRIBUTES" value="false" />
+      <option name="XML_SPACE_INSIDE_EMPTY_TAG" value="true" />
       <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
     </XML>
     <codeStyleSettings language="JAVA">
@@ -211,6 +244,7 @@
       </arrangement>
     </codeStyleSettings>
     <codeStyleSettings language="XML">
+      <option name="FORCE_REARRANGE_MODE" value="1" />
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
       </indentOptions>

.travis.yml

@@ -0,0 +1,44 @@
+sudo: false
+language: android
+jdk:
+  - oraclejdk8
+branches:
+  only:
+  - master
+install:
+# Let's use the new command 'sdkmanager' to install Android SDK components
+- yes | sdkmanager --verbose "build-tools;26.0.3"
+- yes | sdkmanager --verbose "platform-tools"
+- yes | sdkmanager --verbose "tools"
+- yes | sdkmanager --verbose "platforms;android-26"
+- yes | sdkmanager --verbose "system-images;android-24;default;armeabi-v7a"
+
+# Check tools and dependencies installed
+- yes | sdkmanager --list
+
+# After Travis updated image with Android base environment, building via ant is not possible anymore.
+# Port library tests to new-style with JUnit 4 and gradle build.
+- rm pom.xml
+
+# On the other hand, Travis still uses 'android' command behind the 'components' section update. 
+# That command is obsolete and cannot update Android SDK Tools after 25.2.5.
+# Let's solve it here with the new command 'sdkmanager'
+- yes | sdkmanager --verbose tools
+script:
+- ./gradlew clean build
+env:
+  global:
+  # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
+  #   via the "travis encrypt" command using the project repo's public key
+  - secure: epTZ0zZGDbHL3o6vSC9uNkZsi5j5SA6O/tvQBH7QW/dluuzIJxIjfhNbZHDyBReYDleirLzUFQpdWAUdvulCMLs/qZdIzFGlYXZSpxEnvPYMGQcilwADdJcxLw8L+3+ET5hSexxhjrTGw427IljkqGUpqQTxaLwFdFu98lDWSbc=
+  matrix:
+  - ANDROID_TARGET=android-26 ANDROID_ABI=armeabi-v7a
+addons:
+  coverity_scan:
+    project:
+      name: owncloud/android-library
+      description: Build submitted via Travis CI
+    notification_email: lukas@owncloud.com
+    build_command_prepend: gradle clean
+    build_command: gradle build
+    branch_pattern: coverity_scan

LICENSE.md

@@ -2,7 +2,7 @@
 
 ownCloud Android Library is available under MIT license
 
-Copyright (C) 2020 ownCloud GmbH.
+Copyright (C) 2019 ownCloud GmbH.
 Copyright (C) 2012 Bartek Przybylski
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

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 4.6.0, 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 3.10, 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 6 (android:minSdkVersion="23" android:targetSdkVersion="33").
+ownCloud Android Library is valid for Android systems from version Android 2.2 (android:minSdkVersion="8" android:targetSdkVersion="19").
 
 ownCloud Android library supports ownCloud server from version 4.5.

build.gradle

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

check_code_script.sh

@@ -1,15 +0,0 @@
-#!/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 +0,0 @@
-android.enableJetifier=true
-android.useAndroidX=true
-org.gradle.jvmargs=-Xmx1536M

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Wed Aug 17 12:51:45 CEST 2016
 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-4.10.2-all.zip

gradlew

@@ -1,129 +1,79 @@
-#!/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.
-#
+#!/usr/bin/env bash
 
 ##############################################################################
-#
-#   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/.
-#
+##
+##  Gradle start up script for UN*X
+##
 ##############################################################################
 
-# Attempt to set APP_HOME
-
-# 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=${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"'
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
 
 # 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
-nonstop=false
-case "$( uname )" in                #(
-  CYGWIN* )         cygwin=true  ;; #(
-  Darwin* )         darwin=true  ;; #(
-  MSYS* | MINGW* )  msys=true    ;; #(
-  NONSTOP* )        nonstop=true ;;
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+# 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
@@ -132,7 +82,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
@@ -140,95 +90,75 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    case $MAX_FD in #(
-      max*)
-        MAX_FD=$( ulimit -H -n ) ||
-            warn "Could not query maximum file descriptor limit"
-    esac
-    case $MAX_FD in  #(
-      '' | soft) :;; #(
-      *)
-        ulimit -n "$MAX_FD" ||
-            warn "Could not set maximum file descriptor limit to $MAX_FD"
-    esac
-fi
-
-# Collect all arguments for the java command, stacking in reverse order:
-#   * args from the command line
-#   * the main class name
-#   * -classpath
-#   * -D...appname settings
-#   * --module-path (only if needed)
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
-
-# 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" )
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
         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
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
 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.
+# 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
 
-set -- \
-        "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
-        "$@"
+# 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"`
 
-# 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.
-#
+    # 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
 
-eval "set -- $(
-        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
-        xargs -n1 |
-        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
-        tr '\n' ' '
-    )" '"$@"'
+        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
 
-exec "$JAVACMD" "$@"
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

gradlew.bat

@@ -1,19 +1,3 @@
-@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
@@ -24,23 +8,20 @@
 @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 execute
+if "%ERRORLEVEL%" == "0" goto init
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +35,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto execute
+if exist "%JAVA_EXE%" goto init
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,14 +45,34 @@ 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 %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 
 :end
 @rem End local scope for the variables with windows NT shell

owncloudComLibrary/build.gradle

@@ -1,43 +1,29 @@
 apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'com.google.devtools.ksp'
-apply plugin: 'kotlin-parcelize'
 
 dependencies {
-    api 'com.squareup.okhttp3:okhttp:4.6.0'
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$orgJetbrainsKotlin"
-    api 'com.gitlab.ownclouders:dav4android:oc_support_2.1.5'
-    api 'com.github.AppDevNext.Logcat:LogcatCore:2.2.2'
-
-    // Moshi
-    implementation("com.squareup.moshi:moshi-kotlin:$comSquareupMoshi") {
-        exclude module: "kotlin-reflect"
-    }
-    implementation 'org.apache.commons:commons-lang3:3.12.0'
-    ksp "com.squareup.moshi:moshi-kotlin-codegen:$comSquareupMoshi"
-
-    testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.robolectric:robolectric:4.10'
-    debugImplementation 'com.facebook.stetho:stetho-okhttp3:1.6.0'
+    api 'com.squareup.okhttp3:okhttp:3.12.0'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.11"
+    api 'com.gitlab.ownclouders:dav4android:oc_support_1.0.1'
 }
 
 android {
-    compileSdkVersion 33
+    compileSdkVersion 28
 
     defaultConfig {
-        minSdkVersion 23
-        targetSdkVersion 33
+        minSdkVersion 19
+        targetSdkVersion 28
+
+        versionCode = 10000100
+        versionName = "1.0.1"
     }
 
-    lint {
+    lintOptions {
         abortOnError false
         ignoreWarnings true
     }
 
-    testOptions {
-        unitTests {
-            includeAndroidResources = true
-        }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
-    namespace 'com.owncloud.android.lib'
 }

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

@@ -1,30 +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
-
-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) 2023 ownCloud GmbH.
+   Copyright (C) 2016 ownCloud GmbH.
     
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -23,8 +23,16 @@
 
  -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest package="com.owncloud.android.lib"
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <!-- USE_CREDENTIALS, MANAGE_ACCOUNTS and AUTHENTICATE_ACCOUNTS are needed for API < 23.
+        In API >= 23 the do not exist anymore -->
+    <uses-permission
+        android:name="android.permission.MANAGE_ACCOUNTS"
+        android:maxSdkVersion="22" />
+    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
+    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
 </manifest>

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

@@ -1,221 +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.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/DynamicSessionManager.java

@@ -0,0 +1,63 @@
+package com.owncloud.android.lib.common;
+
+import android.accounts.AuthenticatorException;
+import android.accounts.OperationCanceledException;
+import android.content.Context;
+
+import com.owncloud.android.lib.common.accounts.AccountUtils;
+import com.owncloud.android.lib.resources.status.OwnCloudVersion;
+
+import java.io.IOException;
+
+/**
+ * Dynamic implementation of {@link OwnCloudClientManager}.
+ * <p>
+ * Wraps instances of {@link SingleSessionManager} and {@link SimpleFactoryManager} and delegates on one
+ * or the other depending on the known version of the server corresponding to the {@link OwnCloudAccount}
+ *
+ * @author David A. Velasco
+ */
+
+public class DynamicSessionManager implements OwnCloudClientManager {
+
+    private SimpleFactoryManager mSimpleFactoryManager = new SimpleFactoryManager();
+
+    private SingleSessionManager mSingleSessionManager = new SingleSessionManager();
+
+    @Override
+    public OwnCloudClient getClientFor(OwnCloudAccount account, Context context)
+            throws AccountUtils.AccountNotFoundException,
+            OperationCanceledException, AuthenticatorException, IOException {
+
+        OwnCloudVersion ownCloudVersion = null;
+        if (account.getSavedAccount() != null) {
+            ownCloudVersion = AccountUtils.getServerVersionForAccount(
+                    account.getSavedAccount(), context
+            );
+        }
+
+        if (ownCloudVersion != null && ownCloudVersion.isSessionMonitoringSupported()) {
+            return mSingleSessionManager.getClientFor(account, context);
+        } else {
+            return mSimpleFactoryManager.getClientFor(account, context);
+        }
+    }
+
+    @Override
+    public OwnCloudClient removeClientFor(OwnCloudAccount account) {
+        OwnCloudClient clientRemovedFromFactoryManager = mSimpleFactoryManager.removeClientFor(account);
+        OwnCloudClient clientRemovedFromSingleSessionManager = mSingleSessionManager.removeClientFor(account);
+        if (clientRemovedFromSingleSessionManager != null) {
+            return clientRemovedFromSingleSessionManager;
+        } else {
+            return clientRemovedFromFactoryManager;
+        }
+        // clientRemoved and clientRemoved2 should not be != null at the same time
+    }
+
+    @Override
+    public void saveAllClients(Context context, String accountType) {
+        mSimpleFactoryManager.saveAllClients(context, accountType);
+        mSingleSessionManager.saveAllClients(context, accountType);
+    }
+}

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

@@ -107,11 +107,13 @@ public class OwnCloudAccount {
      * Method for deferred load of account attributes from AccountManager
      *
      * @param context
+     * @throws AccountNotFoundException
      * @throws AuthenticatorException
      * @throws IOException
      * @throws OperationCanceledException
      */
-    public void loadCredentials(Context context) throws AuthenticatorException, IOException, OperationCanceledException {
+    public void loadCredentials(Context context) throws AuthenticatorException,
+            IOException, OperationCanceledException {
 
         if (context == null) {
             throw new IllegalArgumentException("Parameter 'context' cannot be null");
@@ -149,4 +151,5 @@ public class OwnCloudAccount {
             return null;
         }
     }
+
 }

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

@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2020 ownCloud GmbH.
+ *   Copyright (C) 2019 ownCloud GmbH.
  *   Copyright (C) 2012  Bartek Przybylski
  *
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -25,9 +25,11 @@
 
 package com.owncloud.android.lib.common;
 
-import android.content.Context;
+import android.accounts.AccountManager;
+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;
@@ -35,130 +37,190 @@ 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.Log_OC;
 import com.owncloud.android.lib.common.utils.RandomUtils;
+import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 import okhttp3.Cookie;
+import okhttp3.Headers;
 import okhttp3.HttpUrl;
-import timber.log.Timber;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.List;
-import java.util.Locale;
 
-import static com.owncloud.android.lib.common.http.HttpConstants.AUTHORIZATION_HEADER;
-import static com.owncloud.android.lib.common.http.HttpConstants.HTTP_MOVED_PERMANENTLY;
+import static com.owncloud.android.lib.common.http.HttpConstants.OC_X_REQUEST_ID;
 
 public class OwnCloudClient extends HttpClient {
 
     public static final String WEBDAV_FILES_PATH_4_0 = "/remote.php/dav/files/";
+    public 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;
+    public static final String FILES_WEB_PATH = "/index.php/apps/files";
 
+    private static final String TAG = OwnCloudClient.class.getSimpleName();
+    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;
+    /**
+     * {@link @OwnCloudClientManager} holding a reference to this object and delivering it to callers; might be
+     * NULL
+     */
+    private OwnCloudClientManager mOwnCloudClientManager = null;
 
-    private SingleSessionManager mSingleSessionManager = null;
-
-    private boolean mFollowRedirects = false;
-
-    public OwnCloudClient(Uri baseUri,
-                          ConnectionValidator connectionValidator,
-                          boolean synchronizeRequests,
-                          SingleSessionManager singleSessionManager,
-                          Context context) {
-        super(context);
+    private String mRedirectedLocation;
+    private boolean mFollowRedirects;
 
+    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");
+        Log_OC.d(TAG + " #" + mInstanceNumber, "Creating OwnCloudClient");
 
         clearCredentials();
         clearCookies();
-        mConnectionValidator = connectionValidator;
     }
 
     public void clearCredentials() {
         if (!(mCredentials instanceof OwnCloudAnonymousCredentials)) {
             mCredentials = OwnCloudCredentialsFactory.getAnonymousCredentials();
         }
+        mCredentials.applyTo(this);
+    }
+
+    public void applyCredentials() {
+        mCredentials.applyTo(this);
     }
 
     public int executeHttpMethod(HttpBaseMethod method) throws Exception {
-        if (mSynchronizeRequests) {
-            synchronized (mRequestMutex) {
-                return saveExecuteHttpMethod(method);
-            }
-        } else {
-            return saveExecuteHttpMethod(method);
-        }
-    }
-
-    private int saveExecuteHttpMethod(HttpBaseMethod method) throws Exception {
+        boolean repeatWithFreshCredentials;
         int repeatCounter = 0;
         int status;
 
-        if (mFollowRedirects) {
-            method.setFollowRedirects(true);
-        }
-
-        boolean retry;
         do {
-            repeatCounter++;
-            retry = false;
-            String requestId = RandomUtils.generateRandomUUID();
+            setRequestId(method);
 
-            // 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();
+            checkFirstRedirection(method);
+
+            if (mFollowRedirects && !isIdPRedirection()) {
+                status = followRedirection(method).getLastStatus();
             }
 
-            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);
+            repeatWithFreshCredentials = checkUnauthorizedAccess(status, repeatCounter);
+            if (repeatWithFreshCredentials) {
+                repeatCounter++;
             }
-
-        } while (retry && repeatCounter < MAX_RETRY_COUNT);
+        } while (repeatWithFreshCredentials);
 
         return status;
     }
 
-    private boolean shouldConnectionValidatorBeCalled(HttpBaseMethod method, int status) {
+    private void checkFirstRedirection(HttpBaseMethod method) {
+        final String location = method.getResponseHeader(HttpConstants.LOCATION_HEADER_LOWER);
+        if (location != null && !location.isEmpty()) {
+            mRedirectedLocation = location;
+        }
+    }
 
-        return mConnectionValidator != null && (
-                (!(mCredentials instanceof OwnCloudAnonymousCredentials) &&
-                        status == HttpConstants.HTTP_UNAUTHORIZED
-                ) || (!mFollowRedirects &&
-                        !method.getFollowRedirects() &&
-                        status == HttpConstants.HTTP_MOVED_TEMPORARILY
-                )
-        );
+    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);
+
+        Log_OC.d(TAG, "Executing " + method.getClass().getSimpleName() + " in request with id " + 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) {
+                Log_OC.d(TAG + " #" + 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 {
+                Log_OC.d(TAG + " #" + mInstanceNumber, "No location to redirect!");
+                status = HttpConstants.HTTP_NOT_FOUND;
+            }
+        }
+        return redirectionPath;
     }
 
     /**
@@ -169,10 +231,14 @@ public class OwnCloudClient extends HttpClient {
     public void exhaustResponse(InputStream responseBodyAsStream) {
         if (responseBodyAsStream != null) {
             try {
+                while (responseBodyAsStream.read(sExhaustBuffer) >= 0) {
+                    ;
+                }
                 responseBodyAsStream.close();
 
             } catch (IOException io) {
-                Timber.e(io, "Unexpected exception while exhausting not interesting HTTP response; will be IGNORED");
+                Log_OC.e(TAG, "Unexpected exception while exhausting not interesting HTTP response;" +
+                        " will be IGNORED", io);
             }
         }
     }
@@ -182,10 +248,10 @@ public class OwnCloudClient extends HttpClient {
     }
 
     public Uri getUserFilesWebDavUri() {
-        return (mCredentials instanceof OwnCloudAnonymousCredentials || mAccount == null)
+        return mCredentials instanceof OwnCloudAnonymousCredentials
                 ? Uri.parse(mBaseUri + WEBDAV_FILES_PATH_4_0)
                 : Uri.parse(mBaseUri + WEBDAV_FILES_PATH_4_0 + AccountUtils.getUserId(
-                        mAccount.getSavedAccount(), getContext()
+                mAccount.getSavedAccount(), getContext()
                 )
         );
     }
@@ -194,7 +260,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()
                 )
         );
     }
@@ -224,21 +290,70 @@ public class OwnCloudClient extends HttpClient {
     public void setCredentials(OwnCloudCredentials credentials) {
         if (credentials != null) {
             mCredentials = credentials;
+            mCredentials.applyTo(this);
         } else {
             clearCredentials();
         }
     }
 
-    public void setCookiesForBaseUri(List<Cookie> cookies) {
+    private void logCookie(Cookie cookie) {
+        Log_OC.d(TAG, "Cookie name: " + cookie.name());
+        Log_OC.d(TAG, "       value: " + cookie.value());
+        Log_OC.d(TAG, "       domain: " + cookie.domain());
+        Log_OC.d(TAG, "       path: " + cookie.path());
+        Log_OC.d(TAG, "       expiryDate: " + cookie.expiresAt());
+        Log_OC.d(TAG, "       secure: " + cookie.secure());
+    }
+
+    private void logCookiesAtRequest(Headers headers, String when) {
+        int counter = 0;
+        for (final String cookieHeader : headers.toMultimap().get("cookie")) {
+            Log_OC.d(TAG + " #" + mInstanceNumber,
+                    "Cookies at request (" + when + ") (" + counter++ + "): "
+                            + cookieHeader);
+        }
+        if (counter == 0) {
+            Log_OC.d(TAG + " #" + mInstanceNumber, "No cookie at request before");
+        }
+    }
+
+    private void logSetCookiesAtResponse(Headers headers) {
+        int counter = 0;
+        for (final String cookieHeader : headers.toMultimap().get("set-cookie")) {
+            Log_OC.d(TAG + " #" + mInstanceNumber,
+                    "Set-Cookie (" + counter++ + "): " + cookieHeader);
+        }
+        if (counter == 0) {
+            Log_OC.d(TAG + " #" + mInstanceNumber, "No set-cookie");
+        }
+    }
+
+    public String getCookiesString() {
+        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(mBaseUri.toString()),
+                HttpUrl.parse(getAccount().getBaseUri().toString()),
                 cookies
         );
     }
 
-    public List<Cookie> getCookiesForBaseUri() {
-        return getOkHttpClient().cookieJar().loadForRequest(
-                HttpUrl.parse(mBaseUri.toString()));
+    public OwnCloudVersion getOwnCloudVersion() {
+        return mVersion;
+    }
+
+    public void setOwnCloudVersion(OwnCloudVersion version) {
+        mVersion = version;
     }
 
     public OwnCloudAccount getAccount() {
@@ -249,7 +364,117 @@ 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) {
+                        Log_OC.e(
+                                TAG,
+                                "Error while trying to refresh auth token for " + mAccount.getSavedAccount().name,
+                                e
+                        );
+                    }
+                }
+
+                if (!credentialsWereRefreshed && mOwnCloudClientManager != null) {
+                    // if credentials are not refreshed, client must be removed
+                    // from the OwnCloudClientManager to prevent it is reused once and again
+                    mOwnCloudClientManager.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 should = (httpStatusCode == HttpConstants.HTTP_UNAUTHORIZED || isIdPRedirection());   // invalid credentials
+
+        should &= (mCredentials != null &&         // real credentials
+                !(mCredentials instanceof OwnCloudCredentialsFactory.OwnCloudAnonymousCredentials));
+
+        // test if have all the needed to effectively invalidate ...
+        should &= (mAccount != null && mAccount.getSavedAccount() != null && getContext() != null);
+
+        return should;
+    }
+
+    /**
+     * Invalidates credentials stored for the given account in the system  {@link AccountManager} and in
+     * current {@link OwnCloudClientManagerFactory#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 OwnCloudClientManager getOwnCloudClientManager() {
+        return mOwnCloudClientManager;
+    }
+
+    void setOwnCloudClientManager(OwnCloudClientManager clientManager) {
+        mOwnCloudClientManager = clientManager;
+    }
+
+    /**
+     * Check if the redirection is to an identity provider such as SAML or wayf
+     *
+     * @return true if the redirection location includes SAML or wayf, false otherwise
+     */
+    private boolean isIdPRedirection() {
+        return (mRedirectedLocation != null &&
+                (mRedirectedLocation.toUpperCase().contains("SAML") ||
+                        mRedirectedLocation.toLowerCase().contains("wayf")));
+    }
+
+    public boolean followRedirects() {
+        return mFollowRedirects;
+    }
+
     public void setFollowRedirects(boolean followRedirects) {
         this.mFollowRedirects = followRedirects;
     }
-}
+}

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

@@ -0,0 +1,162 @@
+/* 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.common;
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.accounts.AccountManagerFuture;
+import android.accounts.AuthenticatorException;
+import android.accounts.OperationCanceledException;
+import android.app.Activity;
+import android.content.Context;
+import android.net.Uri;
+import android.os.Bundle;
+
+import com.owncloud.android.lib.common.accounts.AccountTypeUtils;
+import com.owncloud.android.lib.common.accounts.AccountUtils;
+import com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundException;
+import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory;
+import com.owncloud.android.lib.resources.status.OwnCloudVersion;
+
+import java.io.IOException;
+
+public class OwnCloudClientFactory {
+
+    final private static String TAG = OwnCloudClientFactory.class.getSimpleName();
+
+    /**
+     * Creates a OwnCloudClient setup for an ownCloud account
+     * <p>
+     * Do not call this method from the main thread.
+     *
+     * @param account         The ownCloud account
+     * @param appContext      Android application context
+     * @param currentActivity Caller {@link Activity}
+     * @return A OwnCloudClient object ready to be used
+     * @throws AuthenticatorException     If the authenticator failed to get the authorization
+     *                                    token for the account.
+     * @throws OperationCanceledException If the authenticator operation was cancelled while
+     *                                    getting the authorization token for the account.
+     * @throws IOException                If there was some I/O error while getting the
+     *                                    authorization token for the account.
+     * @throws AccountNotFoundException   If 'account' is unknown for the AccountManager
+     */
+    public static OwnCloudClient createOwnCloudClient(Account account, Context appContext,
+                                                      Activity currentActivity)
+            throws OperationCanceledException, AuthenticatorException, IOException,
+            AccountNotFoundException {
+        Uri baseUri = Uri.parse(AccountUtils.getBaseUrlForAccount(appContext, account));
+        AccountManager am = AccountManager.get(appContext);
+        // TODO avoid calling to getUserData here
+        boolean isOauth2 =
+                am.getUserData(account, AccountUtils.Constants.KEY_SUPPORTS_OAUTH2) != null;
+        boolean isSamlSso =
+                am.getUserData(account, AccountUtils.Constants.KEY_SUPPORTS_SAML_WEB_SSO) != null;
+        OwnCloudClient client = createOwnCloudClient(baseUri, appContext, !isSamlSso);
+
+        String username = AccountUtils.getUsernameForAccount(account);
+        if (isOauth2) {    // TODO avoid a call to getUserData here
+            AccountManagerFuture<Bundle> future = am.getAuthToken(
+                    account,
+                    AccountTypeUtils.getAuthTokenTypeAccessToken(account.type),
+                    null,
+                    currentActivity,
+                    null,
+                    null);
+
+            Bundle result = future.getResult();
+            String accessToken = result.getString(AccountManager.KEY_AUTHTOKEN);
+            if (accessToken == null) {
+                throw new AuthenticatorException("WTF!");
+            }
+            client.setCredentials(
+                    OwnCloudCredentialsFactory.newBearerCredentials(username, accessToken)
+            );
+
+        } else if (isSamlSso) {    // TODO avoid a call to getUserData here
+            AccountManagerFuture<Bundle> future = am.getAuthToken(
+                    account,
+                    AccountTypeUtils.getAuthTokenTypeSamlSessionCookie(account.type),
+                    null,
+                    currentActivity,
+                    null,
+                    null);
+
+            Bundle result = future.getResult();
+            String accessToken = result.getString(AccountManager.KEY_AUTHTOKEN);
+            if (accessToken == null) {
+                throw new AuthenticatorException("WTF!");
+            }
+            client.setCredentials(
+                    OwnCloudCredentialsFactory.newSamlSsoCredentials(username, accessToken)
+            );
+
+        } else {
+            AccountManagerFuture<Bundle> future = am.getAuthToken(
+                    account,
+                    AccountTypeUtils.getAuthTokenTypePass(account.type),
+                    null,
+                    currentActivity,
+                    null,
+                    null
+            );
+
+            Bundle result = future.getResult();
+            String password = result.getString(AccountManager.KEY_AUTHTOKEN);
+            OwnCloudVersion version = AccountUtils.getServerVersionForAccount(account, appContext);
+            client.setCredentials(
+                    OwnCloudCredentialsFactory.newBasicCredentials(
+                            username,
+                            password,
+                            (version != null && version.isPreemptiveAuthenticationPreferred())
+                    )
+            );
+        }
+
+        // Restore cookies
+        AccountUtils.restoreCookies(account, client, appContext);
+
+        return client;
+    }
+
+    /**
+     * 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/OwnCloudClientManager.java

@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2021 ownCloud GmbH.
+ *   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
@@ -22,20 +22,33 @@
  *
  */
 
-package com.owncloud.android.lib.resources.files.services
+package com.owncloud.android.lib.common;
 
-import com.owncloud.android.lib.common.operations.RemoteOperationResult
-import com.owncloud.android.lib.resources.Service
+import android.accounts.AuthenticatorException;
+import android.accounts.OperationCanceledException;
+import android.content.Context;
 
-interface ChunkService : Service {
-    fun removeFile(
-        remotePath: String
-    ): RemoteOperationResult<Unit>
+import com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundException;
 
-    fun moveFile(
-        sourceRemotePath: String,
-        targetRemotePath: String,
-        fileLastModificationTimestamp: String,
-        fileLength: Long
-    ): RemoteOperationResult<Unit>
-}
+import java.io.IOException;
+
+/**
+ * Manager to create and reuse OwnCloudClient instances to access remote OC servers.
+ *
+ * @author David A. Velasco
+ * @author masensio
+ * @author Christian Schabesberger
+ */
+
+public interface OwnCloudClientManager {
+
+    OwnCloudClient getClientFor(OwnCloudAccount account, Context context) throws AccountNotFoundException,
+            OperationCanceledException, AuthenticatorException,
+            IOException;
+
+    OwnCloudClient removeClientFor(OwnCloudAccount account);
+
+    void saveAllClients(Context context, String accountType)
+            throws AccountNotFoundException, AuthenticatorException,
+            IOException, OperationCanceledException;
+}

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

@@ -0,0 +1,101 @@
+/* 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;
+
+public class OwnCloudClientManagerFactory {
+
+    private static Policy sDefaultPolicy = Policy.ALWAYS_NEW_CLIENT;
+    private static OwnCloudClientManager sDefaultSingleton;
+    private static String sUserAgent;
+
+    public static OwnCloudClientManager newDefaultOwnCloudClientManager() {
+        return newOwnCloudClientManager(sDefaultPolicy);
+    }
+
+    public static OwnCloudClientManager newOwnCloudClientManager(Policy policy) {
+        switch (policy) {
+            case ALWAYS_NEW_CLIENT:
+                return new SimpleFactoryManager();
+
+            case SINGLE_SESSION_PER_ACCOUNT:
+                return new SingleSessionManager();
+
+            case SINGLE_SESSION_PER_ACCOUNT_IF_SERVER_SUPPORTS_SERVER_MONITORING:
+                return new DynamicSessionManager();
+
+            default:
+                throw new IllegalArgumentException("Unknown policy");
+        }
+    }
+
+    public static OwnCloudClientManager getDefaultSingleton() {
+        if (sDefaultSingleton == null) {
+            sDefaultSingleton = newDefaultOwnCloudClientManager();
+        }
+        return sDefaultSingleton;
+    }
+
+    public static Policy getDefaultPolicy() {
+        return sDefaultPolicy;
+    }
+
+    public static void setDefaultPolicy(Policy policy) {
+        if (policy == null) {
+            throw new IllegalArgumentException("Default policy cannot be NULL");
+        }
+        if (defaultSingletonMustBeUpdated(policy)) {
+            sDefaultSingleton = null;
+        }
+        sDefaultPolicy = policy;
+    }
+
+    public static String getUserAgent() {
+        return sUserAgent;
+    }
+
+    public static void setUserAgent(String userAgent) {
+        sUserAgent = userAgent;
+    }
+
+    private static boolean defaultSingletonMustBeUpdated(Policy policy) {
+        if (sDefaultSingleton == null) {
+            return false;
+        }
+        if (policy == Policy.ALWAYS_NEW_CLIENT &&
+                !(sDefaultSingleton instanceof SimpleFactoryManager)) {
+            return true;
+        }
+        if (policy == Policy.SINGLE_SESSION_PER_ACCOUNT &&
+                !(sDefaultSingleton instanceof SingleSessionManager)) {
+            return true;
+        }
+        return false;
+    }
+
+    public static enum Policy {
+        ALWAYS_NEW_CLIENT,
+        SINGLE_SESSION_PER_ACCOUNT,
+        SINGLE_SESSION_PER_ACCOUNT_IF_SERVER_SUPPORTS_SERVER_MONITORING
+    }
+}

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

@@ -0,0 +1,79 @@
+/* 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.AuthenticatorException;
+import android.accounts.OperationCanceledException;
+import android.content.Context;
+
+import com.owncloud.android.lib.common.accounts.AccountUtils;
+import com.owncloud.android.lib.common.utils.Log_OC;
+
+import java.io.IOException;
+
+public class SimpleFactoryManager implements OwnCloudClientManager {
+
+    private static final String TAG = SimpleFactoryManager.class.getSimpleName();
+
+    @Override
+    public OwnCloudClient getClientFor(OwnCloudAccount account, Context context) throws
+            OperationCanceledException, AuthenticatorException, IOException {
+
+        Log_OC.d(TAG, "getClientFor(OwnCloudAccount ... : ");
+
+        OwnCloudClient client = OwnCloudClientFactory.createOwnCloudClient(
+                account.getBaseUri(),
+                context.getApplicationContext(),
+                true);
+
+        Log_OC.v(TAG, "    new client {" +
+                (account.getName() != null ?
+                        account.getName() :
+                        AccountUtils.buildAccountName(account.getBaseUri(), "")
+
+                ) + ", " + client.hashCode() + "}");
+
+        if (account.getCredentials() == null) {
+            account.loadCredentials(context);
+        }
+        client.setCredentials(account.getCredentials());
+        client.setAccount(account);
+        client.setContext(context);
+        client.setOwnCloudClientManager(this);
+        return client;
+    }
+
+    @Override
+    public OwnCloudClient removeClientFor(OwnCloudAccount account) {
+        // nothing to do - not taking care of tracking instances!
+        return null;
+    }
+
+    @Override
+    public void saveAllClients(Context context, String accountType) {
+        // nothing to do - not taking care of tracking instances!
+    }
+
+}

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

@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2020 ownCloud GmbH.
+ *   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
@@ -24,78 +24,51 @@
 
 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 android.util.Log;
 
 import com.owncloud.android.lib.common.accounts.AccountUtils;
-import com.owncloud.android.lib.common.authentication.OwnCloudCredentials;
-import timber.log.Timber;
+import com.owncloud.android.lib.common.authentication.OwnCloudSamlSsoCredentials;
+import com.owncloud.android.lib.common.utils.Log_OC;
 
 import java.io.IOException;
+import java.util.Iterator;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
 /**
+ * Implementation of {@link OwnCloudClientManager}
+ * <p>
+ * TODO check multithreading safety
+ *
  * @author David A. Velasco
  * @author masensio
  * @author Christian Schabesberger
  * @author David González Verdugo
  */
 
-public class SingleSessionManager {
+public class SingleSessionManager implements OwnCloudClientManager {
 
-    private static SingleSessionManager sDefaultSingleton;
-    private static String sUserAgent;
-    private static ConnectionValidator sConnectionValidator;
+    private static final String TAG = SingleSessionManager.class.getSimpleName();
 
-    private ConcurrentMap<String, OwnCloudClient> mClientsWithKnownUsername = new ConcurrentHashMap<>();
-    private ConcurrentMap<String, OwnCloudClient> mClientsWithUnknownUsername = new ConcurrentHashMap<>();
+    private ConcurrentMap<String, OwnCloudClient> mClientsWithKnownUsername =
+            new ConcurrentHashMap<>();
 
-    public static SingleSessionManager getDefaultSingleton() {
-        if (sDefaultSingleton == null) {
-            sDefaultSingleton = new SingleSessionManager();
+    private ConcurrentMap<String, OwnCloudClient> mClientsWithUnknownUsername =
+            new ConcurrentHashMap<>();
+
+    @Override
+    public OwnCloudClient getClientFor(OwnCloudAccount account, Context context) throws OperationCanceledException,
+            AuthenticatorException, IOException {
+
+        if (Log.isLoggable(TAG, Log.DEBUG)) {
+            Log_OC.d(TAG, "getClientFor starting ");
         }
-        return sDefaultSingleton;
-    }
-
-    public static void setConnectionValidator(ConnectionValidator connectionValidator) {
-        sConnectionValidator = connectionValidator;
-    }
-
-    public static ConnectionValidator getConnectionValidator() {
-        return sConnectionValidator;
-    }
-
-    public static String getUserAgent() {
-        return sUserAgent;
-    }
-
-    public static void setUserAgent(String userAgent) {
-        sUserAgent = userAgent;
-    }
-
-    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 ");
         if (account == null) {
             throw new IllegalArgumentException("Cannot get an OwnCloudClient for a null account");
         }
@@ -103,7 +76,9 @@ public class SingleSessionManager {
         OwnCloudClient client = null;
         String accountName = account.getName();
         String sessionName = account.getCredentials() == null ? "" :
-                AccountUtils.buildAccountName(account.getBaseUri(), account.getCredentials().getAuthToken());
+                AccountUtils.buildAccountName(
+                        account.getBaseUri(),
+                        account.getCredentials().getAuthToken());
 
         if (accountName != null) {
             client = mClientsWithKnownUsername.get(accountName);
@@ -113,79 +88,77 @@ public class SingleSessionManager {
             if (accountName != null) {
                 client = mClientsWithUnknownUsername.remove(sessionName);
                 if (client != null) {
-                    Timber.v("reusing client for session %s", sessionName);
-
+                    if (Log.isLoggable(TAG, Log.VERBOSE)) {
+                        Log_OC.v(TAG, "reusing client for session " + sessionName);
+                    }
                     mClientsWithKnownUsername.put(accountName, client);
-                    Timber.v("moved client to account %s", accountName);
+                    if (Log.isLoggable(TAG, Log.VERBOSE)) {
+                        Log_OC.v(TAG, "moved client to account " + accountName);
+                    }
                 }
             } else {
                 client = mClientsWithUnknownUsername.get(sessionName);
             }
         } 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());
+            if (Log.isLoggable(TAG, Log.VERBOSE)) {
+                Log_OC.v(TAG, "reusing client for account " + accountName);
             }
             reusingKnown = true;
         }
 
         if (client == null) {
             // no client to reuse - create a new one
-            client = createOwnCloudClient(
+            client = OwnCloudClientFactory.createOwnCloudClient(
                     account.getBaseUri(),
-                    context,
-                    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();
-
+                    context.getApplicationContext(),
+                    true);    // TODO remove dependency on OwnCloudClientFactory
             client.setAccount(account);
+            client.setContext(context);
+            client.setOwnCloudClientManager(this);
 
             account.loadCredentials(context);
             client.setCredentials(account.getCredentials());
 
+            if (client.getCredentials() instanceof OwnCloudSamlSsoCredentials) {
+                client.disableAutomaticCookiesHandling();
+            }
+
             if (accountName != null) {
                 mClientsWithKnownUsername.put(accountName, client);
-                Timber.v("new client for account %s", accountName);
+                if (Log.isLoggable(TAG, Log.VERBOSE)) {
+                    Log_OC.v(TAG, "new client for account " + accountName);
+                }
 
             } else {
                 mClientsWithUnknownUsername.put(sessionName, client);
-                Timber.v("new client for session %s", sessionName);
+                if (Log.isLoggable(TAG, Log.VERBOSE)) {
+                    Log_OC.v(TAG, "new client for session " + sessionName);
+                }
             }
         } else {
-            if (!reusingKnown) {
-                Timber.v("reusing client for session %s", sessionName);
+            if (!reusingKnown && Log.isLoggable(TAG, Log.VERBOSE)) {
+                Log_OC.v(TAG, "reusing client for session " + sessionName);
             }
 
+            keepCredentialsUpdated(client);
+            keepCookiesUpdated(context, account, client);
             keepUriUpdated(account, client);
         }
-        Timber.d("getClientFor finishing ");
+
+        if (Log.isLoggable(TAG, Log.DEBUG)) {
+            Log_OC.d(TAG, "getClientFor finishing ");
+        }
         return client;
     }
 
-    public void removeClientFor(OwnCloudAccount account) {
-        Timber.d("removeClientFor starting ");
+    @Override
+    public OwnCloudClient removeClientFor(OwnCloudAccount account) {
+        if (Log.isLoggable(TAG, Log.DEBUG)) {
+            Log_OC.d(TAG, "removeClientFor starting ");
+        }
 
         if (account == null) {
-            return;
+            return null;
         }
 
         OwnCloudClient client;
@@ -193,25 +166,62 @@ public class SingleSessionManager {
         if (accountName != null) {
             client = mClientsWithKnownUsername.remove(accountName);
             if (client != null) {
-                Timber.v("Removed client for account %s", accountName);
-                return;
+                if (Log.isLoggable(TAG, Log.VERBOSE)) {
+                    Log_OC.v(TAG, "Removed client for account " + accountName);
+                }
+                return client;
             } else {
-                Timber.v("No client tracked for  account %s", accountName);
+                if (Log.isLoggable(TAG, Log.VERBOSE)) {
+                    Log_OC.v(TAG, "No client tracked for  account " + accountName);
+                }
             }
         }
 
         mClientsWithUnknownUsername.clear();
 
-        Timber.d("removeClientFor finishing ");
+        if (Log.isLoggable(TAG, Log.DEBUG)) {
+            Log_OC.d(TAG, "removeClientFor finishing ");
+        }
+        return null;
     }
 
-    public void refreshCredentialsForAccount(String accountName, OwnCloudCredentials credentials) {
-        OwnCloudClient ownCloudClient = mClientsWithKnownUsername.get(accountName);
-        if (ownCloudClient == null) {
-            return;
+    @Override
+    public void saveAllClients(Context context, String accountType) {
+
+        if (Log.isLoggable(TAG, Log.DEBUG)) {
+            Log_OC.d(TAG, "Saving sessions... ");
+        }
+
+        Iterator<String> accountNames = mClientsWithKnownUsername.keySet().iterator();
+        String accountName;
+        Account account;
+        while (accountNames.hasNext()) {
+            accountName = accountNames.next();
+            account = new Account(accountName, accountType);
+            AccountUtils.saveClient(
+                    mClientsWithKnownUsername.get(accountName),
+                    account,
+                    context);
+        }
+
+        if (Log.isLoggable(TAG, Log.DEBUG)) {
+            Log_OC.d(TAG, "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 != "" && !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
@@ -222,4 +232,4 @@ public class SingleSessionManager {
             reusedClient.setBaseUri(recentUri);
         }
     }
-}
+}

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

@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2020 ownCloud GmbH.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -41,4 +41,9 @@ public class AccountTypeUtils {
     public static String getAuthTokenTypeRefreshToken(String accountType) {
         return accountType + ".oauth2.refresh_token";
     }
+
+    public static String getAuthTokenTypeSamlSessionCookie(String accountType) {
+        return accountType + ".saml.web_sso.session_cookie";
+    }
+
 }

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

@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2020 ownCloud GmbH.
+ *   Copyright (C) 2019 ownCloud GmbH.
  *   Copyright (C) 2012  Bartek Przybylski
  *
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -36,12 +36,19 @@ 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.common.utils.Log_OC;
+import com.owncloud.android.lib.resources.files.FileUtils;
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;
-import timber.log.Timber;
+import okhttp3.Cookie;
 
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
 public class AccountUtils {
+
+    private static final String TAG = AccountUtils.class.getSimpleName();
+
     /**
      * Constructs full url to host and webdav resource basing on host version
      *
@@ -52,9 +59,21 @@ public class AccountUtils {
      */
     public static String getWebDavUrlForAccount(Context context, Account account)
             throws AccountNotFoundException {
+        String webDavUrlForAccount = "";
 
-        return getBaseUrlForAccount(context, account) + OwnCloudClient.WEBDAV_FILES_PATH_4_0
-                + AccountUtils.getUserId(account, context);
+        try {
+            OwnCloudCredentials ownCloudCredentials = getCredentialsForAccount(context, account);
+            webDavUrlForAccount = getBaseUrlForAccount(context, account) + OwnCloudClient.WEBDAV_FILES_PATH_4_0
+                    + ownCloudCredentials.getUsername();
+        } catch (OperationCanceledException e) {
+            e.printStackTrace();
+        } catch (AuthenticatorException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        return webDavUrlForAccount;
     }
 
     /**
@@ -89,11 +108,31 @@ public class AccountUtils {
         try {
             username = account.name.substring(0, account.name.lastIndexOf('@'));
         } catch (Exception e) {
-            Timber.e(e, "Couldn't get a username for the given account");
+            Log_OC.e(TAG, "Couldn't get a username for the given account", e);
         }
         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) {
+            Log_OC.e(TAG, "Couldn't get a the server version for an account", e);
+        }
+        return version;
+    }
+
     /**
      * @return
      * @throws IOException
@@ -107,18 +146,32 @@ public class AccountUtils {
         AccountManager am = AccountManager.get(context);
 
         String supportsOAuth2 = am.getUserData(account, AccountUtils.Constants.KEY_SUPPORTS_OAUTH2);
-        boolean isOauth2 = supportsOAuth2 != null && supportsOAuth2.equals(Constants.OAUTH_SUPPORTED_TRUE);
+        boolean isOauth2 = supportsOAuth2 != null && supportsOAuth2.equals("TRUE");
+
+        String supportsSamlSSo = am.getUserData(account,
+                AccountUtils.Constants.KEY_SUPPORTS_SAML_WEB_SSO);
+
+        boolean isSamlSso = supportsSamlSSo != null && supportsSamlSSo.equals("TRUE");
 
         String username = AccountUtils.getUsernameForAccount(account);
+        OwnCloudVersion version = new OwnCloudVersion(am.getUserData(account, Constants.KEY_OC_VERSION));
 
         if (isOauth2) {
-            Timber.i("Trying to retrieve credentials for oAuth account" + account.name);
             String accessToken = am.blockingGetAuthToken(
                     account,
                     AccountTypeUtils.getAuthTokenTypeAccessToken(account.type),
                     false);
 
             credentials = OwnCloudCredentialsFactory.newBearerCredentials(username, accessToken);
+
+        } else if (isSamlSso) {
+            String accessToken = am.blockingGetAuthToken(
+                    account,
+                    AccountTypeUtils.getAuthTokenTypeSamlSessionCookie(account.type),
+                    false);
+
+            credentials = OwnCloudCredentialsFactory.newSamlSsoCredentials(username, accessToken);
+
         } else {
             String password = am.blockingGetAuthToken(
                     account,
@@ -127,7 +180,8 @@ public class AccountUtils {
 
             credentials = OwnCloudCredentialsFactory.newBasicCredentials(
                     username,
-                    password
+                    password,
+                    version.isPreemptiveAuthenticationPreferred()
             );
         }
 
@@ -166,8 +220,67 @@ public class AccountUtils {
         if (url.contains("://")) {
             url = url.substring(serverBaseUrl.toString().indexOf("://") + 3);
         }
+        String accountName = username + "@" + url;
 
-        return username + "@" + url;
+        return accountName;
+    }
+
+    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);
+                Log_OC.d(TAG, "Saving Cookies: " + 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) {
+            Log_OC.d(TAG, "Cannot restore cookie for null account");
+
+        } else {
+            Log_OC.d(TAG, "Restoring cookies for " + 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 {
@@ -190,6 +303,11 @@ 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
@@ -198,11 +316,15 @@ public class AccountUtils {
         /**
          * Flag signaling if the ownCloud server can be accessed with OAuth2 access tokens.
          */
-
-        // TODO Please review this constants, move them out of the library, the rest of OAuth variables are in data layer
         public static final String KEY_SUPPORTS_OAUTH2 = "oc_supports_oauth2";
-
-        public static final String OAUTH_SUPPORTED_TRUE = "TRUE";
+        /**
+         * Flag signaling if the ownCloud server can be accessed with session cookies from SAML-based web single-sign-on.
+         */
+        public static final String KEY_SUPPORTS_SAML_WEB_SSO = "oc_supports_saml_web_sso";
+        /**
+         * OC account cookies
+         */
+        public static final String KEY_COOKIES = "oc_account_cookies";
 
         /**
          * OC account version
@@ -219,6 +341,10 @@ public class AccountUtils {
          */
         public static final String KEY_DISPLAY_NAME = "oc_display_name";
 
-        public static final int ACCOUNT_VERSION = 1;
+        /**
+         * OAuth2 refresh token
+         **/
+        public static final String KEY_OAUTH2_REFRESH_TOKEN = "oc_oauth2_refresh_token";
+
     }
-}
+}

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

@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2020 ownCloud GmbH.
+ *   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
@@ -23,12 +23,16 @@
  */
 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 static java.nio.charset.StandardCharsets.UTF_8;
+import okhttp3.internal.Util;
 
 public class OwnCloudBasicCredentials implements OwnCloudCredentials {
 
+    private static final String TAG = OwnCloudCredentials.class.getSimpleName();
+
     private String mUsername;
     private String mPassword;
 
@@ -37,6 +41,21 @@ 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;
@@ -47,11 +66,6 @@ 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

@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2020 ownCloud GmbH.
+ *   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
@@ -23,6 +23,8 @@
  */
 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 {
@@ -35,6 +37,16 @@ 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
@@ -46,11 +58,6 @@ 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,14 +24,16 @@
 
 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

@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2020 ownCloud GmbH.
+ *   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
@@ -24,6 +24,10 @@
 
 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";
@@ -34,10 +38,20 @@ public class OwnCloudCredentialsFactory {
         return new OwnCloudBasicCredentials(username, password);
     }
 
+    public static OwnCloudCredentials newBasicCredentials(
+            String username, String password, boolean preemptiveMode
+    ) {
+        return new OwnCloudBasicCredentials(username, password, preemptiveMode);
+    }
+
     public static OwnCloudCredentials newBearerCredentials(String username, String authToken) {
         return new OwnCloudBearerCredentials(username, authToken);
     }
 
+    public static OwnCloudCredentials newSamlSsoCredentials(String username, String sessionCookie) {
+        return new OwnCloudSamlSsoCredentials(username, sessionCookie);
+    }
+
     public static final OwnCloudCredentials getAnonymousCredentials() {
         if (sAnonymousCredentials == null) {
             sAnonymousCredentials = new OwnCloudAnonymousCredentials();
@@ -51,12 +65,14 @@ public class OwnCloudCredentialsFactory {
         }
 
         @Override
-        public String getAuthToken() {
-            return "";
+        public void applyTo(OwnCloudClient client) {
+            // Clear previous basic credentials
+            HttpClient.deleteHeaderForAllRequests(HttpConstants.AUTHORIZATION_HEADER);
+            HttpClient.deleteHeaderForAllRequests(HttpConstants.COOKIE_HEADER);
         }
 
         @Override
-        public String getHeaderAuth() {
+        public String getAuthToken() {
             return "";
         }
 

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

@@ -0,0 +1,70 @@
+/* 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.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 OwnCloudSamlSsoCredentials implements OwnCloudCredentials {
+
+    private String mUsername;
+    private String mSessionCookie;
+
+    public OwnCloudSamlSsoCredentials(String username, String sessionCookie) {
+        mUsername = username != null ? username : "";
+        mSessionCookie = sessionCookie != null ? sessionCookie : "";
+    }
+
+    @Override
+    public void applyTo(OwnCloudClient client) {
+        // Clear previous credentials
+        HttpClient.deleteHeaderForAllRequests(HttpConstants.AUTHORIZATION_HEADER);
+        HttpClient.deleteHeaderForAllRequests(HttpConstants.COOKIE_HEADER);
+
+        HttpClient.addHeaderForAllRequests(HttpConstants.COOKIE_HEADER, mSessionCookie);
+        client.setFollowRedirects(false);
+    }
+
+    @Override
+    public String getUsername() {
+        // not relevant for authentication, but relevant for informational purposes
+        return mUsername;
+    }
+
+    @Override
+    public String getAuthToken() {
+        return mSessionCookie;
+    }
+
+    @Override
+    public boolean authTokenExpires() {
+        return true;
+    }
+
+    @Override
+    public boolean authTokenCanBeRefreshed() {
+        return false;
+    }
+}

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

@@ -0,0 +1,98 @@
+/* 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.common.authentication.oauth;
+
+/**
+ * @author David A. Velasco
+ * @author Christian Schabesberger
+ */
+public class BearerCredentials {
+
+    public static final int HASH_SEED = 17;
+    public static final int HASH_OFFSET = 37;
+
+    private String mAccessToken;
+
+    /**
+     * The constructor with the bearer token
+     *
+     * @param token The bearer token
+     */
+    public BearerCredentials(String token) {
+        /*if (token == null) {
+            throw new IllegalArgumentException("Bearer token may not be null");            
+        }*/
+        mAccessToken = (token == null) ? "" : token;
+    }
+
+    /**
+     * Returns the access token
+     *
+     * @return The access token
+     */
+    public String getAccessToken() {
+        return mAccessToken;
+    }
+
+    /**
+     * Get this object string.
+     *
+     * @return The access token
+     */
+    public String toString() {
+        return mAccessToken;
+    }
+
+    /**
+     * Does a hash of the access token.
+     *
+     * @return The hash code of the access token
+     */
+    public int hashCode() {
+        return HASH_SEED * HASH_OFFSET + mAccessToken.hashCode();
+    }
+
+    /**
+     * These credentials are assumed equal if accessToken is the same.
+     *
+     * @param o The other object to compare with.
+     * @return 'True' if the object is equivalent.
+     */
+    public boolean equals(Object o) {
+        if (o == null) {
+            return false;
+        }
+        if (this == o) {
+            return true;
+        }
+        if (this.getClass().equals(o.getClass())) {
+            BearerCredentials that = (BearerCredentials) o;
+            if (mAccessToken.equals(that.mAccessToken)) {
+                return true;
+            }
+        }
+        return false;
+    }
+}

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

@@ -1,5 +1,7 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2022 ownCloud GmbH.
+ *
+ *   @author David A. Velasco
+ *   Copyright (C) 2017 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 +23,44 @@
  *   THE SOFTWARE.
  *
  */
-package com.owncloud.android.lib.common.http.methods.webdav.properties
 
-import at.bitfire.dav4jvm.Property
-import at.bitfire.dav4jvm.PropertyFactory
-import at.bitfire.dav4jvm.XmlUtils
-import org.xmlpull.v1.XmlPullParser
-import java.util.LinkedList
+package com.owncloud.android.lib.common.authentication.oauth;
 
-abstract class ShareTypeListProperty : Property {
+public class OAuth2ClientConfiguration {
 
-    val shareTypes = LinkedList<String>()
+    private String mClientId;
 
-    override fun toString() = "share types =[" + shareTypes.joinToString(", ") + "]"
+    private String mClientSecret;
 
-    abstract class Factory : PropertyFactory {
+    private String mRedirectUri;
 
-        fun create(parser: XmlPullParser, list: ShareTypeListProperty): ShareTypeListProperty {
-            XmlUtils.readTextPropertyList(parser, Property.Name(XmlUtils.NS_OWNCLOUD, "share-type"), list.shareTypes)
-            return list
-        }
+    public OAuth2ClientConfiguration(String clientId, String clientSecret, String redirectUri) {
+        mClientId = (clientId == null) ? "" : clientId;
+        mClientSecret = (clientSecret == null) ? "" : clientSecret;
+        mRedirectUri = (redirectUri == null) ? "" : redirectUri;
+    }
 
+    public String getClientId() {
+        return mClientId;
+    }
+
+    public void setClientId(String clientId) {
+        mClientId = (clientId == null) ? "" : clientId;
+    }
+
+    public String getClientSecret() {
+        return mClientSecret;
+    }
+
+    public void setClientSecret(String clientSecret) {
+        mClientSecret = (clientSecret == null) ? "" : clientSecret;
+    }
+
+    public String getRedirectUri() {
+        return mRedirectUri;
+    }
+
+    public void setRedirectUri(String redirectUri) {
+        this.mRedirectUri = (redirectUri == null) ? "" : redirectUri;
     }
 }

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

@@ -0,0 +1,68 @@
+/* ownCloud Android Library is available under MIT license
+ *
+ *   @author David A. Velasco
+ *   Copyright (C) 2017 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.authentication.oauth;
+
+/**
+ * Constant values for OAuth 2 protocol.
+ * <p>
+ * Includes required and optional parameter NAMES used in the 'authorization code' grant type.
+ */
+
+public class OAuth2Constants {
+
+    /// Parameters to send to the Authorization Endpoint
+    public static final String KEY_RESPONSE_TYPE = "response_type";
+    public static final String KEY_REDIRECT_URI = "redirect_uri";
+    public static final String KEY_CLIENT_ID = "client_id";
+    public static final String KEY_SCOPE = "scope";
+    public static final String KEY_STATE = "state";
+
+    /// Additional parameters to send to the Token Endpoint
+    public static final String KEY_GRANT_TYPE = "grant_type";
+    public static final String KEY_CODE = "code";
+
+    // Used to get the Access Token using Refresh Token
+    public static final String OAUTH2_REFRESH_TOKEN_GRANT_TYPE = "refresh_token";
+
+    /// Parameters received in an OK response from the Token Endpoint 
+    public static final String KEY_ACCESS_TOKEN = "access_token";
+    public static final String KEY_TOKEN_TYPE = "token_type";
+    public static final String KEY_EXPIRES_IN = "expires_in";
+    public static final String KEY_REFRESH_TOKEN = "refresh_token";
+
+    /// Parameters in an ERROR response
+    public static final String KEY_ERROR = "error";
+    public static final String KEY_ERROR_DESCRIPTION = "error_description";
+    public static final String KEY_ERROR_URI = "error_uri";
+    public static final String VALUE_ERROR_ACCESS_DENIED = "access_denied";
+
+    /// Extra not standard
+    public static final String KEY_USER_ID = "user_id";
+
+    /// Depends on oauth2 grant type
+    public static final String OAUTH2_RESPONSE_TYPE_CODE = "code";
+}

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

@@ -0,0 +1,141 @@
+/* ownCloud Android Library is available under MIT license
+ *
+ *   @author David A. Velasco
+ *   @author Christian Schabesberger
+ *   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.common.authentication.oauth;
+
+import android.net.Uri;
+
+import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.authentication.OwnCloudBasicCredentials;
+import com.owncloud.android.lib.common.authentication.OwnCloudCredentials;
+import com.owncloud.android.lib.common.http.methods.nonwebdav.PostMethod;
+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 okhttp3.MultipartBody;
+import okhttp3.RequestBody;
+import org.json.JSONObject;
+
+import java.net.URL;
+import java.util.Map;
+
+public class OAuth2GetAccessTokenOperation extends RemoteOperation<Map<String, String>> {
+
+    private final String mAccessTokenEndpointPath;
+    private final OAuth2ResponseParser mResponseParser;
+    private String mGrantType;
+    private String mCode;
+    private String mClientId;
+    private String mClientSecret;
+    private String mRedirectUri;
+
+    public OAuth2GetAccessTokenOperation(
+            String grantType,
+            String code,
+            String clientId,
+            String secretId,
+            String redirectUri,
+            String accessTokenEndpointPath
+    ) {
+        mClientId = clientId;
+        mClientSecret = secretId;
+        mRedirectUri = redirectUri;
+        mGrantType = grantType;
+        mCode = code;
+
+        mAccessTokenEndpointPath =
+                accessTokenEndpointPath != null ?
+                        accessTokenEndpointPath :
+                        OwnCloudOAuth2Provider.ACCESS_TOKEN_ENDPOINT_PATH
+        ;
+
+        mResponseParser = new OAuth2ResponseParser();
+    }
+
+    @Override
+    protected RemoteOperationResult run(OwnCloudClient client) {
+        RemoteOperationResult<Map<String, String>> result = null;
+
+        try {
+
+            final RequestBody requestBody = new MultipartBody.Builder()
+                    .setType(MultipartBody.FORM)
+                    .addFormDataPart(OAuth2Constants.KEY_GRANT_TYPE, mGrantType)
+                    .addFormDataPart(OAuth2Constants.KEY_CODE, mCode)
+                    .addFormDataPart(OAuth2Constants.KEY_REDIRECT_URI, mRedirectUri)
+                    .addFormDataPart(OAuth2Constants.KEY_CLIENT_ID, mClientId)
+                    .build();
+
+            Uri.Builder uriBuilder = client.getBaseUri().buildUpon();
+            uriBuilder.appendEncodedPath(mAccessTokenEndpointPath);
+
+            final PostMethod postMethod = new PostMethod(new URL(
+                    client.getBaseUri().buildUpon()
+                            .appendEncodedPath(mAccessTokenEndpointPath)
+                            .build()
+                            .toString()));
+
+            postMethod.setRequestBody(requestBody);
+
+            OwnCloudCredentials oauthCredentials =
+                    new OwnCloudBasicCredentials(mClientId, mClientSecret);
+            OwnCloudCredentials oldCredentials = switchClientCredentials(oauthCredentials);
+            client.executeHttpMethod(postMethod);
+            switchClientCredentials(oldCredentials);
+
+            String response = postMethod.getResponseBodyAsString();
+            if (response != null && response.length() > 0) {
+                JSONObject tokenJson = new JSONObject(response);
+                Map<String, String> accessTokenResult =
+                        mResponseParser.parseAccessTokenResult(tokenJson);
+                if (accessTokenResult.get(OAuth2Constants.KEY_ERROR) != null ||
+                        accessTokenResult.get(OAuth2Constants.KEY_ACCESS_TOKEN) == null) {
+                    result = new RemoteOperationResult<>(ResultCode.OAUTH2_ERROR);
+
+                } else {
+                    result = new RemoteOperationResult<>(ResultCode.OK);
+                    result.setData(accessTokenResult);
+                }
+
+            } else {
+                result = new RemoteOperationResult<>(ResultCode.OK);
+                client.exhaustResponse(postMethod.getResponseBodyAsStream());
+            }
+
+        } catch (Exception e) {
+            result = new RemoteOperationResult<>(e);
+
+        }
+        return result;
+    }
+
+    private OwnCloudCredentials switchClientCredentials(OwnCloudCredentials newCredentials) {
+        OwnCloudCredentials previousCredentials = getClient().getCredentials();
+        getClient().setCredentials(newCredentials);
+        return previousCredentials;
+    }
+}

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

@@ -1,5 +1,7 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2022 ownCloud GmbH.
+ *
+ *   @author David A. Velasco
+ *   Copyright (C) 2017 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,24 +23,24 @@
  *   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
+package com.owncloud.android.lib.common.authentication.oauth;
 
-class OCShareTypes : ShareTypeListProperty() {
+public enum OAuth2GrantType {
+    AUTHORIZATION_CODE("authorization_code"),
+    IMPLICIT("implicit"),
+    PASSWORD("password"),
+    CLIENT_CREDENTIAL("client_credentials"),
+    REFRESH_TOKEN("refresh_token")  // not a grant type conceptually, but used as such to refresh access tokens
+    ;
 
-    class Factory : ShareTypeListProperty.Factory() {
+    private String mValue;
 
-        override fun create(parser: XmlPullParser) =
-            create(parser, OCShareTypes())
-
-        override fun getName(): Property.Name = NAME
+    OAuth2GrantType(String value) {
+        mValue = value;
     }
 
-    companion object {
-        @JvmField
-        val NAME = Property.Name(XmlUtils.NS_OWNCLOUD, "share-types")
+    public String getValue() {
+        return mValue;
     }
 }

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

@@ -0,0 +1,65 @@
+/* ownCloud Android Library is available under MIT license
+ *
+ *   @author David A. Velasco
+ *   Copyright (C) 2017 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.authentication.oauth;
+
+public interface OAuth2Provider {
+
+    /**
+     * {@link OAuth2RequestBuilder} implementation for this provider.
+     *
+     * @return {@link OAuth2RequestBuilder} implementation.
+     */
+    OAuth2RequestBuilder getOperationBuilder();
+
+    /**
+     * Configuration of the client that is using this {@link OAuth2Provider}
+     * return                   Configuration of the client that is usinng this {@link OAuth2Provider}
+     */
+    OAuth2ClientConfiguration getClientConfiguration();
+
+    /**
+     * Set configuration of the client that will use this {@link OAuth2Provider}
+     *
+     * @param oAuth2ClientConfiguration Configuration of the client that will use this {@link OAuth2Provider}
+     */
+    void setClientConfiguration(OAuth2ClientConfiguration oAuth2ClientConfiguration);
+
+    /**
+     * base URI to authorization server.
+     *
+     * @return Base URL to authorization server.
+     */
+    String getAuthorizationServerUri();
+
+    /**
+     * Set base URI to authorization server.
+     *
+     * @param authorizationServerUri Set base URL to authorization server.
+     */
+    void setAuthorizationServerUri(String authorizationServerUri);
+
+}

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

@@ -0,0 +1,121 @@
+/* ownCloud Android Library is available under MIT license
+ *
+ *   @author David A. Velasco
+ *   Copyright (C) 2017 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.authentication.oauth;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class OAuth2ProvidersRegistry {
+
+    private Map<String, OAuth2Provider> mProviders = new HashMap<>();
+
+    private OAuth2Provider mDefaultProvider = null;
+
+    private OAuth2ProvidersRegistry() {
+    }
+
+    /**
+     * Singleton accesor.
+     *
+     * @return Singleton isntance of {@link OAuth2ProvidersRegistry}
+     */
+    public static OAuth2ProvidersRegistry getInstance() {
+        return LazyHolder.INSTANCE;
+    }
+
+    /**
+     * Register an {@link OAuth2Provider} with the name passed as parameter.
+     *
+     * @param name           Name to bind 'oAuthProvider' in the registry.
+     * @param oAuth2Provider An {@link OAuth2Provider} instance to keep in the registry.
+     * @throws IllegalArgumentException if 'name' or 'oAuthProvider' are null.
+     */
+    public void registerProvider(String name, OAuth2Provider oAuth2Provider) {
+        if (name == null) {
+            throw new IllegalArgumentException("Name must not be NULL");
+        }
+        if (oAuth2Provider == null) {
+            throw new IllegalArgumentException("oAuth2Provider must not be NULL");
+        }
+
+        mProviders.put(name, oAuth2Provider);
+        if (mProviders.size() == 1) {
+            mDefaultProvider = oAuth2Provider;
+        }
+    }
+
+    public OAuth2Provider unregisterProvider(String name) {
+        OAuth2Provider unregisteredProvider = mProviders.remove(name);
+        if (mProviders.size() == 0) {
+            mDefaultProvider = null;
+        } else if (unregisteredProvider != null && unregisteredProvider == mDefaultProvider) {
+            mDefaultProvider = mProviders.values().iterator().next();
+        }
+        return unregisteredProvider;
+    }
+
+    /**
+     * Get default {@link OAuth2Provider}.
+     *
+     * @return Default provider, or NULL if there is no provider.
+     */
+    public OAuth2Provider getProvider() {
+        return mDefaultProvider;
+    }
+
+    /**
+     * Get {@link OAuth2Provider} registered with the name passed as parameter.
+     *
+     * @param name Name used to register the desired {@link OAuth2Provider}
+     * @return {@link OAuth2Provider} registered with the name 'name'
+     */
+    public OAuth2Provider getProvider(String name) {
+        return mProviders.get(name);
+    }
+
+    /**
+     * Sets the {@link OAuth2Provider} registered with the name passed as parameter as the default provider
+     *
+     * @param name Name used to register the {@link OAuth2Provider} to set as default.
+     * @return {@link OAuth2Provider} set as default, or NULL if no provider was registered with 'name'.
+     */
+    public OAuth2Provider setDefaultProvider(String name) {
+        OAuth2Provider toDefault = mProviders.get(name);
+        if (toDefault != null) {
+            mDefaultProvider = toDefault;
+        }
+        return toDefault;
+    }
+
+    /**
+     * See https://en.wikipedia.org/wiki/Initialization-on-demand_holder_idiom
+     */
+    private static class LazyHolder {
+        private static final OAuth2ProvidersRegistry INSTANCE = new OAuth2ProvidersRegistry();
+    }
+
+}

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

@@ -0,0 +1,74 @@
+/* ownCloud Android Library is available under MIT license
+ *
+ *   @author David A. Velasco
+ *   Copyright (C) 2017 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.authentication.oauth;
+
+import com.owncloud.android.lib.common.utils.Log_OC;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class OAuth2QueryParser {
+
+    private static final String TAG = OAuth2QueryParser.class.getName();
+
+    private Map<String, String> mOAuth2ParsedAuthorizationResponse;
+
+    public OAuth2QueryParser() {
+        mOAuth2ParsedAuthorizationResponse = new HashMap<>();
+    }
+
+    public Map<String, String> parse(String query) {
+        mOAuth2ParsedAuthorizationResponse.clear();
+
+        if (query != null) {
+            String[] pairs = query.split("&");
+            int i = 0;
+            String key = "";
+            String value;
+            while (pairs.length > i) {
+                int j = 0;
+                String[] part = pairs[i].split("=");
+                while (part.length > j) {
+                    String p = part[j];
+                    if (j == 0) {
+                        key = p;
+                    } else if (j == 1) {
+                        value = p;
+                        mOAuth2ParsedAuthorizationResponse.put(key, value);
+                    }
+
+                    Log_OC.v(TAG, "[" + i + "," + j + "] = " + p);
+                    j++;
+                }
+                i++;
+            }
+        }
+
+        return mOAuth2ParsedAuthorizationResponse;
+    }
+
+}

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

@@ -0,0 +1,127 @@
+/**
+ * ownCloud Android client application
+ *
+ * @author David González Verdugo
+ * @author Christian Schabesberger
+ * <p>
+ * Copyright (C) 2019 ownCloud GmbH.
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ * <p>
+ * 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.common.authentication.oauth;
+
+import android.net.Uri;
+
+import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.authentication.OwnCloudBasicCredentials;
+import com.owncloud.android.lib.common.authentication.OwnCloudCredentials;
+import com.owncloud.android.lib.common.http.methods.nonwebdav.PostMethod;
+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.Log_OC;
+import okhttp3.MultipartBody;
+import okhttp3.RequestBody;
+import org.json.JSONObject;
+
+import java.net.URL;
+import java.util.Map;
+
+public class OAuth2RefreshAccessTokenOperation extends RemoteOperation<Map<String, String>> {
+
+    private static final String TAG = OAuth2RefreshAccessTokenOperation.class.getSimpleName();
+    private final String mAccessTokenEndpointPath;
+    private final OAuth2ResponseParser mResponseParser;
+    private String mClientId;
+    private String mClientSecret;
+    private String mRefreshToken;
+
+    public OAuth2RefreshAccessTokenOperation(
+            String clientId,
+            String secretId,
+            String refreshToken,
+            String accessTokenEndpointPath
+    ) {
+
+        mClientId = clientId;
+        mClientSecret = secretId;
+        mRefreshToken = refreshToken;
+
+        mAccessTokenEndpointPath =
+                accessTokenEndpointPath != null ?
+                        accessTokenEndpointPath :
+                        OwnCloudOAuth2Provider.ACCESS_TOKEN_ENDPOINT_PATH
+        ;
+
+        mResponseParser = new OAuth2ResponseParser();
+    }
+
+    @Override
+    protected RemoteOperationResult<Map<String, String>> run(OwnCloudClient client) {
+
+        try {
+            final RequestBody requestBody = new MultipartBody.Builder()
+                    .setType(MultipartBody.FORM)
+                    .addFormDataPart(OAuth2Constants.KEY_GRANT_TYPE,
+                            OAuth2GrantType.REFRESH_TOKEN.getValue())
+                    .addFormDataPart(OAuth2Constants.KEY_CLIENT_ID, mClientId)
+                    .addFormDataPart(OAuth2Constants.KEY_REFRESH_TOKEN, mRefreshToken)
+                    .build();
+
+            Uri.Builder uriBuilder = client.getBaseUri().buildUpon();
+            uriBuilder.appendEncodedPath(mAccessTokenEndpointPath);
+
+            final PostMethod postMethod = new PostMethod(new URL(
+                    client.getBaseUri().buildUpon()
+                            .appendEncodedPath(mAccessTokenEndpointPath)
+                            .build()
+                            .toString()));
+            postMethod.setRequestBody(requestBody);
+
+            final OwnCloudCredentials oauthCredentials = new OwnCloudBasicCredentials(mClientId, mClientSecret);
+
+            final OwnCloudCredentials oldCredentials = switchClientCredentials(oauthCredentials);
+            client.executeHttpMethod(postMethod);
+            switchClientCredentials(oldCredentials);
+
+            final String responseData = postMethod.getResponseBodyAsString();
+            Log_OC.d(TAG, "OAUTH2: raw response from POST TOKEN: " + responseData);
+
+            if (responseData != null && responseData.length() > 0) {
+                final JSONObject tokenJson = new JSONObject(responseData);
+
+                final Map<String, String> accessTokenResult =
+                        mResponseParser.parseAccessTokenResult(tokenJson);
+
+                final RemoteOperationResult<Map<String, String>> result = new RemoteOperationResult<>(ResultCode.OK);
+                result.setData(accessTokenResult);
+                return (accessTokenResult.get(OAuth2Constants.KEY_ERROR) != null ||
+                        accessTokenResult.get(OAuth2Constants.KEY_ACCESS_TOKEN) == null)
+                        ? new RemoteOperationResult<>(ResultCode.OAUTH2_ERROR)
+                        : result;
+            } else {
+                return new RemoteOperationResult<>(postMethod);
+            }
+
+        } catch (Exception e) {
+            return new RemoteOperationResult<>(e);
+        }
+    }
+
+    private OwnCloudCredentials switchClientCredentials(OwnCloudCredentials newCredentials) {
+        OwnCloudCredentials previousCredentials = getClient().getCredentials();
+        getClient().setCredentials(newCredentials);
+        return previousCredentials;
+    }
+}

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

@@ -1,7 +1,7 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2022 ownCloud GmbH.
  *
- *   @author David González Verdugo
+ *   @author David A. Velasco
+ *   Copyright (C) 2017 ownCloud GmbH.
  *
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -24,12 +24,25 @@
  *
  */
 
-package com.owncloud.android.lib.resources.status.services
+package com.owncloud.android.lib.common.authentication.oauth;
 
-import com.owncloud.android.lib.common.operations.RemoteOperationResult
-import com.owncloud.android.lib.resources.Service
-import com.owncloud.android.lib.resources.status.RemoteCapability
+import com.owncloud.android.lib.common.operations.RemoteOperation;
 
-interface CapabilityService : Service {
-    fun getCapabilities(): RemoteOperationResult<RemoteCapability>
-}
+public interface OAuth2RequestBuilder {
+
+    void setRequest(OAuthRequest operation);
+
+    void setGrantType(OAuth2GrantType grantType);
+
+    void setAuthorizationCode(String code);
+
+    void setRefreshToken(String refreshToken);
+
+    RemoteOperation buildOperation();
+
+    String buildUri();
+
+    enum OAuthRequest {
+        GET_AUTHORIZATION_CODE, CREATE_ACCESS_TOKEN, REFRESH_ACCESS_TOKEN
+    }
+}

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

@@ -0,0 +1,75 @@
+/**
+ * ownCloud Android client application
+ *
+ * @author David A. Velasco
+ * <p>
+ * Copyright (C) 2017 ownCloud GmbH.
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ * <p>
+ * 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.common.authentication.oauth;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.HashMap;
+import java.util.Map;
+
+class OAuth2ResponseParser {
+
+    Map<String, String> parseAccessTokenResult(JSONObject tokenJson) throws JSONException {
+        Map<String, String> resultTokenMap = new HashMap<>();
+
+        if (tokenJson.has(OAuth2Constants.KEY_ACCESS_TOKEN)) {
+            resultTokenMap.put(OAuth2Constants.KEY_ACCESS_TOKEN, tokenJson.
+                    getString(OAuth2Constants.KEY_ACCESS_TOKEN));
+        }
+        if (tokenJson.has(OAuth2Constants.KEY_TOKEN_TYPE)) {
+            resultTokenMap.put(OAuth2Constants.KEY_TOKEN_TYPE, tokenJson.
+                    getString(OAuth2Constants.KEY_TOKEN_TYPE));
+        }
+        if (tokenJson.has(OAuth2Constants.KEY_EXPIRES_IN)) {
+            resultTokenMap.put(OAuth2Constants.KEY_EXPIRES_IN, tokenJson.
+                    getString(OAuth2Constants.KEY_EXPIRES_IN));
+        }
+        if (tokenJson.has(OAuth2Constants.KEY_REFRESH_TOKEN)) {
+            resultTokenMap.put(OAuth2Constants.KEY_REFRESH_TOKEN, tokenJson.
+                    getString(OAuth2Constants.KEY_REFRESH_TOKEN));
+        }
+        if (tokenJson.has(OAuth2Constants.KEY_SCOPE)) {
+            resultTokenMap.put(OAuth2Constants.KEY_SCOPE, tokenJson.
+                    getString(OAuth2Constants.KEY_SCOPE));
+        }
+        if (tokenJson.has(OAuth2Constants.KEY_ERROR)) {
+            resultTokenMap.put(OAuth2Constants.KEY_ERROR, tokenJson.
+                    getString(OAuth2Constants.KEY_ERROR));
+        }
+        if (tokenJson.has(OAuth2Constants.KEY_ERROR_DESCRIPTION)) {
+            resultTokenMap.put(OAuth2Constants.KEY_ERROR_DESCRIPTION, tokenJson.
+                    getString(OAuth2Constants.KEY_ERROR_DESCRIPTION));
+        }
+        if (tokenJson.has(OAuth2Constants.KEY_ERROR_URI)) {
+            resultTokenMap.put(OAuth2Constants.KEY_ERROR_URI, tokenJson.
+                    getString(OAuth2Constants.KEY_ERROR_URI));
+        }
+
+        if (tokenJson.has(OAuth2Constants.KEY_USER_ID)) {   // not standard
+            resultTokenMap.put(OAuth2Constants.KEY_USER_ID, tokenJson.
+                    getString(OAuth2Constants.KEY_USER_ID));
+        }
+
+        return resultTokenMap;
+    }
+
+}

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

@@ -0,0 +1,94 @@
+/* ownCloud Android Library is available under MIT license
+ *
+ *   @author David A. Velasco
+ *   Copyright (C) 2017 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.authentication.oauth;
+
+import com.owncloud.android.lib.common.utils.Log_OC;
+
+public class OwnCloudOAuth2Provider implements OAuth2Provider {
+
+    public static final String NAME = OAuth2Provider.class.getName();
+
+    public static final String ACCESS_TOKEN_ENDPOINT_PATH = "index.php/apps/oauth2/api/v1/token";
+    private static final String AUTHORIZATION_CODE_ENDPOINT_PATH = "index.php/apps/oauth2/authorize";
+
+    private String mAuthorizationServerUrl = "";
+    private String mAccessTokenEndpointPath = ACCESS_TOKEN_ENDPOINT_PATH;
+    private String mAuthorizationCodeEndpointPath = AUTHORIZATION_CODE_ENDPOINT_PATH;
+
+    private OAuth2ClientConfiguration mClientConfiguration;
+
+    @Override
+    public OAuth2RequestBuilder getOperationBuilder() {
+        return new OwnCloudOAuth2RequestBuilder(this);
+    }
+
+    @Override
+    public OAuth2ClientConfiguration getClientConfiguration() {
+        return mClientConfiguration;
+    }
+
+    @Override
+    public void setClientConfiguration(OAuth2ClientConfiguration oAuth2ClientConfiguration) {
+        mClientConfiguration = oAuth2ClientConfiguration;
+    }
+
+    @Override
+    public String getAuthorizationServerUri() {
+        return mAuthorizationServerUrl;
+    }
+
+    @Override
+    public void setAuthorizationServerUri(String authorizationServerUri) {
+        mAuthorizationServerUrl = authorizationServerUri;
+    }
+
+    public String getAccessTokenEndpointPath() {
+        return mAccessTokenEndpointPath;
+    }
+
+    public void setAccessTokenEndpointPath(String accessTokenEndpointPath) {
+        if (accessTokenEndpointPath == null || accessTokenEndpointPath.length() <= 0) {
+            Log_OC.w(NAME, "Setting invalid access token endpoint path, going on with default");
+            mAccessTokenEndpointPath = ACCESS_TOKEN_ENDPOINT_PATH;
+        } else {
+            mAccessTokenEndpointPath = accessTokenEndpointPath;
+        }
+    }
+
+    public String getAuthorizationCodeEndpointPath() {
+        return mAuthorizationCodeEndpointPath;
+    }
+
+    public void setAuthorizationCodeEndpointPath(String authorizationCodeEndpointPath) {
+        if (authorizationCodeEndpointPath == null || authorizationCodeEndpointPath.length() <= 0) {
+            Log_OC.w(NAME, "Setting invalid authorization code endpoint path, going on with default");
+            mAuthorizationCodeEndpointPath = AUTHORIZATION_CODE_ENDPOINT_PATH;
+        } else {
+            mAuthorizationCodeEndpointPath = authorizationCodeEndpointPath;
+        }
+    }
+}

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

@@ -0,0 +1,156 @@
+/* ownCloud Android Library is available under MIT license
+ *
+ *   @author David A. Velasco
+ *   Copyright (C) 2017 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.authentication.oauth;
+
+import android.net.Uri;
+
+import com.owncloud.android.lib.common.operations.RemoteOperation;
+
+public class OwnCloudOAuth2RequestBuilder implements OAuth2RequestBuilder {
+
+    private OwnCloudOAuth2Provider mOAuth2Provider;
+
+    private OAuthRequest mRequest;
+    private OAuth2GrantType mGrantType = OAuth2GrantType.AUTHORIZATION_CODE;
+    private String mCode;
+    private String mRefreshToken;
+
+    public OwnCloudOAuth2RequestBuilder(OwnCloudOAuth2Provider ownCloudOAuth2Provider) {
+        mOAuth2Provider = ownCloudOAuth2Provider;
+    }
+
+    @Override
+    public void setRequest(OAuthRequest request) {
+        mRequest = request;
+    }
+
+    @Override
+    public void setGrantType(OAuth2GrantType grantType) {
+        mGrantType = grantType;
+    }
+
+    @Override
+    public void setAuthorizationCode(String code) {
+        mCode = code;
+    }
+
+    @Override
+    public void setRefreshToken(String refreshToken) {
+        mRefreshToken = refreshToken;
+    }
+
+    @Override
+    public RemoteOperation buildOperation() {
+        if (mGrantType != OAuth2GrantType.AUTHORIZATION_CODE &&
+                mGrantType != OAuth2GrantType.REFRESH_TOKEN) {
+            throw new UnsupportedOperationException(
+                    "Unsupported grant type. Only " +
+                            OAuth2GrantType.AUTHORIZATION_CODE.getValue() + " and " +
+                            OAuth2GrantType.REFRESH_TOKEN + " are supported"
+            );
+        }
+        OAuth2ClientConfiguration clientConfiguration = mOAuth2Provider.getClientConfiguration();
+
+        switch (mRequest) {
+            case CREATE_ACCESS_TOKEN:
+                return new OAuth2GetAccessTokenOperation(
+                        mGrantType.getValue(),
+                        mCode,
+                        clientConfiguration.getClientId(),
+                        clientConfiguration.getClientSecret(),
+                        clientConfiguration.getRedirectUri(),
+                        mOAuth2Provider.getAccessTokenEndpointPath()
+                );
+
+            case REFRESH_ACCESS_TOKEN:
+                return new OAuth2RefreshAccessTokenOperation(
+                        clientConfiguration.getClientId(),
+                        clientConfiguration.getClientSecret(),
+                        mRefreshToken,
+                        mOAuth2Provider.getAccessTokenEndpointPath()
+                );
+            default:
+                throw new UnsupportedOperationException(
+                        "Unsupported request"
+                );
+        }
+    }
+
+    @Override
+    public String buildUri() {
+        if (OAuth2GrantType.AUTHORIZATION_CODE != mGrantType) {
+            throw new UnsupportedOperationException(
+                    "Unsupported grant type. Only " +
+                            OAuth2GrantType.AUTHORIZATION_CODE.getValue() + " is supported by this provider"
+            );
+        }
+        OAuth2ClientConfiguration clientConfiguration = mOAuth2Provider.getClientConfiguration();
+        Uri uri;
+        Uri.Builder uriBuilder;
+        switch (mRequest) {
+            case GET_AUTHORIZATION_CODE:
+                uri = Uri.parse(mOAuth2Provider.getAuthorizationServerUri());
+                uriBuilder = uri.buildUpon();
+                uriBuilder.appendEncodedPath(mOAuth2Provider.getAuthorizationCodeEndpointPath());
+                uriBuilder.appendQueryParameter(
+                        OAuth2Constants.KEY_RESPONSE_TYPE, OAuth2Constants.OAUTH2_RESPONSE_TYPE_CODE
+                );
+                uriBuilder.appendQueryParameter(
+                        OAuth2Constants.KEY_REDIRECT_URI, clientConfiguration.getRedirectUri()
+                );
+                uriBuilder.appendQueryParameter(
+                        OAuth2Constants.KEY_CLIENT_ID, clientConfiguration.getClientId()
+                );
+
+                uri = uriBuilder.build();
+                return uri.toString();
+
+            case CREATE_ACCESS_TOKEN:
+                uri = Uri.parse(mOAuth2Provider.getAuthorizationServerUri());
+                uriBuilder = uri.buildUpon();
+                uriBuilder.appendEncodedPath(mOAuth2Provider.getAccessTokenEndpointPath());
+                uriBuilder.appendQueryParameter(
+                        OAuth2Constants.KEY_RESPONSE_TYPE, OAuth2Constants.OAUTH2_RESPONSE_TYPE_CODE
+                );
+                uriBuilder.appendQueryParameter(
+                        OAuth2Constants.KEY_REDIRECT_URI, clientConfiguration.getRedirectUri()
+                );
+                uriBuilder.appendQueryParameter(
+                        OAuth2Constants.KEY_CLIENT_ID, clientConfiguration.getClientId()
+                );
+
+                uri = uriBuilder.build();
+                return uri.toString();
+
+            default:
+                throw new UnsupportedOperationException(
+                        "Unsupported request"
+                );
+        }
+    }
+
+}

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

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

@@ -1,31 +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
-
-import okhttp3.Interceptor
-
-class DummyInterceptor : Interceptor {
-    override fun intercept(chain: Interceptor.Chain) = chain.proceed(chain.request())
-}

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

@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2020 ownCloud GmbH.
+ *   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
@@ -26,24 +26,30 @@ package com.owncloud.android.lib.common.http;
 
 import android.content.Context;
 
+import android.os.Build;
+import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
+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 com.owncloud.android.lib.common.utils.Log_OC;
 import okhttp3.Cookie;
 import okhttp3.CookieJar;
 import okhttp3.HttpUrl;
 import okhttp3.OkHttpClient;
 import okhttp3.Protocol;
-import okhttp3.TlsVersion;
-import timber.log.Timber;
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSocketFactory;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
 import java.security.NoSuchAlgorithmException;
-import java.util.Collections;
+import java.util.ArrayList;
+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;
 
 /**
@@ -51,97 +57,144 @@ import java.util.concurrent.TimeUnit;
  *
  * @author David González Verdugo
  */
-
 public class HttpClient {
-    private Context mContext;
-    private HashMap<String, List<Cookie>> mCookieStore = new HashMap<>();
-    private LogInterceptor mLogInterceptor = new LogInterceptor();
+    private static final String TAG = HttpClient.class.toString();
 
-    private OkHttpClient mOkHttpClient = null;
+    private static OkHttpClient sOkHttpClient;
+    private static HttpInterceptor sOkHttpInterceptor;
+    private static Context sContext;
+    private static HashMap<String, List<Cookie>> sCookieStore = new HashMap<>();
 
-    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) {
+    public static OkHttpClient getOkHttpClient() {
+        if (sOkHttpClient == null) {
             try {
                 final X509TrustManager trustManager = new AdvancedX509TrustManager(
-                        NetworkUtils.getKnownServersStore(mContext));
+                        NetworkUtils.getKnownServersStore(sContext));
+
+                SSLContext sslContext;
+
+                try {
+                    sslContext = SSLContext.getInstance("TLSv1.2");
+                } catch (NoSuchAlgorithmException tlsv12Exception) {
+                    try {
+                        Log_OC.w(TAG, "TLSv1.2 is not supported in this device; falling through TLSv1.1");
+                        sslContext = SSLContext.getInstance("TLSv1.1");
+                    } catch (NoSuchAlgorithmException tlsv11Exception) {
+                        Log_OC.w(TAG, "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;
+
+                if (Build.VERSION.SDK_INT == Build.VERSION_CODES.KITKAT) {
+                    // TLS v1.2 is disabled by default in API 19, use custom SSLSocketFactory to enable it
+                    sslSocketFactory = new TLSSocketFactory(sslContext.getSocketFactory());
+                } else {
+                    sslSocketFactory = sslContext.getSocketFactory();
+                }
 
                 // Automatic cookie handling, NOT PERSISTENT
-                final CookieJar cookieJar = new CookieJarImpl(mCookieStore);
-                mOkHttpClient = buildNewOkHttpClient(sslSocketFactory, trustManager, cookieJar);
+                CookieJar cookieJar = new CookieJar() {
+                    @Override
+                    public void saveFromResponse(HttpUrl url, List<Cookie> cookies) {
+                        // Avoid duplicated cookies
+                        Set<Cookie> nonDuplicatedCookiesSet = new HashSet<>();
+                        nonDuplicatedCookiesSet.addAll(cookies);
+                        List<Cookie> nonDuplicatedCookiesList = new ArrayList<>();
+                        nonDuplicatedCookiesList.addAll(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 okHttp client.");
-                throw new RuntimeException("Could not setup okHttp client.", e);
+                Log_OC.e(TAG, "Could not setup SSL system.", e);
             }
         }
-        return mOkHttpClient;
+        return sOkHttpClient;
     }
 
-    private SSLContext buildSSLContext() throws NoSuchAlgorithmException {
-        try {
-            return SSLContext.getInstance(TlsVersion.TLS_1_3.javaName());
-        } catch (NoSuchAlgorithmException tlsv13Exception) {
-            try {
-                Timber.w("TLSv1.3 is not supported in this device; falling through TLSv1.2");
-                return SSLContext.getInstance(TlsVersion.TLS_1_2.javaName());
-            } 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());
-                } catch (NoSuchAlgorithmException tlsv11Exception) {
-                    Timber.w("TLSv1.1 is not supported in this device; falling through TLSv1.0");
-                    return SSLContext.getInstance(TlsVersion.TLS_1_0.javaName());
-                    // should be available in any device; see reference of supported protocols in
-                    // http://developer.android.com/reference/javax/net/ssl/SSLSocket.html
-                }
-            }
+    private static HttpInterceptor getOkHttpInterceptor() {
+        if (sOkHttpInterceptor == null) {
+            sOkHttpInterceptor = new HttpInterceptor();
+            addHeaderForAllRequests(HttpConstants.USER_AGENT_HEADER, OwnCloudClientManagerFactory.getUserAgent());
+            addHeaderForAllRequests(HttpConstants.PARAM_SINGLE_COOKIE_HEADER, "true");
+            addHeaderForAllRequests(HttpConstants.ACCEPT_ENCODING_HEADER, HttpConstants.ACCEPT_ENCODING_IDENTITY);
         }
+        return sOkHttpInterceptor;
     }
 
-    private OkHttpClient buildNewOkHttpClient(SSLSocketFactory sslSocketFactory, X509TrustManager trustManager,
-                                              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();
+    /**
+     * Add header that will be included for all the requests from now on
+     *
+     * @param headerName
+     * @param headerValue
+     */
+    public static void addHeaderForAllRequests(String headerName, String headerValue) {
+        getOkHttpInterceptor()
+                .addRequestInterceptor(
+                        new RequestHeaderInterceptor(headerName, headerValue)
+                );
+    }
+
+    public static void deleteHeaderForAllRequests(String headerName) {
+        getOkHttpInterceptor().deleteRequestHeaderInterceptor(headerName);
     }
 
     public Context getContext() {
-        return mContext;
+        return sContext;
     }
 
-    public LogInterceptor getLogInterceptor() {
-        return mLogInterceptor;
+    public static void setContext(Context context) {
+        sContext = context;
+    }
+
+    public void disableAutomaticCookiesHandling() {
+        OkHttpClient.Builder clientBuilder = getOkHttpClient().newBuilder();
+        clientBuilder.cookieJar(new CookieJar() {
+            @Override
+            public void saveFromResponse(HttpUrl url, List<Cookie> cookies) {
+                // DO NOTHING
+            }
+
+            @Override
+            public List<Cookie> loadForRequest(HttpUrl url) {
+                return new ArrayList<>();
+            }
+        });
+        sOkHttpClient = clientBuilder.build();
     }
 
     public List<Cookie> getCookiesFromUrl(HttpUrl httpUrl) {
-        return mCookieStore.get(httpUrl.host());
+        return sCookieStore.get(httpUrl.host());
     }
 
     public void clearCookies() {
-        mCookieStore.clear();
+        sCookieStore.clear();
     }
-}
+}

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

@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2020 ownCloud GmbH.
+ *   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
@@ -40,44 +40,16 @@ 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";
     public static final String CONTENT_TYPE_URLENCODED_UTF8 = "application/x-www-form-urlencoded; charset=utf-8";
     public static final String ACCEPT_ENCODING_HEADER = "Accept-Encoding";
     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 *********************************************
@@ -185,7 +157,6 @@ 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
@@ -219,4 +190,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

@@ -1,65 +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
-
-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

@@ -1,179 +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
-
-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

@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2020 ownCloud GmbH.
+ *   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
@@ -74,8 +74,8 @@ public class TLSSocketFactory extends SSLSocketFactory {
     }
 
     private Socket enableTLSOnSocket(Socket socket) {
-        if((socket instanceof SSLSocket)) {
-            ((SSLSocket)socket).setEnabledProtocols(new String[] {"TLSv1.1", "TLSv1.2", "TLSv1.3"});
+        if(socket != null && (socket instanceof SSLSocket)) {
+            ((SSLSocket)socket).setEnabledProtocols(new String[] {"TLSv1.1", "TLSv1.2"});
         }
         return socket;
     }

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

@@ -0,0 +1,110 @@
+/* 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.common.http.interceptors;
+
+import okhttp3.Interceptor;
+import okhttp3.Request;
+import okhttp3.Response;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+
+/**
+ * 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();
+
+        for (RequestInterceptor interceptor : mRequestInterceptors) {
+            request = interceptor.intercept(request);
+        }
+
+        Response response = chain.proceed(request);
+
+        for (ResponseInterceptor interceptor : mResponseInterceptors) {
+            response = interceptor.intercept(response);
+        }
+
+        return response;
+    }
+
+    public HttpInterceptor addRequestInterceptor(RequestInterceptor requestInterceptor) {
+        mRequestInterceptors.add(requestInterceptor);
+        return this;
+    }
+
+    public HttpInterceptor addResponseInterceptor(ResponseInterceptor responseInterceptor) {
+        mResponseInterceptors.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) {
+        Iterator<RequestInterceptor> requestInterceptorIterator = mRequestInterceptors.iterator();
+        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/interceptors/RequestHeaderInterceptor.java

@@ -0,0 +1,54 @@
+/* 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.common.http.interceptors;
+
+import okhttp3.Request;
+
+/**
+ * Intercept requests to update their headers
+ */
+public class RequestHeaderInterceptor implements HttpInterceptor.RequestInterceptor {
+
+    private String mHeaderName;
+    private String mHeaderValue;
+
+    public RequestHeaderInterceptor(String headerName, String headerValue) {
+        this.mHeaderName = headerName;
+        this.mHeaderValue = headerValue;
+    }
+
+    @Override
+    public Request intercept(Request request) {
+        return request.newBuilder().addHeader(mHeaderName, mHeaderValue).build();
+    }
+
+    public String getHeaderName() {
+        return mHeaderName;
+    }
+
+    public String getHeaderValue() {
+        return mHeaderValue;
+    }
+}

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

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

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

@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2020 ownCloud GmbH.
+ *   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
@@ -21,23 +21,29 @@
  *   THE SOFTWARE.
  *
  */
-package com.owncloud.android.lib.common.http.methods.nonwebdav
 
-import okhttp3.OkHttpClient
-import java.io.IOException
-import java.net.URL
+package com.owncloud.android.lib.common.http.methods.nonwebdav;
+
+import java.io.IOException;
+import java.net.URL;
 
 /**
  * OkHttp delete calls wrapper
  *
  * @author David González Verdugo
  */
-class DeleteMethod(url: URL) : HttpMethod(url) {
-    @Throws(IOException::class)
-    override fun onExecute(okHttpClient: OkHttpClient): Int {
-        request = request.newBuilder()
-            .delete()
-            .build()
-        return super.onExecute(okHttpClient)
+public class DeleteMethod extends HttpMethod {
+
+    public DeleteMethod(URL url) {
+        super(url);
     }
-}
+
+    @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.java

@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2020 ownCloud GmbH.
+ *   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
@@ -21,23 +21,29 @@
  *   THE SOFTWARE.
  *
  */
-package com.owncloud.android.lib.common.http.methods.nonwebdav
 
-import okhttp3.OkHttpClient
-import java.io.IOException
-import java.net.URL
+package com.owncloud.android.lib.common.http.methods.nonwebdav;
+
+import java.io.IOException;
+import java.net.URL;
 
 /**
  * OkHttp get calls wrapper
  *
  * @author David González Verdugo
  */
-class GetMethod(url: URL) : HttpMethod(url) {
-    @Throws(IOException::class)
-    override fun onExecute(okHttpClient: OkHttpClient): Int {
-        request = request.newBuilder()
-            .get()
-            .build()
-        return super.onExecute(okHttpClient)
+public class GetMethod extends HttpMethod {
+
+    public GetMethod(URL url) {
+        super(url);
     }
-}
+
+    @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.java

@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2020 ownCloud GmbH.
+ *   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
@@ -21,27 +21,29 @@
  *   THE SOFTWARE.
  *
  */
-package com.owncloud.android.lib.common.http.methods.nonwebdav
 
-import com.owncloud.android.lib.common.http.methods.HttpBaseMethod
-import okhttp3.OkHttpClient
-import okhttp3.Response
-import java.net.URL
+package com.owncloud.android.lib.common.http.methods.nonwebdav;
+
+import com.owncloud.android.lib.common.http.methods.HttpBaseMethod;
+
+import java.io.IOException;
+import java.net.URL;
 
 /**
  * Wrapper to perform OkHttp calls
  *
  * @author David González Verdugo
  */
-abstract class HttpMethod(
-    url: URL
-) : HttpBaseMethod(url) {
+public abstract class HttpMethod extends HttpBaseMethod {
 
-    override lateinit var response: Response
-
-    public override fun onExecute(okHttpClient: OkHttpClient): Int {
-        call = okHttpClient.newCall(request)
-        call?.let { response = it.execute() }
-        return super.statusCode
+    public HttpMethod(URL url) {
+        super(url);
     }
-}
+
+    @Override
+    public int onExecute() throws IOException {
+        mCall = mOkHttpClient.newCall(mRequest);
+        mResponse = mCall.execute();
+        return super.getStatusCode();
+    }
+}

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

@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2020 ownCloud GmbH.
+ *   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
@@ -21,27 +21,29 @@
  *   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
+package com.owncloud.android.lib.common.http.methods.nonwebdav;
+
+import java.io.IOException;
+import java.net.URL;
 
 /**
  * OkHttp post calls wrapper
  *
  * @author David González Verdugo
  */
-class PostMethod(
-    url: URL,
-    private val postRequestBody: RequestBody
-) : HttpMethod(url) {
-    @Throws(IOException::class)
-    override fun onExecute(okHttpClient: OkHttpClient): Int {
-        request = request.newBuilder()
-            .post(postRequestBody)
-            .build()
-        return super.onExecute(okHttpClient)
+public class PostMethod extends HttpMethod {
+
+    public PostMethod(URL url) {
+        super(url);
     }
-}
+
+    @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.java

@@ -1,7 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2022 ownCloud GmbH.
- *
- *   @author David González Verdugo
+ *   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
@@ -24,14 +22,23 @@
  *
  */
 
-package com.owncloud.android.lib.resources
+package com.owncloud.android.lib.common.http.methods.nonwebdav;
 
-import com.owncloud.android.lib.common.OwnCloudClient
+import java.io.IOException;
+import java.net.URL;
 
-/**
- * Facade to perform network calls without the verbosity of remote operations
- */
+public class PutMethod extends HttpMethod {
 
-interface Service {
-    val client: OwnCloudClient
-}
+    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/methods/nonwebdav/PutMethod.kt

@@ -1,47 +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.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.java

@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2020 ownCloud GmbH.
+ *   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
@@ -21,11 +21,12 @@
  *   THE SOFTWARE.
  *
  */
-package com.owncloud.android.lib.common.http.methods.webdav
 
-import at.bitfire.dav4jvm.DavOCResource
-import okhttp3.Response
-import java.net.URL
+package com.owncloud.android.lib.common.http.methods.webdav;
+
+import kotlin.Unit;
+
+import java.net.URL;
 
 /**
  * Copy calls wrapper
@@ -33,20 +34,24 @@ import java.net.URL
  * @author Christian Schabesberger
  * @author David González Verdugo
  */
-class CopyMethod(
-    val url: URL,
-    private val destinationUrl: String,
-    val forceOverride: Boolean = false
-) : DavMethod(url) {
-    @Throws(Exception::class)
-    public override fun onDavExecute(davResource: DavOCResource): Int {
-        davResource.copy(
-            destinationUrl,
-            forceOverride,
-            super.getRequestHeadersAsHashMap()
-        ) { callBackResponse: Response ->
-            response = callBackResponse
-        }
-        return super.statusCode
+public class CopyMethod extends DavMethod {
+
+    final String destinationUrl;
+    final boolean forceOverride;
+
+    public CopyMethod(URL url, String destinationUrl, boolean forceOverride) {
+        super(url);
+        this.destinationUrl = destinationUrl;
+        this.forceOverride = forceOverride;
     }
-}
+
+    @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.java

@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2020 ownCloud GmbH.
+ *   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
@@ -21,12 +21,13 @@
  *   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
  */
-object DavConstants {
-    const val DEPTH_0 = 0
-    const val DEPTH_1 = 1
+public class DavConstants {
+    public static final int DEPTH_0 = 0;
+    public static final int DEPTH_1 = 1;
 }

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

@@ -0,0 +1,158 @@
+/* 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.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) {
+                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

@@ -1,97 +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.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

@@ -0,0 +1,15 @@
+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

@@ -1,60 +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.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.java

@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2020 ownCloud GmbH.
+ *   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
@@ -21,11 +21,12 @@
  *   THE SOFTWARE.
  *
  */
-package com.owncloud.android.lib.common.http.methods.webdav
 
-import at.bitfire.dav4jvm.DavOCResource
-import okhttp3.Response
-import java.net.URL
+package com.owncloud.android.lib.common.http.methods.webdav;
+
+import kotlin.Unit;
+
+import java.net.URL;
 
 /**
  * MkCol calls wrapper
@@ -33,15 +34,18 @@ import java.net.URL
  * @author Christian Schabesberger
  * @author David González Verdugo
  */
-class MkColMethod(url: URL) : DavMethod(url) {
-    @Throws(Exception::class)
-    public override fun onDavExecute(davResource: DavOCResource): Int {
-        davResource.mkCol(
-            xmlBody = null,
-            listOfHeaders = super.getRequestHeadersAsHashMap()
-        ) { callBackResponse: Response ->
-            response = callBackResponse
-        }
-        return super.statusCode
+public class MkColMethod extends DavMethod {
+    public MkColMethod(URL url) {
+        super(url);
     }
-}
+
+    @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

@@ -0,0 +1,61 @@
+/* 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.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/PropfindMethod.java

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

@@ -1,73 +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.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,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2020 ownCloud GmbH.
+ *   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
@@ -21,33 +21,41 @@
  *   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
+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
  */
-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
+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/network/AdvancedX509TrustManager.java

@@ -24,7 +24,7 @@
 
 package com.owncloud.android.lib.common.network;
 
-import timber.log.Timber;
+import com.owncloud.android.lib.common.utils.Log_OC;
 
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactory;
@@ -33,6 +33,7 @@ import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
 import java.security.cert.CertPathValidatorException;
+import java.security.cert.CertStoreException;
 import java.security.cert.CertificateException;
 import java.security.cert.CertificateExpiredException;
 import java.security.cert.CertificateNotYetValidException;
@@ -43,17 +44,22 @@ import java.security.cert.X509Certificate;
  */
 public class AdvancedX509TrustManager implements X509TrustManager {
 
-    private X509TrustManager mStandardTrustManager;
+    private static final String TAG = AdvancedX509TrustManager.class.getSimpleName();
+
+    private X509TrustManager mStandardTrustManager = null;
     private KeyStore mKnownServersKeyStore;
 
     /**
      * Constructor for AdvancedX509TrustManager
      *
      * @param knownServersKeyStore Local certificates store with server certificates explicitly trusted by the user.
+     * @throws CertStoreException When no default X509TrustManager instance was found in the system.
      */
-    public AdvancedX509TrustManager(KeyStore knownServersKeyStore) throws NoSuchAlgorithmException, KeyStoreException {
+    public AdvancedX509TrustManager(KeyStore knownServersKeyStore)
+            throws NoSuchAlgorithmException, KeyStoreException, CertStoreException {
         super();
-        TrustManagerFactory factory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+        TrustManagerFactory factory = TrustManagerFactory
+                .getInstance(TrustManagerFactory.getDefaultAlgorithm());
         factory.init((KeyStore) null);
         mStandardTrustManager = findX509TrustManager(factory);
 
@@ -65,12 +71,13 @@ public class AdvancedX509TrustManager implements X509TrustManager {
      *
      * @param factory TrustManagerFactory to inspect in the search for a X509TrustManager
      * @return The first X509TrustManager found in factory.
+     * @throws CertStoreException When no X509TrustManager instance was found in factory
      */
-    private X509TrustManager findX509TrustManager(TrustManagerFactory factory) {
-        TrustManager[] tms = factory.getTrustManagers();
-        for (TrustManager tm : tms) {
-            if (tm instanceof X509TrustManager) {
-                return (X509TrustManager) tm;
+    private X509TrustManager findX509TrustManager(TrustManagerFactory factory) throws CertStoreException {
+        TrustManager tms[] = factory.getTrustManagers();
+        for (int i = 0; i < tms.length; i++) {
+            if (tms[i] instanceof X509TrustManager) {
+                return (X509TrustManager) tms[i];
             }
         }
         return null;
@@ -109,7 +116,7 @@ public class AdvancedX509TrustManager implements X509TrustManager {
                     previousCause = cause;
                     cause = cause.getCause();
                 }
-                if (cause instanceof CertPathValidatorException) {
+                if (cause != null && cause instanceof CertPathValidatorException) {
                     result.setCertPathValidatorException((CertPathValidatorException) cause);
                 } else {
                     result.setOtherCertificateException(c);
@@ -134,7 +141,7 @@ public class AdvancedX509TrustManager implements X509TrustManager {
         try {
             return (mKnownServersKeyStore.getCertificateAlias(cert) != null);
         } catch (KeyStoreException e) {
-            Timber.e(e, "Fail while checking certificate in the known-servers store");
+            Log_OC.d(TAG, "Fail while checking certificate in the known-servers store");
             return false;
         }
     }

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

@@ -0,0 +1,135 @@
+/* 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.common.network;
+
+import android.util.Log;
+
+import com.owncloud.android.lib.common.utils.Log_OC;
+import okhttp3.MediaType;
+import okio.BufferedSink;
+
+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 static final String TAG = ChunkFromFileRequestBody.class.getSimpleName();
+
+    //private final File mFile;
+    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) {
+
+                Log_OC.d(TAG, "Sink buffer size: " + sink.buffer().size());
+
+                readCount = mChannel.read(mBuffer);
+
+                Log_OC.d(TAG, "Read " + readCount + " bytes from file channel to " + mBuffer.toString());
+
+                sink.buffer().write(mBuffer.array(), 0, readCount);
+
+                sink.flush();
+
+                Log_OC.d(TAG, "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());
+                    }
+                }
+            }
+
+            Log.d(TAG, "Chunk with size " + mChunkSize + " written in request body");
+
+        } catch (Exception exception) {
+
+            Log.e(TAG, exception.toString());
+            //            // any read problem will be handled as if the file is not there
+            //            if (io instanceof FileNotFoundException) {
+            //                throw io;
+            //            } else {
+            //                FileNotFoundException fnf = new FileNotFoundException("Exception reading source file");
+            //                fnf.initCause(io);
+            //                throw fnf;
+            //            }
+        }
+    }
+
+    public void setOffset(long offset) {
+        this.mOffset = offset;
+    }
+}

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

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

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

@@ -0,0 +1,118 @@
+/* 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.common.network;
+
+import android.util.Log;
+
+import okhttp3.MediaType;
+import okhttp3.RequestBody;
+import okio.BufferedSink;
+import okio.Okio;
+import okio.Source;
+
+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 {
+
+    private static final String TAG = FileRequestBody.class.getSimpleName();
+
+    protected File mFile;
+    private MediaType mContentType;
+    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());
+                    }
+                }
+            }
+
+            Log.d(TAG, "File with name " + mFile.getName() + " and size " + mFile.length() +
+                    " written in request body");
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @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

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

@@ -26,7 +26,8 @@ package com.owncloud.android.lib.common.network;
 
 import android.content.Context;
 
-import timber.log.Timber;
+import com.owncloud.android.lib.common.utils.Log_OC;
+import org.apache.http.conn.ssl.X509HostnameVerifier;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -41,6 +42,25 @@ import java.security.cert.CertificateException;
 
 public class NetworkUtils {
 
+    /**
+     * Default timeout for waiting data from the server
+     */
+    public static final int DEFAULT_DATA_TIMEOUT = 60000;
+    /**
+     * Default timeout for establishing a connection
+     */
+    public static final int DEFAULT_CONNECTION_TIMEOUT = 60000;
+    /**
+     * Standard name for protocol TLS version 1.2 in Java Secure Socket Extension (JSSE) API
+     */
+    public static final String PROTOCOL_TLSv1_2 = "TLSv1.2";
+    /**
+     * Standard name for protocol TLS version 1.0 in JSSE API
+     */
+    public static final String PROTOCOL_TLSv1_0 = "TLSv1";
+    final private static String TAG = NetworkUtils.class.getSimpleName();
+    private static X509HostnameVerifier mHostnameVerifier = null;
+
     private static String LOCAL_TRUSTSTORE_FILENAME = "knownServers.bks";
 
     private static String LOCAL_TRUSTSTORE_PASSWORD = "password";
@@ -68,7 +88,7 @@ public class NetworkUtils {
             //mKnownServersStore = KeyStore.getInstance("BKS");
             mKnownServersStore = KeyStore.getInstance(KeyStore.getDefaultType());
             File localTrustStoreFile = new File(context.getFilesDir(), LOCAL_TRUSTSTORE_FILENAME);
-            Timber.d("Searching known-servers store at %s", localTrustStoreFile.getAbsolutePath());
+            Log_OC.d(TAG, "Searching known-servers store at " + localTrustStoreFile.getAbsolutePath());
             if (localTrustStoreFile.exists()) {
                 InputStream in = new FileInputStream(localTrustStoreFile);
                 try {
@@ -89,9 +109,22 @@ public class NetworkUtils {
 
         KeyStore knownServers = getKnownServersStore(context);
         knownServers.setCertificateEntry(Integer.toString(cert.hashCode()), cert);
-        try (FileOutputStream fos = context.openFileOutput(LOCAL_TRUSTSTORE_FILENAME, Context.MODE_PRIVATE)) {
+        FileOutputStream fos = null;
+        try {
+            fos = context.openFileOutput(LOCAL_TRUSTSTORE_FILENAME, Context.MODE_PRIVATE);
             knownServers.store(fos, LOCAL_TRUSTSTORE_PASSWORD.toCharArray());
+        } finally {
+            fos.close();
         }
     }
 
+    public static boolean isCertInKnownServersStore(Certificate cert, Context context)
+            throws KeyStoreException, NoSuchAlgorithmException, CertificateException, IOException {
+
+        KeyStore knownServers = getKnownServersStore(context);
+        Log_OC.d(TAG, "Certificate - HashCode: " + cert.hashCode() + " "
+                + Boolean.toString(knownServers.isCertificateEntry(Integer.toString(cert.hashCode()))));
+        return knownServers.isCertificateEntry(Integer.toString(cert.hashCode()));
+    }
+
 }

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

@@ -28,10 +28,10 @@ import java.util.Collection;
 
 public interface ProgressiveDataTransferer {
 
-    void addDatatransferProgressListener(OnDatatransferProgressListener listener);
+    public void addDatatransferProgressListener(OnDatatransferProgressListener listener);
 
-    void addDatatransferProgressListeners(Collection<OnDatatransferProgressListener> listeners);
+    public void addDatatransferProgressListeners(Collection<OnDatatransferProgressListener> listeners);
 
-    void removeDatatransferProgressListener(OnDatatransferProgressListener listener);
+    public void removeDatatransferProgressListener(OnDatatransferProgressListener listener);
 
 }

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

@@ -0,0 +1,145 @@
+/* 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.network;
+
+import com.owncloud.android.lib.common.utils.Log_OC;
+
+import javax.net.ssl.SSLSocket;
+import java.lang.ref.WeakReference;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.concurrent.atomic.AtomicReference;
+
+/**
+ * Enables the support of Server Name Indication if existing
+ * in the underlying network implementation.
+ * <p>
+ * Build as a singleton.
+ *
+ * @author David A. Velasco
+ */
+public class ServerNameIndicator {
+
+    private static final String TAG = ServerNameIndicator.class.getSimpleName();
+
+    private static final AtomicReference<ServerNameIndicator> mSingleInstance = new AtomicReference<ServerNameIndicator>();
+
+    private static final String METHOD_NAME = "setHostname";
+
+    private final WeakReference<Class<?>> mSSLSocketClassRef;
+    private final WeakReference<Method> mSetHostnameMethodRef;
+
+    /**
+     * Private constructor, class is a singleton.
+     *
+     * @param sslSocketClass    Underlying implementation class of {@link SSLSocket} used to connect with the server.
+     * @param setHostnameMethod Name of the method to call to enable the SNI support.
+     */
+    private ServerNameIndicator(Class<?> sslSocketClass, Method setHostnameMethod) {
+        mSSLSocketClassRef = new WeakReference<Class<?>>(sslSocketClass);
+        mSetHostnameMethodRef = (setHostnameMethod == null) ? null : new WeakReference<Method>(setHostnameMethod);
+    }
+
+    /**
+     * Calls the {@code #setHostname(String)} method of the underlying implementation
+     * of {@link SSLSocket} if exists.
+     * <p>
+     * Creates and initializes the single instance of the class when needed
+     *
+     * @param hostname  The name of the server host of interest.
+     * @param sslSocket Client socket to connect with the server.
+     */
+    public static void setServerNameIndication(String hostname, SSLSocket sslSocket) {
+        final Method setHostnameMethod = getMethod(sslSocket);
+        if (setHostnameMethod != null) {
+            try {
+                setHostnameMethod.invoke(sslSocket, hostname);
+                Log_OC.i(TAG, "SNI done, hostname: " + hostname);
+
+            } catch (IllegalArgumentException e) {
+                Log_OC.e(TAG, "Call to SSLSocket#setHost(String) failed ", e);
+
+            } catch (IllegalAccessException e) {
+                Log_OC.e(TAG, "Call to SSLSocket#setHost(String) failed ", e);
+
+            } catch (InvocationTargetException e) {
+                Log_OC.e(TAG, "Call to SSLSocket#setHost(String) failed ", e);
+            }
+        } else {
+            Log_OC.i(TAG, "SNI not supported");
+        }
+    }
+
+    /**
+     * Gets the method to invoke trying to minimize the effective
+     * application of reflection.
+     *
+     * @param sslSocket Instance of the SSL socket to use in connection with server.
+     * @return Method to call to indicate the server name of interest to the server.
+     */
+    private static Method getMethod(SSLSocket sslSocket) {
+        final Class<?> sslSocketClass = sslSocket.getClass();
+        final ServerNameIndicator instance = mSingleInstance.get();
+        if (instance == null) {
+            return initFrom(sslSocketClass);
+
+        } else if (instance.mSSLSocketClassRef.get() != sslSocketClass) {
+            // the underlying class changed
+            return initFrom(sslSocketClass);
+
+        } else if (instance.mSetHostnameMethodRef == null) {
+            // SNI not supported
+            return null;
+
+        } else {
+            final Method cachedSetHostnameMethod = instance.mSetHostnameMethodRef.get();
+            return (cachedSetHostnameMethod == null) ? initFrom(sslSocketClass) : cachedSetHostnameMethod;
+        }
+    }
+
+    /**
+     * Singleton initializer.
+     * <p>
+     * Uses reflection to extract and 'cache' the method to invoke to indicate the desited host name to the server side.
+     *
+     * @param sslSocketClass Underlying class providing the implementation of {@link SSLSocket}.
+     * @return Method to call to indicate the server name of interest to the server.
+     */
+    private static Method initFrom(Class<?> sslSocketClass) {
+        Log_OC.i(TAG, "SSLSocket implementation: " + sslSocketClass.getCanonicalName());
+        Method setHostnameMethod = null;
+        try {
+            setHostnameMethod = sslSocketClass.getMethod(METHOD_NAME, String.class);
+        } catch (SecurityException e) {
+            Log_OC.e(TAG, "Could not access to SSLSocket#setHostname(String) method ", e);
+
+        } catch (NoSuchMethodException e) {
+            Log_OC.i(TAG, "Could not find SSLSocket#setHostname(String) method - SNI not supported");
+        }
+        mSingleInstance.set(new ServerNameIndicator(sslSocketClass, setHostnameMethod));
+        return setHostnameMethod;
+    }
+
+}

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

@@ -35,8 +35,10 @@ import java.util.Date;
 import java.util.Locale;
 
 public class WebdavUtils {
+    public static final SimpleDateFormat DISPLAY_DATE_FORMAT = new SimpleDateFormat(
+            "dd.MM.yyyy hh:mm");
 
-    private static final SimpleDateFormat[] DATETIME_FORMATS = {
+    private static final SimpleDateFormat DATETIME_FORMATS[] = {
             new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US),
             new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz", Locale.US),
             new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.sss'Z'", Locale.US),
@@ -48,11 +50,11 @@ public class WebdavUtils {
     };
 
     public static Date parseResponseDate(String date) {
-        Date returnDate;
-        SimpleDateFormat format;
-        for (SimpleDateFormat datetimeFormat : DATETIME_FORMATS) {
+        Date returnDate = null;
+        SimpleDateFormat format = null;
+        for (int i = 0; i < DATETIME_FORMATS.length; ++i) {
             try {
-                format = datetimeFormat;
+                format = DATETIME_FORMATS[i];
                 synchronized (format) {
                     returnDate = format.parse(date);
                 }
@@ -80,6 +82,23 @@ public class WebdavUtils {
         return encodedPath;
     }
 
+    /**
+     * @param rawEtag
+     * @return
+     */
+    public static String parseEtag(String rawEtag) {
+        if (rawEtag == null || rawEtag.length() == 0) {
+            return "";
+        }
+        if (rawEtag.endsWith("-gzip")) {
+            rawEtag = rawEtag.substring(0, rawEtag.length() - 5);
+        }
+        if (rawEtag.length() >= 2 && rawEtag.startsWith("\"") && rawEtag.endsWith("\"")) {
+            rawEtag = rawEtag.substring(1, rawEtag.length() - 1);
+        }
+        return rawEtag;
+    }
+
     /**
      * @param httpBaseMethod from which to get the etag
      * @return etag from response
@@ -101,17 +120,4 @@ public class WebdavUtils {
         }
         return result;
     }
-
-    public static String normalizeProtocolPrefix(String url, boolean isSslConn) {
-        if (!url.toLowerCase().startsWith("http://") &&
-                !url.toLowerCase().startsWith("https://")) {
-            if (isSslConn) {
-                return "https://" + url;
-            } else {
-                return "http://" + url;
-            }
-        }
-        return url;
-    }
-
 }

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

@@ -0,0 +1,167 @@
+/* ownCloud Android Library is available under MIT license
+ *   Copyright (C) 2017 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.common.utils.Log_OC;
+
+import java.lang.ref.WeakReference;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.net.Socket;
+import java.util.concurrent.atomic.AtomicReference;
+
+/**
+ * Enforces, if possible, a write timeout for a socket.
+ * <p>
+ * Built as a singleton.
+ * <p>
+ * Tries to hit something like this:
+ * https://android.googlesource.com/platform/external/conscrypt/+/lollipop-release/src/main/java/org/conscrypt/OpenSSLSocketImpl.java#1005
+ * <p>
+ * Minimizes the chances of getting stalled in PUT/POST request if the network interface is lost while
+ * writing the entity into the outwards sockect.
+ * <p>
+ * It happens. See https://github.com/owncloud/android/issues/1684#issuecomment-295306015
+ *
+ * @author David A. Velasco
+ */
+public class WriteTimeoutEnforcer {
+
+    private static final String TAG = WriteTimeoutEnforcer.class.getSimpleName();
+
+    private static final AtomicReference<WriteTimeoutEnforcer> mSingleInstance = new AtomicReference<>();
+
+    private static final String METHOD_NAME = "setSoWriteTimeout";
+
+    private final WeakReference<Class<?>> mSocketClassRef;
+    private final WeakReference<Method> mSetSoWriteTimeoutMethodRef;
+
+    /**
+     * Private constructor, class is a singleton.
+     *
+     * @param socketClass             Underlying implementation class of {@link Socket} used to connect
+     *                                with the server.
+     * @param setSoWriteTimeoutMethod Name of the method to call to set a write timeout in the socket.
+     */
+    private WriteTimeoutEnforcer(Class<?> socketClass, Method setSoWriteTimeoutMethod) {
+        mSocketClassRef = new WeakReference<Class<?>>(socketClass);
+        mSetSoWriteTimeoutMethodRef =
+                (setSoWriteTimeoutMethod == null) ?
+                        null :
+                        new WeakReference<>(setSoWriteTimeoutMethod)
+        ;
+    }
+
+    /**
+     * Calls the {@code #setSoWrite(int)} method of the underlying implementation
+     * of {@link Socket} if exists.
+     * <p>
+     * Creates and initializes the single instance of the class when needed
+     *
+     * @param writeTimeoutMilliseconds Write timeout to set, in milliseconds.
+     * @param socket                   Client socket to connect with the server.
+     */
+    public static void setSoWriteTimeout(int writeTimeoutMilliseconds, Socket socket) {
+        final Method setSoWriteTimeoutMethod = getMethod(socket);
+        if (setSoWriteTimeoutMethod != null) {
+            try {
+                setSoWriteTimeoutMethod.invoke(socket, writeTimeoutMilliseconds);
+                Log_OC.i(
+                        TAG,
+                        "Write timeout set in socket, writeTimeoutMilliseconds: "
+                                + writeTimeoutMilliseconds
+                );
+
+            } catch (IllegalArgumentException e) {
+                Log_OC.e(TAG, "Call to (SocketImpl)#setSoWriteTimeout(int) failed ", e);
+
+            } catch (IllegalAccessException e) {
+                Log_OC.e(TAG, "Call to (SocketImpl)#setSoWriteTimeout(int) failed ", e);
+
+            } catch (InvocationTargetException e) {
+                Log_OC.e(TAG, "Call to (SocketImpl)#setSoWriteTimeout(int) failed ", e);
+            }
+        } else {
+            Log_OC.i(TAG, "Write timeout for socket not supported");
+        }
+    }
+
+    /**
+     * Gets the method to invoke trying to minimize the cost of reflection reusing objects cached
+     * in static members.
+     *
+     * @param socket Instance of the socket to use in connection with server.
+     * @return Method to call to set a write timeout in the socket.
+     */
+    private static Method getMethod(Socket socket) {
+        final Class<?> socketClass = socket.getClass();
+        final WriteTimeoutEnforcer instance = mSingleInstance.get();
+        if (instance == null) {
+            return initFrom(socketClass);
+
+        } else if (instance.mSocketClassRef.get() != socketClass) {
+            // the underlying class changed
+            return initFrom(socketClass);
+
+        } else if (instance.mSetSoWriteTimeoutMethodRef == null) {
+            // method not supported
+            return null;
+
+        } else {
+            final Method cachedSetSoWriteTimeoutMethod = instance.mSetSoWriteTimeoutMethodRef.get();
+            return (cachedSetSoWriteTimeoutMethod == null) ?
+                    initFrom(socketClass) :
+                    cachedSetSoWriteTimeoutMethod
+                    ;
+        }
+    }
+
+    /**
+     * Singleton initializer.
+     * <p>
+     * Uses reflection to extract and 'cache' the method to invoke to set a write timouet in a socket.
+     *
+     * @param socketClass Underlying class providing the implementation of {@link Socket}.
+     * @return Method to call to set a write timeout in the socket.
+     */
+    private static Method initFrom(Class<?> socketClass) {
+        Log_OC.i(TAG, "Socket implementation: " + socketClass.getCanonicalName());
+        Method setSoWriteTimeoutMethod = null;
+        try {
+            setSoWriteTimeoutMethod = socketClass.getMethod(METHOD_NAME, int.class);
+        } catch (SecurityException e) {
+            Log_OC.e(TAG, "Could not access to (SocketImpl)#setSoWriteTimeout(int) method ", e);
+
+        } catch (NoSuchMethodException e) {
+            Log_OC.i(
+                    TAG,
+                    "Could not find (SocketImpl)#setSoWriteTimeout(int) method - write timeout not supported"
+            );
+        }
+        mSingleInstance.set(new WriteTimeoutEnforcer(socketClass, setSoWriteTimeoutMethod));
+        return setSoWriteTimeoutMethod;
+    }
+
+}

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

@@ -1,27 +1,3 @@
-/* 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;
@@ -33,15 +9,14 @@ import android.os.Handler;
 
 import com.owncloud.android.lib.common.OwnCloudAccount;
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.SingleSessionManager;
+import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
 import com.owncloud.android.lib.common.accounts.AccountUtils;
+import com.owncloud.android.lib.common.utils.Log_OC;
 import okhttp3.OkHttpClient;
-import timber.log.Timber;
 
 import java.io.IOException;
 
-@SuppressWarnings("WeakerAccess")
-public abstract class RemoteOperation<T> implements Runnable {
+public abstract class RemoteOperation<T extends Object> implements Runnable {
 
     /**
      * OCS API header name
@@ -51,6 +26,7 @@ public abstract class RemoteOperation<T> implements Runnable {
      * OCS API header value
      */
     public static final String OCS_API_HEADER_VALUE = "true";
+    private static final String TAG = RemoteOperation.class.getSimpleName();
     /**
      * ownCloud account in the remote ownCloud server to operate
      */
@@ -64,22 +40,22 @@ public abstract class RemoteOperation<T> implements Runnable {
     /**
      * Object to interact with the remote server
      */
-    private OwnCloudClient mClient = null;
+    protected OwnCloudClient mClient = null;
 
     /**
      * Object to interact with the remote server
      */
-    private OkHttpClient mHttpClient = null;
+    protected OkHttpClient mHttpClient = null;
 
     /**
      * Callback object to notify about the execution of the remote operation
      */
-    private OnRemoteOperationListener mListener = null;
+    protected OnRemoteOperationListener mListener = null;
 
     /**
      * Handler to the thread where mListener methods will be called
      */
-    private Handler mListenerHandler = null;
+    protected Handler mListenerHandler = null;
 
     /**
      * Asynchronously executes the remote operation
@@ -99,10 +75,12 @@ public abstract class RemoteOperation<T> implements Runnable {
                           OnRemoteOperationListener listener, Handler listenerHandler) {
 
         if (account == null) {
-            throw new IllegalArgumentException("Trying to execute a remote operation with a NULL Account");
+            throw new IllegalArgumentException
+                    ("Trying to execute a remote operation with a NULL Account");
         }
         if (context == null) {
-            throw new IllegalArgumentException("Trying to execute a remote operation with a NULL Context");
+            throw new IllegalArgumentException
+                    ("Trying to execute a remote operation with a NULL Context");
         }
         // mAccount and mContext in the runnerThread to create below
         mAccount = account;
@@ -128,9 +106,11 @@ public abstract class RemoteOperation<T> implements Runnable {
      *                        the listener objects must be called.
      * @return Thread were the remote operation is executed.
      */
-    public Thread execute(OwnCloudClient client, OnRemoteOperationListener listener, Handler listenerHandler) {
+    public Thread execute(OwnCloudClient client,
+                          OnRemoteOperationListener listener, Handler listenerHandler) {
         if (client == null) {
-            throw new IllegalArgumentException("Trying to execute a remote operation with a NULL OwnCloudClient");
+            throw new IllegalArgumentException
+                    ("Trying to execute a remote operation with a NULL OwnCloudClient");
         }
         mClient = client;
         if (client.getAccount() != null) {
@@ -140,7 +120,8 @@ public abstract class RemoteOperation<T> implements Runnable {
 
         if (listener == null) {
             throw new IllegalArgumentException
-                    ("Trying to execute a remote operation asynchronously without a listener to notify the result");
+                    ("Trying to execute a remote operation asynchronously " +
+                            "without a listener to notiy the result");
         }
         mListener = listener;
 
@@ -153,13 +134,13 @@ public abstract class RemoteOperation<T> implements Runnable {
         return runnerThread;
     }
 
-    private void grantOwnCloudClient() throws
+    protected void grantOwnCloudClient() throws
             AccountUtils.AccountNotFoundException, OperationCanceledException, AuthenticatorException, IOException {
         if (mClient == null) {
             if (mAccount != null && mContext != null) {
                 OwnCloudAccount ocAccount = new OwnCloudAccount(mAccount, mContext);
-                mClient = SingleSessionManager.getDefaultSingleton().
-                        getClientFor(ocAccount, mContext, SingleSessionManager.getConnectionValidator());
+                mClient = OwnCloudClientManagerFactory.getDefaultSingleton().
+                        getClientFor(ocAccount, mContext);
             } else {
                 throw new IllegalStateException("Trying to run a remote operation " +
                         "asynchronously with no client and no chance to create one (no account)");
@@ -196,10 +177,12 @@ public abstract class RemoteOperation<T> implements Runnable {
      */
     public RemoteOperationResult<T> execute(Account account, Context context) {
         if (account == null) {
-            throw new IllegalArgumentException("Trying to execute a remote operation with a NULL Account");
+            throw new IllegalArgumentException("Trying to execute a remote operation with a NULL " +
+                    "Account");
         }
         if (context == null) {
-            throw new IllegalArgumentException("Trying to execute a remote operation with a NULL Context");
+            throw new IllegalArgumentException("Trying to execute a remote operation with a NULL " +
+                    "Context");
         }
         mAccount = account;
         mContext = context.getApplicationContext();
@@ -218,7 +201,8 @@ public abstract class RemoteOperation<T> implements Runnable {
      */
     public RemoteOperationResult<T> execute(OwnCloudClient client) {
         if (client == null) {
-            throw new IllegalArgumentException("Trying to execute a remote operation with a NULL OwnCloudClient");
+            throw new IllegalArgumentException("Trying to execute a remote operation with a NULL " +
+                    "OwnCloudClient");
         }
         mClient = client;
         if (client.getAccount() != null) {
@@ -240,7 +224,8 @@ public abstract class RemoteOperation<T> implements Runnable {
      */
     public RemoteOperationResult<T> execute(OkHttpClient client, Context context) {
         if (client == null) {
-            throw new IllegalArgumentException("Trying to execute a remote operation with a NULL OwnCloudClient");
+            throw new IllegalArgumentException("Trying to execute a remote operation with a NULL " +
+                    "OwnCloudClient");
         }
         mHttpClient = client;
         mContext = context;
@@ -251,7 +236,9 @@ public abstract class RemoteOperation<T> implements Runnable {
     /**
      * Run operation for asynchronous or synchronous 'onExecute' method.
      * <p>
-     * Considers and performs silent refresh of account credentials if possible
+     * Considers and performs silent refresh of account credentials if possible, and if
+     * {@link RemoteOperation#setSilentRefreshOfAccountCredentials(boolean)} was called with
+     * parameter 'true' before the execution.
      *
      * @return Remote operation result
      */
@@ -264,7 +251,7 @@ public abstract class RemoteOperation<T> implements Runnable {
             result = run(mClient);
 
         } catch (AccountsException | IOException e) {
-            Timber.e(e, "Error while trying to access to %s", mAccount.name);
+            Log_OC.e(TAG, "Error while trying to access to " + mAccount.name, e);
             result = new RemoteOperationResult<>(e);
         }
 
@@ -282,6 +269,11 @@ 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));
@@ -289,4 +281,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) 2022 ownCloud GmbH.
+ *   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
@@ -27,16 +27,15 @@ package com.owncloud.android.lib.common.operations;
 import android.accounts.Account;
 import android.accounts.AccountsException;
 
-import at.bitfire.dav4jvm.exception.DavException;
-import at.bitfire.dav4jvm.exception.HttpException;
+import at.bitfire.dav4android.exception.DavException;
+import at.bitfire.dav4android.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 com.owncloud.android.lib.common.utils.Log_OC;
 import okhttp3.Headers;
-import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.json.JSONException;
-import timber.log.Timber;
 
 import javax.net.ssl.SSLException;
 import javax.net.ssl.SSLPeerUnverifiedException;
@@ -46,7 +45,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.Serializable;
 import java.net.MalformedURLException;
-import java.net.ProtocolException;
 import java.net.SocketException;
 import java.net.SocketTimeoutException;
 import java.net.UnknownHostException;
@@ -54,26 +52,24 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-public class RemoteOperationResult<T>
+public class RemoteOperationResult<T extends Object>
         implements Serializable {
 
     /**
      * 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 static final String TAG = RemoteOperationResult.class.getSimpleName();
     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 List<String> mAuthenticate = new ArrayList<>();
+    private String mRedirectedLocation;
+    private ArrayList<String> mAuthenticate = new ArrayList<>();
     private String mLastPermanentLocation = null;
     private T mData = null;
-
     /**
      * Public constructor from result code.
      * <p>
@@ -116,14 +112,6 @@ 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;
@@ -167,10 +155,7 @@ public class RemoteOperationResult<T>
         } else if (e instanceof FileNotFoundException) {
             mCode = ResultCode.LOCAL_FILE_NOT_FOUND;
 
-        } else if (e instanceof ProtocolException) {
-            mCode = ResultCode.NETWORK_ERROR;
-        }
-        else {
+        } else {
             mCode = ResultCode.UNKNOWN_ERROR;
         }
     }
@@ -203,14 +188,10 @@ public class RemoteOperationResult<T>
                 try {
                     if (xmlParser.parseXMLResponse(is)) {
                         mCode = ResultCode.INVALID_CHARACTER_DETECT_IN_SERVER;
-                    } else {
-                        parseErrorMessageAndSetCode(
-                                httpMethod.getResponseBodyAsString(),
-                                ResultCode.SPECIFIC_BAD_REQUEST
-                        );
                     }
+
                 } catch (Exception e) {
-                    Timber.w("Error reading exception from server: %s", e.getMessage());
+                    Log_OC.w(TAG, "Error reading exception from server: " + e.getMessage());
                     // mCode stays as set in this(success, httpCode, headers)
                 }
             }
@@ -241,10 +222,6 @@ public class RemoteOperationResult<T>
                         httpMethod.getResponseBodyAsString(),
                         ResultCode.SPECIFIC_METHOD_NOT_ALLOWED
                 );
-                break;
-            case HttpConstants.HTTP_TOO_EARLY:
-                mCode = ResultCode.TOO_EARLY;
-                break;
             default:
                 break;
         }
@@ -267,17 +244,19 @@ public class RemoteOperationResult<T>
         this(httpCode, httpPhrase);
         if (headers != null) {
             for (Map.Entry<String, List<String>> header : headers.toMultimap().entrySet()) {
-                if (LOCATION.equalsIgnoreCase(header.getKey())) {
+                if ("location".equals(header.getKey().toLowerCase())) {
                     mRedirectedLocation = header.getValue().get(0);
                     continue;
                 }
-                if (WWW_AUTHENTICATE.equalsIgnoreCase(header.getKey())) {
-                    for (String value: header.getValue()) {
-                        mAuthenticate.add(value.toLowerCase());
-                    }
+                if ("www-authenticate".equals(header.getKey().toLowerCase())) {
+                    mAuthenticate.add(header.getValue().get(0).toLowerCase());
                 }
             }
         }
+        if (isIdPRedirection()) {
+            // overrides default ResultCode.UNKNOWN
+            mCode = ResultCode.UNAUTHORIZED;
+        }
     }
 
     /**
@@ -317,7 +296,11 @@ public class RemoteOperationResult<T>
                     break;
                 default:
                     mCode = ResultCode.UNHANDLED_HTTP_CODE;         // UNKNOWN ERROR
-                    Timber.d("RemoteOperationResult has processed UNHANDLED_HTTP_CODE: " + mHttpCode + " " + mHttpPhrase);
+                    Log_OC.d(TAG,
+                            "RemoteOperationResult has processed UNHANDLED_HTTP_CODE: " +
+
+                                    mHttpCode + " " + mHttpPhrase
+                    );
             }
         }
     }
@@ -328,19 +311,21 @@ public class RemoteOperationResult<T>
      *
      * @param bodyResponse okHttp response body
      * @param resultCode   our own custom result code
+     * @throws IOException
      */
     private void parseErrorMessageAndSetCode(String bodyResponse, ResultCode resultCode) {
+
         if (bodyResponse != null && bodyResponse.length() > 0) {
             InputStream is = new ByteArrayInputStream(bodyResponse.getBytes());
             ErrorMessageParser xmlParser = new ErrorMessageParser();
             try {
                 String errorMessage = xmlParser.parseXMLResponse(is);
-                if (!errorMessage.equals("")) {
+                if (errorMessage != "" && errorMessage != null) {
                     mCode = resultCode;
                     mHttpPhrase = errorMessage;
                 }
             } catch (Exception e) {
-                Timber.w("Error reading exception from server: %s\nTrace: %s", e.getMessage(), ExceptionUtils.getStackTrace(e));
+                Log_OC.w(TAG, "Error reading exception from server: " + e.getMessage());
                 // mCode stays as set in this(success, httpCode, headers)
             }
         }
@@ -394,7 +379,7 @@ public class RemoteOperationResult<T>
             previousCause = cause;
             cause = cause.getCause();
         }
-        if (cause instanceof CertificateCombinedException) {
+        if (cause != null && cause instanceof CertificateCombinedException) {
             result = (CertificateCombinedException) cause;
         }
         return result;
@@ -506,6 +491,12 @@ public class RemoteOperationResult<T>
         return mRedirectedLocation;
     }
 
+    public boolean isIdPRedirection() {
+        return (mRedirectedLocation != null &&
+                (mRedirectedLocation.toUpperCase().contains("SAML") ||
+                        mRedirectedLocation.toLowerCase().contains("wayf")));
+    }
+
     /**
      * Checks if is a non https connection
      *
@@ -515,7 +506,7 @@ public class RemoteOperationResult<T>
         return (mRedirectedLocation != null && !(mRedirectedLocation.toLowerCase().startsWith("https://")));
     }
 
-    public List<String> getAuthenticateHeaders() {
+    public ArrayList<String> getAuthenticateHeaders() {
         return mAuthenticate;
     }
 
@@ -535,10 +526,6 @@ public class RemoteOperationResult<T>
         mData = data;
     }
 
-    public void setHttpPhrase(String httpPhrase) {
-        mHttpPhrase = httpPhrase;
-    }
-
     public enum ResultCode {
         OK,
         OK_SSL,
@@ -590,9 +577,6 @@ public class RemoteOperationResult<T>
         SERVICE_UNAVAILABLE,
         SPECIFIC_SERVICE_UNAVAILABLE,
         SPECIFIC_UNSUPPORTED_MEDIA_TYPE,
-        SPECIFIC_METHOD_NOT_ALLOWED,
-        SPECIFIC_BAD_REQUEST,
-        TOO_EARLY,
-        NETWORK_ERROR,
+        SPECIFIC_METHOD_NOT_ALLOWED
     }
-}
+}

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

@@ -1,29 +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.utils
-
-fun Any.isOneOf(vararg values: Any): Boolean {
-    return this in values
-}

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

@@ -0,0 +1,212 @@
+package com.owncloud.android.lib.common.utils;
+
+import android.util.Log;
+
+import com.owncloud.android.lib.BuildConfig;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Locale;
+
+public class Log_OC {
+    private static final String SIMPLE_DATE_FORMAT = "yyyy/MM/dd HH:mm:ss";
+    private static final String LOG_FOLDER_NAME = "log";
+    private static final long MAX_FILE_SIZE = 2000000; // 2MB
+
+    private static String mOwncloudDataFolderLog = "owncloud_log";
+
+    private static File mLogFile;
+    private static File mFolder;
+    private static BufferedWriter mBuf;
+
+    private static String[] mLogFileNames = {
+            "currentLog" + BuildConfig.BUILD_TYPE + ".txt",
+            "olderLog" + BuildConfig.BUILD_TYPE + ".txt"
+    };
+
+    private static boolean isMaxFileSizeReached = false;
+    private static boolean isEnabled = false;
+
+    public static void setLogDataFolder(String logFolder) {
+        mOwncloudDataFolderLog = logFolder;
+    }
+
+    public static void i(String TAG, String message) {
+        Log.i(TAG, message);
+        appendLog("I: " + TAG + " : " + message);
+    }
+
+    public static void d(String TAG, String message) {
+        Log.d(TAG, message);
+        appendLog("D: " + TAG + " : " + message);
+    }
+
+    public static void d(String TAG, String message, Exception e) {
+        Log.d(TAG, message, e);
+        appendLog("D: " + TAG + " : " + message + " Exception : " + e.getStackTrace());
+    }
+
+    public static void e(String TAG, String message) {
+        Log.e(TAG, message);
+        appendLog("E: " + TAG + " : " + message);
+    }
+
+    public static void e(String TAG, String message, Throwable e) {
+        Log.e(TAG, message, e);
+        appendLog("E: " + TAG + " : " + message + " Exception : " + e.getStackTrace());
+    }
+
+    public static void v(String TAG, String message) {
+        Log.v(TAG, message);
+        appendLog("V: " + TAG + " : " + message);
+    }
+
+    public static void w(String TAG, String message) {
+        Log.w(TAG, message);
+        appendLog("W: " + TAG + " : " + message);
+    }
+
+    /**
+     * Start doing logging
+     *
+     * @param storagePath : directory for keeping logs
+     */
+    synchronized public static void startLogging(String storagePath) {
+        String logPath = storagePath + File.separator + mOwncloudDataFolderLog + File.separator + LOG_FOLDER_NAME;
+        mFolder = new File(logPath);
+        mLogFile = new File(mFolder + File.separator + mLogFileNames[0]);
+
+        boolean isFileCreated = false;
+
+        if (!mFolder.exists()) {
+            mFolder.mkdirs();
+            isFileCreated = true;
+            Log.d("LOG_OC", "Log file created");
+        }
+
+        try {
+
+            // Create the current log file if does not exist
+            mLogFile.createNewFile();
+            mBuf = new BufferedWriter(new FileWriter(mLogFile, true));
+            isEnabled = true;
+
+            if (isFileCreated) {
+                appendPhoneInfo();
+            }
+
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            if (mBuf != null) {
+                try {
+                    mBuf.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    synchronized public static void stopLogging() {
+        try {
+            if (mBuf != null) {
+                mBuf.close();
+            }
+            isEnabled = false;
+
+            mLogFile = null;
+            mFolder = null;
+            mBuf = null;
+            isMaxFileSizeReached = false;
+
+        } catch (IOException e) {
+            // Because we are stopping logging, we only log to Android console.
+            Log.e("OC_Log", "Closing log file failed: ", e);
+        } catch (Exception e) {
+            // This catch should never fire because we do null check on mBuf.
+            // But just for the sake of stability let's log this odd situation.
+            // Because we are stopping logging, we only log to Android console.
+            Log.e("OC_Log", "Stopping logging failed: ", e);
+        }
+    }
+
+    /**
+     * Delete history logging
+     */
+    public static void deleteHistoryLogging() {
+        File folderLogs = new File(mFolder + File.separator);
+        if (folderLogs.isDirectory()) {
+            String[] myFiles = folderLogs.list();
+            for (String fileName : myFiles) {
+                File fileInFolder = new File(folderLogs, fileName);
+                Log_OC.d("delete file", fileInFolder.getAbsoluteFile() + " " + fileInFolder.delete());
+            }
+        }
+    }
+
+    /**
+     * Append the info of the device
+     */
+    private static void appendPhoneInfo() {
+        appendLog("Model : " + android.os.Build.MODEL);
+        appendLog("Brand : " + android.os.Build.BRAND);
+        appendLog("Product : " + android.os.Build.PRODUCT);
+        appendLog("Device : " + android.os.Build.DEVICE);
+        appendLog("Version-Codename : " + android.os.Build.VERSION.CODENAME);
+        appendLog("Version-Release : " + android.os.Build.VERSION.RELEASE);
+    }
+
+    /**
+     * Append to the log file the info passed
+     *
+     * @param text : text for adding to the log file
+     */
+    synchronized private static void appendLog(String text) {
+
+        if (isEnabled) {
+
+            if (isMaxFileSizeReached) {
+
+                // Move current log file info to another file (old logs)
+                File olderFile = new File(mFolder + File.separator + mLogFileNames[1]);
+                if (mLogFile.exists()) {
+                    mLogFile.renameTo(olderFile);
+                }
+
+                // Construct a new file for current log info
+                mLogFile = new File(mFolder + File.separator + mLogFileNames[0]);
+                isMaxFileSizeReached = false;
+            }
+
+            String timeStamp = new SimpleDateFormat(SIMPLE_DATE_FORMAT, Locale.ENGLISH).format(Calendar.getInstance().getTime());
+
+            try {
+                mBuf = new BufferedWriter(new FileWriter(mLogFile, true));
+                mBuf.newLine();
+                mBuf.write(timeStamp + " " + text);
+            } catch (IOException e) {
+                e.printStackTrace();
+            } finally {
+                try {
+                    mBuf.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+
+            // Check if current log file size is bigger than the max file size defined
+            if (mLogFile.length() > MAX_FILE_SIZE) {
+                isMaxFileSizeReached = true;
+            }
+        }
+    }
+
+    public static String[] getLogFileNames() {
+        return mLogFileNames;
+    }
+}

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

@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2020 ownCloud GmbH.
+ *   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

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

@@ -1,52 +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
-
-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.
-// More info: https://doc.owncloud.com/server/developer_manual/core/apis/ocs-capabilities.html
-@JsonClass(generateAdapter = true)
-data class CommonOcsResponse<T>(
-    val ocs: OCSResponse<T>
-)
-
-@JsonClass(generateAdapter = true)
-data class OCSResponse<T>(
-    val meta: MetaData,
-    val data: T?
-)
-
-@JsonClass(generateAdapter = true)
-data class MetaData(
-    val status: String,
-    @Json(name = "statuscode")
-    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/appregistry/CreateRemoteFileWithAppProviderOperation.kt

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

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

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

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

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

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

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

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

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

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

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

@@ -1,96 +0,0 @@
-/* ownCloud Android Library is available under MIT license
-*   Copyright (C) 2023 ownCloud GmbH.
-*
-*   Permission is hereby granted, free of charge, to any person obtaining a copy
-*   of this software and associated documentation files (the "Software"), to deal
-*   in the Software without restriction, including without limitation the rights
-*   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-*   copies of the Software, and to permit persons to whom the Software is
-*   furnished to do so, subject to the following conditions:
-*
-*   The above copyright notice and this permission notice shall be included in
-*   all copies or substantial portions of the Software.
-*
-*   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-*   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-*   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-*   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-*   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-*   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-*   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-*   THE SOFTWARE.
-*
-*/
-package com.owncloud.android.lib.resources.files
-
-import com.owncloud.android.lib.common.OwnCloudClient
-import com.owncloud.android.lib.common.http.HttpConstants
-import com.owncloud.android.lib.common.http.methods.webdav.DavUtils.allPropSet
-import com.owncloud.android.lib.common.http.methods.webdav.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.operations.RemoteOperationResult.ResultCode
-import timber.log.Timber
-import java.net.URL
-import java.util.concurrent.TimeUnit
-
-/**
- * Operation to check the existence of a path in a remote server.
- *
- * @author David A. Velasco
- * @author David González Verdugo
- * @author Abel García de Prada
- * @author Juan Carlos Garrote Gascón
- *
- * @param remotePath      Path to append to the URL owned by the client instance.
- * @param isUserLoggedIn    When `true`, the username won't be added at the end of the PROPFIND url since is not
- *                        needed to check user credentials
- */
-class CheckPathExistenceRemoteOperation(
-    val remotePath: String? = "",
-    val isUserLoggedIn: Boolean,
-    val spaceWebDavUrl: String? = null,
-) : RemoteOperation<Boolean>() {
-
-    override fun run(client: OwnCloudClient): RemoteOperationResult<Boolean> {
-        val baseStringUrl = spaceWebDavUrl ?: if (isUserLoggedIn) client.userFilesWebDavUri.toString() else client.baseFilesWebDavUri.toString()
-        val stringUrl = if (isUserLoggedIn) baseStringUrl + WebdavUtils.encodePath(remotePath) else baseStringUrl
-
-        return try {
-            val propFindMethod = PropfindMethod(URL(stringUrl), 0, allPropSet).apply {
-                setReadTimeout(TIMEOUT.toLong(), TimeUnit.SECONDS)
-                setConnectionTimeout(TIMEOUT.toLong(), TimeUnit.SECONDS)
-            }
-
-            val status = client.executeHttpMethod(propFindMethod)
-            /* PROPFIND method
-             * 404 NOT FOUND: path doesn't exist,
-             * 207 MULTI_STATUS: path exists.
-             */
-            Timber.d(
-                "Existence check for $stringUrl finished with HTTP status $status${if (!isSuccess(status)) "(FAIL)" else ""}"
-            )
-            if (isSuccess(status)) RemoteOperationResult<Boolean>(ResultCode.OK).apply { data = true }
-            else RemoteOperationResult<Boolean>(propFindMethod).apply { data = false }
-
-        } catch (e: Exception) {
-            val result = RemoteOperationResult<Boolean>(e)
-            Timber.e(
-                e,
-                "Existence check for $stringUrl : ${result.logMessage}"
-            )
-            result.data = false
-            result
-        }
-    }
-
-    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 = 10000
-    }
-}