From a5574e1e4501dcad511c403cf09c39e045ea9b17 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Mar 2021 11:27:08 +0000
Subject: [PATCH 01/15] Bump robolectric from 4.3.1 to 4.5.1
Bumps [robolectric](https://github.com/robolectric/robolectric) from 4.3.1 to 4.5.1.
- [Release notes](https://github.com/robolectric/robolectric/releases)
- [Commits](https://github.com/robolectric/robolectric/compare/robolectric-4.3.1...robolectric-4.5.1)
Signed-off-by: dependabot[bot] <support@github.com>
---
owncloudComLibrary/build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/owncloudComLibrary/build.gradle b/owncloudComLibrary/build.gradle
index 90ffbcd6..97f583ba 100644
--- a/owncloudComLibrary/build.gradle
+++ b/owncloudComLibrary/build.gradle
@@ -15,7 +15,7 @@ dependencies {
kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshiVersion"
testImplementation 'junit:junit:4.13.2'
- testImplementation 'org.robolectric:robolectric:4.3.1'
+ testImplementation 'org.robolectric:robolectric:4.5.1'
}
android {
From bf0ff3ce115331af56c265455cbed5bcd094bd77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Abel=20Garci=CC=81a=20de=20Prada?= <agdeprada@izertis.com>
Date: Tue, 23 Mar 2021 10:06:58 +0100
Subject: [PATCH 02/15] Bump gradle version to 1.4.3
---
build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.gradle b/build.gradle
index 619fd3be..122d40ac 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:4.1.2'
+ classpath 'com.android.tools.build:gradle:4.1.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
}
}
From 4df880357c12a7cf359bbe33d0228caa966f4053 Mon Sep 17 00:00:00 2001
From: Hannes Achleitner <hannes.software@gmx.at>
Date: Wed, 24 Mar 2021 11:37:48 +0100
Subject: [PATCH 03/15] Fix ktlint findings
---
.../android/lib/resources/files/services/FileService.kt | 2 +-
.../android/lib/resources/status/GetRemoteStatusOperation.kt | 1 -
.../lib/resources/status/services/CapabilityService.kt | 4 ++--
.../lib/resources/users/GetRemoteUserAvatarOperation.kt | 2 +-
4 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/services/FileService.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/services/FileService.kt
index aa69d505..4296fa54 100644
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/services/FileService.kt
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/services/FileService.kt
@@ -26,6 +26,6 @@ package com.owncloud.android.lib.resources.files.services
import com.owncloud.android.lib.common.operations.RemoteOperationResult
import com.owncloud.android.lib.resources.Service
-interface FileService: Service {
+interface FileService : Service {
fun checkPathExistence(path: String, isUserLogged: Boolean): RemoteOperationResult<Boolean>
}
diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.kt
index f4e1d452..380ca3dc 100644
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.kt
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.kt
@@ -31,7 +31,6 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCo
import com.owncloud.android.lib.resources.status.HttpScheme.HTTPS_PREFIX
import com.owncloud.android.lib.resources.status.HttpScheme.HTTP_PREFIX
import com.owncloud.android.lib.resources.status.HttpScheme.HTTP_SCHEME
-import okhttp3.HttpUrl.Companion.toHttpUrl
import org.json.JSONException
import timber.log.Timber
diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/services/CapabilityService.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/services/CapabilityService.kt
index 0ad809c8..ae75181b 100644
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/services/CapabilityService.kt
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/services/CapabilityService.kt
@@ -24,6 +24,6 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult
import com.owncloud.android.lib.resources.Service
import com.owncloud.android.lib.resources.status.RemoteCapability
-interface CapabilityService: Service {
- fun getCapabilities() : RemoteOperationResult<RemoteCapability>
+interface CapabilityService : Service {
+ fun getCapabilities(): RemoteOperationResult<RemoteCapability>
}
diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.kt
index 2efbacb6..f7ffdaf3 100644
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.kt
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.kt
@@ -70,7 +70,7 @@ class GetRemoteUserAvatarOperation(private val avatarDimension: Int) : RemoteOpe
/// download will be performed to a buffer
inputStream = getMethod.getResponseBodyAsStream()
- val bytesArray = inputStream?.readBytes()?: byteArrayOf()
+ val bytesArray = inputStream?.readBytes() ?: byteArrayOf()
// TODO check total bytes transferred?
Timber.d("Avatar size: Bytes received ${bytesArray.size} of $contentLength")
From 88bb79c5eadb5059cdc860659b14ac159c3c79ba Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Apr 2021 09:33:44 +0000
Subject: [PATCH 04/15] Bump moshiVersion from 1.11.0 to 1.12.0
Bumps `moshiVersion` from 1.11.0 to 1.12.0.
Updates `moshi-kotlin` from 1.11.0 to 1.12.0
- [Release notes](https://github.com/square/moshi/releases)
- [Changelog](https://github.com/square/moshi/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/moshi/compare/moshi-parent-1.11.0...parent-1.12.0)
Updates `moshi-kotlin-codegen` from 1.11.0 to 1.12.0
- [Release notes](https://github.com/square/moshi/releases)
- [Changelog](https://github.com/square/moshi/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/moshi/compare/moshi-parent-1.11.0...parent-1.12.0)
Signed-off-by: dependabot[bot] <support@github.com>
---
build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.gradle b/build.gradle
index 122d40ac..ca82180a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
buildscript {
ext {
kotlinVersion = '1.4.31'
- moshiVersion = "1.11.0"
+ moshiVersion = "1.12.0"
}
repositories {
From 7924561a623aaa472a80c8ddc4841870fd182134 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Abel=20Garci=CC=81a=20de=20Prada?= <agdeprada@izertis.com>
Date: Tue, 6 Apr 2021 09:55:19 +0200
Subject: [PATCH 05/15] Bump kotlin version
---
build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.gradle b/build.gradle
index ca82180a..ecebf9ed 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
buildscript {
ext {
- kotlinVersion = '1.4.31'
+ kotlinVersion = '1.4.32'
moshiVersion = "1.12.0"
}
From 1287035311f700d724ea0122f1be4c0f4bdb8e5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Abel=20Garci=CC=81a=20de=20Prada?= <agdeprada@izertis.com>
Date: Mon, 12 Apr 2021 08:18:32 +0200
Subject: [PATCH 06/15] Fix some ktlint findings
---
.../owncloud/android/lib/resources/shares/ShareXMLParser.kt | 2 +-
.../android/lib/resources/status/StatusRequester.kt | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/ShareXMLParser.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/ShareXMLParser.kt
index 389d6f3f..a0f0e0b9 100644
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/ShareXMLParser.kt
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/ShareXMLParser.kt
@@ -176,7 +176,7 @@ class ShareXMLParser {
name.equals(NODE_ELEMENT, ignoreCase = true) -> {
readElement(parser, shares)
}
- name.equals(NODE_ID, ignoreCase = true) -> {// Parse Create XML Response
+ name.equals(NODE_ID, ignoreCase = true) -> { // Parse Create XML Response
share = RemoteShare()
val value = readNode(parser, NODE_ID)
share.id = value
diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/StatusRequester.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/StatusRequester.kt
index 8706a185..f25086f3 100644
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/StatusRequester.kt
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/StatusRequester.kt
@@ -45,9 +45,9 @@ internal class StatusRequester {
redirectedToNonSecureLocationBefore: Boolean,
baseUrl: String,
redirectedUrl: String
- ) = redirectedToNonSecureLocationBefore
- || (baseUrl.startsWith(HTTPS_SCHEME)
- && !redirectedUrl.startsWith(HTTPS_SCHEME))
+ ) = redirectedToNonSecureLocationBefore ||
+ (baseUrl.startsWith(HTTPS_SCHEME) &&
+ !redirectedUrl.startsWith(HTTPS_SCHEME))
fun updateLocationWithRedirectPath(oldLocation: String, redirectedLocation: String): String {
/** Redirection with different endpoint.
From 257f616b0f785293daed1ee1c1aafce4669bda76 Mon Sep 17 00:00:00 2001
From: Hannes Achleitner <hannes.software@gmx.at>
Date: Wed, 14 Apr 2021 10:29:12 +0200
Subject: [PATCH 07/15] ktLint check in library
---
.editorconfig | 5 +++++
build.gradle | 6 ++++++
2 files changed, 11 insertions(+)
create mode 100644 .editorconfig
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..09e59494
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,5 @@
+[*]
+max_line_length = 150
+
+[*.{kt, kts}]
+disabled_rules=no-consecutive-blank-lines,no-wildcard-imports,import-ordering,max-line-length,import-ordering,no-blank-line-before-rbrace,final-newline,indent,no-multi-spaces,comment-spacing,parameter-list-wrapping
diff --git a/build.gradle b/build.gradle
index ecebf9ed..b9eccb02 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,8 +7,10 @@ buildscript {
repositories {
google()
jcenter()
+ maven { url "https://plugins.gradle.org/m2/" }
}
dependencies {
+ classpath "org.jlleitschuh.gradle:ktlint-gradle:10.0.0"
classpath 'com.android.tools.build:gradle:4.1.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
}
@@ -21,3 +23,7 @@ allprojects {
maven { url 'https://jitpack.io' }
}
}
+
+subprojects {
+ apply plugin: "org.jlleitschuh.gradle.ktlint"
+}
\ No newline at end of file
From 845b61ea4d2293b51bccc3bdee47fe6e12798d06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Abel=20Garci=CC=81a=20de=20Prada?= <agdeprada@izertis.com>
Date: Wed, 21 Apr 2021 18:44:48 +0200
Subject: [PATCH 08/15] Enable import ordering rule
---
.editorconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.editorconfig b/.editorconfig
index 09e59494..1496f65e 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -2,4 +2,4 @@
max_line_length = 150
[*.{kt, kts}]
-disabled_rules=no-consecutive-blank-lines,no-wildcard-imports,import-ordering,max-line-length,import-ordering,no-blank-line-before-rbrace,final-newline,indent,no-multi-spaces,comment-spacing,parameter-list-wrapping
+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
From 13344ae62247fc1fc3799a719e4d3347117475df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Abel=20Garci=CC=81a=20de=20Prada?= <agdeprada@izertis.com>
Date: Wed, 21 Apr 2021 18:59:17 +0200
Subject: [PATCH 09/15] Fix lint errors
---
.../lib/resources/status/GetRemoteCapabilitiesOperation.kt | 2 +-
.../status/services/implementation/OCCapabilityService.kt | 2 +-
.../lib/resources/shares/responses/ShareeResponseTest.kt | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.kt
index 806440be..2c352d19 100644
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.kt
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.kt
@@ -34,8 +34,8 @@ 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.status.responses.CapabilityResponse
import com.owncloud.android.lib.resources.CommonOcsResponse
+import com.owncloud.android.lib.resources.status.responses.CapabilityResponse
import com.squareup.moshi.JsonAdapter
import com.squareup.moshi.Moshi
import com.squareup.moshi.Types
diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/services/implementation/OCCapabilityService.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/services/implementation/OCCapabilityService.kt
index d2161b05..8d8c9d95 100644
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/services/implementation/OCCapabilityService.kt
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/services/implementation/OCCapabilityService.kt
@@ -22,9 +22,9 @@ package com.owncloud.android.lib.resources.status.services.implementation
import com.owncloud.android.lib.common.OwnCloudClient
import com.owncloud.android.lib.common.operations.RemoteOperationResult
-import com.owncloud.android.lib.resources.status.services.CapabilityService
import com.owncloud.android.lib.resources.status.GetRemoteCapabilitiesOperation
import com.owncloud.android.lib.resources.status.RemoteCapability
+import com.owncloud.android.lib.resources.status.services.CapabilityService
class OCCapabilityService(override val client: OwnCloudClient) :
CapabilityService {
diff --git a/owncloudComLibrary/src/test/java/com/owncloud/android/lib/resources/shares/responses/ShareeResponseTest.kt b/owncloudComLibrary/src/test/java/com/owncloud/android/lib/resources/shares/responses/ShareeResponseTest.kt
index ee88839d..3981ab5b 100644
--- a/owncloudComLibrary/src/test/java/com/owncloud/android/lib/resources/shares/responses/ShareeResponseTest.kt
+++ b/owncloudComLibrary/src/test/java/com/owncloud/android/lib/resources/shares/responses/ShareeResponseTest.kt
@@ -28,8 +28,8 @@ import com.owncloud.android.lib.resources.CommonOcsResponse
import com.squareup.moshi.JsonAdapter
import com.squareup.moshi.Moshi
import com.squareup.moshi.Types
-import org.junit.Assert.assertNull
import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNull
import org.junit.Assert.assertTrue
import org.junit.Before
import org.junit.Test
From 8c4a2708c225d077096b60d52da8f38f194cab46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Abel=20Garci=CC=81a=20de=20Prada?= <agdeprada@izertis.com>
Date: Wed, 14 Apr 2021 16:01:08 +0200
Subject: [PATCH 10/15] Make some fields not mandatory in discovery response
---
.../oauth/responses/OIDCDiscoveryResponse.kt | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/oauth/responses/OIDCDiscoveryResponse.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/oauth/responses/OIDCDiscoveryResponse.kt
index 7072bc1f..497dab44 100644
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/oauth/responses/OIDCDiscoveryResponse.kt
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/oauth/responses/OIDCDiscoveryResponse.kt
@@ -31,13 +31,13 @@ import com.squareup.moshi.JsonClass
@JsonClass(generateAdapter = true)
data class OIDCDiscoveryResponse(
val authorization_endpoint: String,
- val check_session_iframe: String,
- val end_session_endpoint: String,
+ val check_session_iframe: String?,
+ val end_session_endpoint: String?,
val issuer: String,
- val registration_endpoint: String,
+ val registration_endpoint: String?,
val response_types_supported: List<String>,
- val scopes_supported: List<String>,
+ val scopes_supported: List<String>?,
val token_endpoint: String,
- val token_endpoint_auth_methods_supported: List<String>,
- val userinfo_endpoint: String,
+ val token_endpoint_auth_methods_supported: List<String>?,
+ val userinfo_endpoint: String?,
)
From 594ed2ee1bcef0d83a402d1f9704537ce5199f46 Mon Sep 17 00:00:00 2001
From: Christian Schabesberger <chris.schabesberger@mailbox.org>
Date: Fri, 30 Apr 2021 15:58:42 +0200
Subject: [PATCH 11/15] fix xodo file sync bug
---
.../files/chunks/ChunkedUploadRemoteFileOperation.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/chunks/ChunkedUploadRemoteFileOperation.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/chunks/ChunkedUploadRemoteFileOperation.java
index 14d0fbf5..f36fc47e 100644
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/chunks/ChunkedUploadRemoteFileOperation.java
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/chunks/ChunkedUploadRemoteFileOperation.java
@@ -25,6 +25,7 @@
package com.owncloud.android.lib.resources.files.chunks;
import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.http.HttpConstants;
import com.owncloud.android.lib.common.http.methods.webdav.PutMethod;
import com.owncloud.android.lib.common.network.ChunkFromFileRequestBody;
import com.owncloud.android.lib.common.operations.OperationCancelledException;
@@ -95,10 +96,6 @@ public class ChunkedUploadRemoteFileOperation extends UploadRemoteFileOperation
} else {
mPutMethod = new PutMethod(new URL(uriPrefix + File.separator + chunkIndex), mFileRequestBody);
- if (mRequiredEtag != null && mRequiredEtag.length() > 0) {
- mPutMethod.addRequestHeader(IF_MATCH_HEADER, "\"" + mRequiredEtag + "\"");
- }
-
if (chunkIndex == chunkCount - 1) {
// Added a high timeout to the last chunk due to when the last chunk
// arrives to the server with the last PUT, all chunks get assembled
From 2c18ae4ebb04a2b124005ae937691e9f8401a2ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Abel=20Garci=CC=81a=20de=20Prada?= <agdeprada@izertis.com>
Date: Mon, 10 May 2021 09:56:18 +0200
Subject: [PATCH 12/15] Clean unused imports
---
.../files/chunks/ChunkedUploadRemoteFileOperation.java | 2 --
1 file changed, 2 deletions(-)
diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/chunks/ChunkedUploadRemoteFileOperation.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/chunks/ChunkedUploadRemoteFileOperation.java
index f36fc47e..84396ec8 100644
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/chunks/ChunkedUploadRemoteFileOperation.java
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/chunks/ChunkedUploadRemoteFileOperation.java
@@ -25,7 +25,6 @@
package com.owncloud.android.lib.resources.files.chunks;
import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.http.HttpConstants;
import com.owncloud.android.lib.common.http.methods.webdav.PutMethod;
import com.owncloud.android.lib.common.network.ChunkFromFileRequestBody;
import com.owncloud.android.lib.common.operations.OperationCancelledException;
@@ -40,7 +39,6 @@ import java.net.URL;
import java.nio.channels.FileChannel;
import java.util.concurrent.TimeUnit;
-import static com.owncloud.android.lib.common.http.HttpConstants.IF_MATCH_HEADER;
import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
/**
From d0e50c4fca5d03bc9819a7a0c0c21180267e8613 Mon Sep 17 00:00:00 2001
From: Hannes Achleitner <hannes.software@gmx.at>
Date: Wed, 28 Apr 2021 09:46:59 +0200
Subject: [PATCH 13/15] MavenCentral
---
build.gradle | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.gradle b/build.gradle
index b9eccb02..1e026bbc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
repositories {
google()
- jcenter()
+ mavenCentral()
maven { url "https://plugins.gradle.org/m2/" }
}
dependencies {
@@ -19,7 +19,7 @@ buildscript {
allprojects {
repositories {
google()
- jcenter()
+ mavenCentral()
maven { url 'https://jitpack.io' }
}
}
From 634c4a0f931151e7088da0a721db209846628710 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Abel=20Garci=CC=81a=20de=20Prada?= <agdeprada@izertis.com>
Date: Tue, 18 May 2021 12:19:40 +0200
Subject: [PATCH 14/15] Update version name and version code for release 1.0.11
---
owncloudComLibrary/build.gradle | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/owncloudComLibrary/build.gradle b/owncloudComLibrary/build.gradle
index 97f583ba..175bb0bd 100644
--- a/owncloudComLibrary/build.gradle
+++ b/owncloudComLibrary/build.gradle
@@ -25,8 +25,8 @@ android {
minSdkVersion 21
targetSdkVersion 29
- versionCode = 10001000
- versionName = "1.0.10"
+ versionCode = 10001100
+ versionName = "1.0.11"
}
lintOptions {
From 351682cc7f5d91c1c6d21d7a8debd541d7c45674 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Abel=20Garci=CC=81a=20de=20Prada?= <agdeprada@izertis.com>
Date: Fri, 21 May 2021 13:16:04 +0200
Subject: [PATCH 15/15] Use userId instead of username to build the webdavurl
---
.../android/lib/common/accounts/AccountUtils.java | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/accounts/AccountUtils.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/accounts/AccountUtils.java
index 32e062ae..9db87f4b 100644
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/accounts/AccountUtils.java
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/accounts/AccountUtils.java
@@ -52,17 +52,9 @@ public class AccountUtils {
*/
public static String getWebDavUrlForAccount(Context context, Account account)
throws AccountNotFoundException {
- String webDavUrlForAccount = "";
- try {
- OwnCloudCredentials ownCloudCredentials = getCredentialsForAccount(context, account);
- webDavUrlForAccount = getBaseUrlForAccount(context, account) + OwnCloudClient.WEBDAV_FILES_PATH_4_0
- + ownCloudCredentials.getUsername();
- } catch (OperationCanceledException | AuthenticatorException | IOException e) {
- Timber.e(e);
- }
-
- return webDavUrlForAccount;
+ return getBaseUrlForAccount(context, account) + OwnCloudClient.WEBDAV_FILES_PATH_4_0
+ + AccountUtils.getUserId(account, context);
}
/**