gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-03-12 10:32:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a user settings bugs

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-06-05 08:20:09 +02:00
parent 58bdc2cc67
commit 6f59a881ec
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java
View File

@ -331,22 +331,16 @@ public class SettingsController extends BaseController {
} }
boolean needsToUpdateUserId = !TextUtils.isEmpty(userProfileOverall.getOcs().getData().getUserId()) && if ((!TextUtils.isEmpty(displayName) && !displayName.equals(userEntity.getDisplayName()))) {
!userProfileOverall.getOcs().getData().getUserId().equals(userEntity.getUserId());
if ((!TextUtils.isEmpty(displayName) && !displayName.equals(userEntity.getDisplayName())) ||
needsToUpdateUserId) {
dbQueryDisposable = userUtils.createOrUpdateUser(null, dbQueryDisposable = userUtils.createOrUpdateUser(null,
null, null,
null, displayName, null, null, null, displayName, null, null,
userProfileOverall.getOcs().getData().getUserId(), userEntity.getId(), null, null) null, userEntity.getId(), null, null)
.subscribeOn(Schedulers.newThread()) .subscribeOn(Schedulers.newThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(userEntityResult -> { .subscribe(userEntityResult -> {
displayNameTextView.setText(userEntityResult.getDisplayName()); displayNameTextView.setText(userEntityResult.getDisplayName());
if (needsToUpdateUserId) {
loadAvatarImage();
}
}, },
throwable -> { throwable -> {
dispose(dbQueryDisposable); dispose(dbQueryDisposable);