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

rename updateUser to updateOrCreateUser

Browse Source 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2022-07-18 18:51:40 +02:00
parent 96910c02a1
commit 7ce5746969
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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
} }
}, },

2
app/src/main/java/com/nextcloud/talk/users/UserManager.kt
View File

@ -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()