From 6f59a881ec003e0bd10ef4aef994ce2f7b1f3ebf Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Tue, 5 Jun 2018 08:20:09 +0200
Subject: [PATCH] Fix a user settings bugs

Signed-off-by: Mario Danic <mario@lovelyhq.com>
---
 .../nextcloud/talk/controllers/SettingsController.java | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java b/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java
index ff23d8e46b..53d30a2d1c 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java
@@ -331,22 +331,16 @@ protected void onAttach(@NonNull View view) {
                         }
 
 
-                        boolean needsToUpdateUserId = !TextUtils.isEmpty(userProfileOverall.getOcs().getData().getUserId()) &&
-                                !userProfileOverall.getOcs().getData().getUserId().equals(userEntity.getUserId());
-                        if ((!TextUtils.isEmpty(displayName) && !displayName.equals(userEntity.getDisplayName())) ||
-                                needsToUpdateUserId) {
+                        if ((!TextUtils.isEmpty(displayName) && !displayName.equals(userEntity.getDisplayName()))) {
 
                             dbQueryDisposable = userUtils.createOrUpdateUser(null,
                                     null,
                                     null, displayName, null, null,
-                                    userProfileOverall.getOcs().getData().getUserId(), userEntity.getId(), null, null)
+                                    null, userEntity.getId(), null, null)
                                     .subscribeOn(Schedulers.newThread())
                                     .observeOn(AndroidSchedulers.mainThread())
                                     .subscribe(userEntityResult -> {
                                                 displayNameTextView.setText(userEntityResult.getDisplayName());
-                                                if (needsToUpdateUserId) {
-                                                    loadAvatarImage();
-                                                }
                                             },
                                             throwable -> {
                                                 dispose(dbQueryDisposable);