mirror of
https://github.com/nextcloud/talk-android
synced 2025-07-11 14:54:09 +01:00
rename updateUser to updateOrCreateUser
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
parent
96910c02a1
commit
7ce5746969
@ -327,7 +327,7 @@ class SettingsController : NewBaseController(R.layout.controller_settings) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
currentUser!!.clientCertificate = finalAlias
|
currentUser!!.clientCertificate = finalAlias
|
||||||
userManager.updateUser(currentUser!!)
|
userManager.updateOrCreateUser(currentUser!!)
|
||||||
},
|
},
|
||||||
arrayOf("RSA", "EC"),
|
arrayOf("RSA", "EC"),
|
||||||
null,
|
null,
|
||||||
@ -601,7 +601,7 @@ class SettingsController : NewBaseController(R.layout.controller_settings) {
|
|||||||
}
|
}
|
||||||
if ((!TextUtils.isEmpty(displayName) && !(displayName == currentUser!!.displayName))) {
|
if ((!TextUtils.isEmpty(displayName) && !(displayName == currentUser!!.displayName))) {
|
||||||
currentUser!!.displayName = displayName
|
currentUser!!.displayName = displayName
|
||||||
userManager.updateUser(currentUser!!)
|
userManager.updateOrCreateUser(currentUser!!)
|
||||||
binding.displayNameText.text = currentUser!!.displayName
|
binding.displayNameText.text = currentUser!!.displayName
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -123,7 +123,7 @@ class UserManager internal constructor(private val userRepository: UsersReposito
|
|||||||
}.toSingle()
|
}.toSingle()
|
||||||
}
|
}
|
||||||
|
|
||||||
fun updateUser(user: User): Single<Int> {
|
fun updateOrCreateUser(user: User): Single<Int> {
|
||||||
return Single.fromCallable {
|
return Single.fromCallable {
|
||||||
when (user.id) {
|
when (user.id) {
|
||||||
null -> userRepository.insertUser(user).toInt()
|
null -> userRepository.insertUser(user).toInt()
|
||||||
|
Loading…
Reference in New Issue
Block a user