flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2025-06-08 00:16:09 +00:00
Code Issues Releases Wiki Activity

Return user name when display name is unknown

Browse Source
This commit is contained in:
David A. Velasco 2016-06-06 18:26:55 +02:00
parent 743661ca90
commit afe65bdc3f
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/owncloud/android/lib/common/OwnCloudAccount.java
View File

@ -128,7 +128,13 @@ public class OwnCloudAccount {
} }
public String getDisplayName() { 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) { public void setDisplayName(String displayName) {

8
src/com/owncloud/android/lib/resources/users/GetRemoteUserNameOperation.java
View File

@ -59,10 +59,10 @@ public class GetRemoteUserNameOperation extends RemoteOperation {
private static final String NODE_DISPLAY_NAME= "display-name"; private static final String NODE_DISPLAY_NAME= "display-name";
private static final String NODE_EMAIL= "email"; private static final String NODE_EMAIL= "email";
private String mUserName; private String mDisplayName;
public String getUserName() { public String getDisplayName() {
return mUserName; return mDisplayName;
} }
@ -98,7 +98,7 @@ public class GetRemoteUserNameOperation extends RemoteOperation {
ArrayList<Object> data = new ArrayList<Object>(); ArrayList<Object> data = new ArrayList<Object>();
data.add(displayName); data.add(displayName);
result.setData(data); result.setData(data);
mUserName = displayName; mDisplayName = displayName;
Log_OC.d(TAG, "*** Parsed user information: " + id + " - " + displayName + " - " + email); Log_OC.d(TAG, "*** Parsed user information: " + id + " - " + displayName + " - " + email);