|
@@ -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(),
|
|
|
|
- userEntity.getToken(),
|
|
|
|
- userEntity.getBaseUrl(), displayName, null, true,
|
|
|
|
- userProfileOverall.getOcs().getData().getUserId())
|
|
|
|
|
|
+ dbQueryDisposable = userUtils.createOrUpdateUser(null,
|
|
|
|
+ null,
|
|
|
|
+ null, displayName, null, true,
|
|
|
|
+ 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 {
|
|
}
|
|
}
|
|
|
|
|
|
});
|
|
});
|
|
-
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|