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

remove unused persistence methods

Browse Source 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2022-07-26 21:55:03 +02:00
parent 3d0027d517
commit f951336d0d
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
5 changed files with 3 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/androidTest/java/com/nextcloud/talk/activities/MainActivityTest.kt
View File

@ -18,7 +18,7 @@ class MainActivityTest {
fun login() { fun login() {
val sut = activityRule.launchActivity(null) val sut = activityRule.launchActivity(null)
val user = sut.userManager.createOrUpdateUser( val user = sut.userManager.storeProfile(
"test", "test",
UserManager.UserAttributes( UserManager.UserAttributes(
null, null,

23
app/src/main/java/com/nextcloud/talk/data/user/UsersDao.kt
View File

@ -98,29 +98,6 @@ abstract class UsersDao {
} }
} }
@Transaction
open fun markUserForDeletion(id: Long): Boolean {
getUserWithId(id).blockingGet()?.let { user ->
user.current = FALSE
updateUser(user)
}
return setAnyUserAsActive()
}
@Transaction
open fun setAnyUserAsActive(): Boolean {
val users = getUsers().blockingGet()
val result = users.firstOrNull()?.let { user ->
user.current = TRUE
updateUser(user)
TRUE
} ?: FALSE
return result
}
companion object { companion object {
const val TAG = "UsersDao" const val TAG = "UsersDao"
} }

2
app/src/main/java/com/nextcloud/talk/data/user/UsersRepository.kt
View File

@ -41,6 +41,4 @@ interface UsersRepository {
fun insertUser(user: User): Long fun insertUser(user: User): Long
fun setUserAsActiveWithId(id: Long): Single<Boolean> fun setUserAsActiveWithId(id: Long): Single<Boolean>
fun deleteUser(user: User): Int fun deleteUser(user: User): Int
fun setAnyUserAsActive(): Boolean
fun markUserForDeletion(id: Long): Boolean
} }

8
app/src/main/java/com/nextcloud/talk/data/user/UsersRepositoryImpl.kt
View File

@ -80,12 +80,4 @@ class UsersRepositoryImpl(private val usersDao: UsersDao) : UsersRepository {
override fun deleteUser(user: User): Int { override fun deleteUser(user: User): Int {
return usersDao.deleteUser(UserMapper.toEntity(user)) return usersDao.deleteUser(UserMapper.toEntity(user))
} }
override fun setAnyUserAsActive(): Boolean {
return usersDao.setAnyUserAsActive()
}
override fun markUserForDeletion(id: Long): Boolean {
return usersDao.markUserForDeletion(id)
}
} }

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

@ -49,10 +49,6 @@ class UserManager internal constructor(private val userRepository: UsersReposito
return userRepository.deleteUser(userRepository.getUserWithId(internalId).blockingGet()) return userRepository.deleteUser(userRepository.getUserWithId(internalId).blockingGet())
} }
fun getUserById(userId: String): Maybe<User> {
return userRepository.getUserWithUserId(userId)
}
fun getUserWithId(id: Long): Maybe<User> { fun getUserWithId(id: Long): Maybe<User> {
return userRepository.getUserWithId(id) return userRepository.getUserWithId(id)
} }
@ -154,9 +150,7 @@ class UserManager internal constructor(private val userRepository: UsersReposito
} }
fun storeProfile(username: String?, userAttributes: UserAttributes): Maybe<User> { fun storeProfile(username: String?, userAttributes: UserAttributes): Maybe<User> {
val userMaybe: Maybe<User> = findUser(null, userAttributes) return findUser(userAttributes)
return userMaybe
.map { user: User? -> .map { user: User? ->
when (user) { when (user) {
null -> createUser( null -> createUser(
@ -190,52 +184,14 @@ class UserManager internal constructor(private val userRepository: UsersReposito
} }
} }
@Deprecated("Only available for migration, use updateExternalSignalingServer or create new methods") private fun findUser(userAttributes: UserAttributes): Maybe<User> {
fun createOrUpdateUser(
username: String?,
userAttributes: UserAttributes
): Maybe<User> {
val userMaybe: Maybe<User> = findUser(username, userAttributes)
return userMaybe
.map { user: User? ->
when (user) {
null -> createUser(
username,
userAttributes
)
else -> {
updateUserData(
user,
userAttributes
)
user
}
}
}
.switchIfEmpty(Maybe.just(createUser(username, userAttributes)))
.map { user ->
userRepository.insertUser(user)
}
.flatMap { id ->
userRepository.getUserWithId(id)
}
}
private fun findUser(username: String?, userAttributes: UserAttributes): Maybe<User> {
return if (userAttributes.id != null) { return if (userAttributes.id != null) {
userRepository.getUserWithId(userAttributes.id) userRepository.getUserWithId(userAttributes.id)
} else if (username != null && userAttributes.serverUrl != null) {
userRepository.getUserWithUsernameAndServer(username, userAttributes.serverUrl)
} else { } else {
Maybe.empty() Maybe.empty()
} }
} }
fun getUserWithUsernameAndServer(username: String, server: String): Maybe<User> {
return userRepository.getUserWithUsernameAndServer(username, server)
}
private fun updateUserData(user: User, userAttributes: UserAttributes) { private fun updateUserData(user: User, userAttributes: UserAttributes) {
user.userId = userAttributes.userId user.userId = userAttributes.userId
user.token = userAttributes.token user.token = userAttributes.token