Restore userID encoding when building files DAV uri

Mistakenly removed in previous changes Signed-off-by: Álvaro Brey <[email protected]>
nextcloud · May 5, 2022 · ccdd5a5 · ccdd5a5
1 parent 1b97363
commit ccdd5a5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/library/src/main/java/com/nextcloud/common/NextcloudClient.kt b/library/src/main/java/com/nextcloud/common/NextcloudClient.kt
@@ -180,7 +180,7 @@ class NextcloudClient private constructor(
     }
 
     fun getUserIdEncoded(): String {
-        return UserIdEncoder.encode(delegate.userId!!)
+        return delegate.userIdEncoded!!
     }
 
     fun getUserIdPlain(): String {

diff --git a/library/src/main/java/com/nextcloud/common/NextcloudUriDelegate.kt b/library/src/main/java/com/nextcloud/common/NextcloudUriDelegate.kt
@@ -41,6 +41,9 @@ class NextcloudUriDelegate(baseUri: Uri, var userId: String?) : NextcloudUriProv
 
     constructor(baseUri: Uri) : this(baseUri, null)
 
+    val userIdEncoded: String?
+        get() = userId?.let { UserIdEncoder.encode(it) }
+
     /**
      * Root URI of the Nextcloud server
      */
@@ -51,7 +54,7 @@ class NextcloudUriDelegate(baseUri: Uri, var userId: String?) : NextcloudUriProv
         }
 
     override val filesDavUri: Uri
-        get() = Uri.parse("$davUri/files/$userId")
+        get() = Uri.parse("$davUri/files/$userIdEncoded")
     override val uploadUri: Uri
         get() = Uri.parse(baseUri.toString() + AccountUtils.DAV_UPLOAD)
     override val davUri: Uri

diff --git a/library/src/main/java/com/owncloud/android/lib/common/OwnCloudClient.java b/library/src/main/java/com/owncloud/android/lib/common/OwnCloudClient.java
@@ -433,11 +433,7 @@ private void logCookie(Cookie cookie) {
      * @return uri-encoded userId
      */
     public String getUserId() {
-        final String userId = nextcloudUriDelegate.getUserId();
-        if (userId == null) {
-            return null;
-        }
-        return UserIdEncoder.encode(userId);
+        return nextcloudUriDelegate.getUserIdEncoded();
     }
 
     public String getUserIdPlain() {