Return user name when display name is unknown (afe65bdc) · Commits · e / os / nextcloud-android-lib

src/com/owncloud/android/lib/common/OwnCloudAccount.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -128,7 +128,13 @@ public class OwnCloudAccount {
		}

		public String getDisplayName() {
		if (mDisplayName != null && mDisplayName.length() > 0) {
		return mDisplayName;
		} else if (mCredentials != null) {
		return mCredentials.getUsername();
		} else {
		return "NONE";
		}
		}

		public void setDisplayName(String displayName) {

+4 −4

Original line number	Diff line number	Diff line
		@@ -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);