Fix the damn thing (3de86577) · Commits · e / os / nextcloud-android-lib

src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java

+10 −5

Original line number	Diff line number	Diff line
		@@ -153,7 +153,8 @@ public class GetRemoteUserInfoOperation extends RemoteOperation {
		userInfo.setDisplayName(respData.getString(NODE_DISPLAY_NAME_ALT));
		}

		if (respData.getString(NODE_EMAIL) != null && !TextUtils.isEmpty(respData.getString(NODE_EMAIL))) {
		if (respData.has(NODE_EMAIL) && !respData.isNull(NODE_EMAIL) &&
		!TextUtils.isEmpty(respData.getString(NODE_EMAIL))) {
		userInfo.setEmail(respData.getString(NODE_EMAIL));
		}

		@@ -174,19 +175,23 @@ public class GetRemoteUserInfoOperation extends RemoteOperation {
		userInfo.setQuota(new Quota(quotaFree, quotaUsed, quotaTotal, quotaRelative, quotaValue));

		if (versionWithSelfAPI) {
		if (respData.has(NODE_PHONE) && !TextUtils.isEmpty(respData.getString(NODE_PHONE))) {
		if (respData.has(NODE_PHONE) && !respData.isNull(NODE_PHONE) &&
		!TextUtils.isEmpty(respData.getString(NODE_PHONE))) {
		userInfo.setPhone(respData.getString(NODE_PHONE));
		}

		if (respData.has(NODE_ADDRESS) && !TextUtils.isEmpty(respData.getString(NODE_ADDRESS))) {
		if (respData.has(NODE_ADDRESS) && !respData.isNull(NODE_ADDRESS) &&
		!TextUtils.isEmpty(respData.getString(NODE_ADDRESS))) {
		userInfo.setAddress(respData.getString(NODE_ADDRESS));
		}

		if (respData.has(NODE_WEBPAGE) && !TextUtils.isEmpty(respData.getString(NODE_WEBPAGE))) {
		if (respData.has(NODE_WEBPAGE) && !respData.isNull(NODE_WEBPAGE) &&
		!TextUtils.isEmpty(respData.getString(NODE_WEBPAGE))) {
		userInfo.setWebpage(respData.getString(NODE_WEBPAGE));
		}

		if (respData.has(NODE_TWITTER) && !TextUtils.isEmpty(respData.getString(NODE_TWITTER))) {
		if (respData.has(NODE_TWITTER) && !respData.isNull(NODE_TWITTER) &&
		!TextUtils.isEmpty(respData.getString(NODE_TWITTER))) {
		userInfo.setTwitter(respData.getString(NODE_TWITTER));
		}
		}