gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 20:19:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix settings

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-01-12 15:30:00 +01:00
parent 562f5498d1
commit ec7d2f58f6
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -228,9 +228,7 @@ public class SettingsController extends BaseController {
getParentController().getRouter().pushController(RouterTransaction.with(new getParentController().getRouter().pushController(RouterTransaction.with(new
SwitchAccountController()).pushChangeHandler(new VerticalChangeHandler()) SwitchAccountController()).pushChangeHandler(new VerticalChangeHandler())
.popChangeHandler(new VerticalChangeHandler())); .popChangeHandler(new VerticalChangeHandler()));
}); });
} }
@Override @Override
@ -296,10 +294,10 @@ public class SettingsController extends BaseController {
if ((!TextUtils.isEmpty(displayName) && !displayName.equals(userEntity.getDisplayName())) || if ((!TextUtils.isEmpty(displayName) && !displayName.equals(userEntity.getDisplayName())) ||
needsToUpdateUserId) { needsToUpdateUserId) {
dbQueryDisposable = userUtils.createOrUpdateUser(userEntity.getUsername(), dbQueryDisposable = userUtils.createOrUpdateUser(null,
userEntity.getToken(), null,
userEntity.getBaseUrl(), displayName, null, true, null, displayName, null, true,
userProfileOverall.getOcs().getData().getUserId()) userProfileOverall.getOcs().getData().getUserId(), userEntity.getId())
.subscribeOn(Schedulers.newThread()) .subscribeOn(Schedulers.newThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(userEntityResult -> { .subscribe(userEntityResult -> {
@ -344,7 +342,6 @@ public class SettingsController extends BaseController {
} }
}); });
} }