From afe65bdc3f3bdbc0491eb91c028600ceec12003f Mon Sep 17 00:00:00 2001
From: "David A. Velasco" <dvelasco@owncloud.com>
Date: Mon, 6 Jun 2016 18:26:55 +0200
Subject: [PATCH] Return user name when display name is unknown

---
 src/com/owncloud/android/lib/common/OwnCloudAccount.java  | 8 +++++++-
 .../lib/resources/users/GetRemoteUserNameOperation.java   | 8 ++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/com/owncloud/android/lib/common/OwnCloudAccount.java b/src/com/owncloud/android/lib/common/OwnCloudAccount.java
index 2026ee3e..b41349c7 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudAccount.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudAccount.java
@@ -128,7 +128,13 @@ public class OwnCloudAccount {
     }
 
     public String getDisplayName() {
-        return mDisplayName;
+        if (mDisplayName != null && mDisplayName.length() > 0) {
+            return mDisplayName;
+        } else if (mCredentials != null) {
+            return mCredentials.getUsername();
+        } else {
+            return "NONE";
+        }
     }
 
     public void setDisplayName(String displayName) {
diff --git a/src/com/owncloud/android/lib/resources/users/GetRemoteUserNameOperation.java b/src/com/owncloud/android/lib/resources/users/GetRemoteUserNameOperation.java
index e9676e70..f5e7221f 100644
--- a/src/com/owncloud/android/lib/resources/users/GetRemoteUserNameOperation.java
+++ b/src/com/owncloud/android/lib/resources/users/GetRemoteUserNameOperation.java
@@ -59,10 +59,10 @@ public class GetRemoteUserNameOperation extends RemoteOperation {
 	private static final String NODE_DISPLAY_NAME= "display-name";
 	private static final String NODE_EMAIL= "email";
 
-	private String mUserName;
+	private String mDisplayName;
 
-	public String getUserName() {
-		return mUserName;
+	public String getDisplayName() {
+		return mDisplayName;
 	}
 
 	
@@ -98,7 +98,7 @@ public class GetRemoteUserNameOperation extends RemoteOperation {
                  ArrayList<Object> data = new ArrayList<Object>();
                  data.add(displayName);
                  result.setData(data);
-				 mUserName =  displayName;
+				 mDisplayName =  displayName;
 				 
 				 Log_OC.d(TAG, "*** Parsed user information: " + id + " - " + displayName + " - " + email);