From f3e8374429349903eeb85e47a52718433cc7ff9c Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Wed, 7 Nov 2018 17:09:42 +0100
Subject: [PATCH] Use LDAP user ids when creating local files

---
 .../android/lib/common/accounts/AccountUtils.java         | 2 +-
 .../lib/resources/files/ReadRemoteFileOperation.java      | 4 +++-
 .../lib/resources/files/ReadRemoteFolderOperation.java    | 5 +++--
 .../owncloud/android/lib/resources/files/RemoteFile.java  | 8 ++++----
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/com/owncloud/android/lib/common/accounts/AccountUtils.java b/src/com/owncloud/android/lib/common/accounts/AccountUtils.java
index aa62cb45..72126285 100644
--- a/src/com/owncloud/android/lib/common/accounts/AccountUtils.java
+++ b/src/com/owncloud/android/lib/common/accounts/AccountUtils.java
@@ -189,7 +189,7 @@ public class AccountUtils {
     }
 
     /**
-     * Get the user id corresponding OC account.
+     * Get the user id corresponding to an OC account.
      * @param account ownCloud account
      * @return        user id
      */
diff --git a/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java
index a40bbbad..f8476def 100644
--- a/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java
@@ -24,6 +24,7 @@
 package com.owncloud.android.lib.resources.files;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.accounts.AccountUtils;
 import com.owncloud.android.lib.common.http.HttpConstants;
 import com.owncloud.android.lib.common.http.methods.webdav.DavUtils;
 import com.owncloud.android.lib.common.http.methods.webdav.PropfindMethod;
@@ -43,6 +44,7 @@ import static com.owncloud.android.lib.common.operations.RemoteOperationResult.R
  *
  * @author David A. Velasco
  * @author masensio
+ * @author David González Verdugo
  */
 
 public class ReadRemoteFileOperation extends RemoteOperation<RemoteFile> {
@@ -86,7 +88,7 @@ public class ReadRemoteFileOperation extends RemoteOperation<RemoteFile> {
             if (status == HttpConstants.HTTP_MULTI_STATUS
                     || status == HttpConstants.HTTP_OK) {
 
-                final RemoteFile file = new RemoteFile(propfind.getRoot(), client.getCredentials().getUsername());
+                final RemoteFile file = new RemoteFile(propfind.getRoot(), AccountUtils.getUserId(mAccount, mContext));
 
                 result = new RemoteOperationResult<>(OK);
                 result.setData(file);
diff --git a/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java b/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
index 815ad552..8136a7a3 100644
--- a/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
@@ -25,6 +25,7 @@
 package com.owncloud.android.lib.resources.files;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.accounts.AccountUtils;
 import com.owncloud.android.lib.common.http.HttpConstants;
 import com.owncloud.android.lib.common.http.methods.webdav.DavConstants;
 import com.owncloud.android.lib.common.http.methods.webdav.DavUtils;
@@ -88,12 +89,12 @@ public class ReadRemoteFolderOperation extends RemoteOperation<ArrayList<RemoteF
 
                 // parse data from remote folder
                 mFolderAndFiles.add(
-                        new RemoteFile(propfindMethod.getRoot(), client.getCredentials().getUsername())
+                        new RemoteFile(propfindMethod.getRoot(), AccountUtils.getUserId(mAccount, mContext))
                 );
 
                 // loop to update every child
                 for (Response resource : propfindMethod.getMembers()) {
-                    RemoteFile file = new RemoteFile(resource, client.getCredentials().getUsername());
+                    RemoteFile file = new RemoteFile(resource, AccountUtils.getUserId(mAccount, mContext));
                     mFolderAndFiles.add(file);
                 }
 
diff --git a/src/com/owncloud/android/lib/resources/files/RemoteFile.java b/src/com/owncloud/android/lib/resources/files/RemoteFile.java
index fc19ad20..47d1cfb9 100644
--- a/src/com/owncloud/android/lib/resources/files/RemoteFile.java
+++ b/src/com/owncloud/android/lib/resources/files/RemoteFile.java
@@ -193,8 +193,8 @@ public class RemoteFile implements Parcelable, Serializable {
         mPrivateLink = null;
     }
 
-    public RemoteFile(final Response davResource, String userName) {
-        this(getRemotePathFromUrl(davResource.getHref(), userName));
+    public RemoteFile(final Response davResource, String userId) {
+        this(getRemotePathFromUrl(davResource.getHref(), userId));
         final List<Property> properties = davResource.getProperties();
 
         for(Property property : properties) {
@@ -227,8 +227,8 @@ public class RemoteFile implements Parcelable, Serializable {
     }
 
 
-    private static String getRemotePathFromUrl(HttpUrl url, String displayName) {
-        final String davPath = WEBDAV_FILES_PATH_4_0 + displayName;
+    private static String getRemotePathFromUrl(HttpUrl url, String userId) {
+        final String davPath = WEBDAV_FILES_PATH_4_0 + userId;
         final String pathToOc = url.encodedPath().split(davPath)[0];
         return Uri.decode(url.encodedPath()).replace(pathToOc + davPath, "");
     }