From f951336d0d6fcb70d7038969487f37c2889888a1 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Tue, 26 Jul 2022 21:55:03 +0200 Subject: [PATCH] remove unused persistence methods Signed-off-by: Andy Scherzinger --- .../talk/activities/MainActivityTest.kt | 2 +- .../com/nextcloud/talk/data/user/UsersDao.kt | 23 --------- .../talk/data/user/UsersRepository.kt | 2 - .../talk/data/user/UsersRepositoryImpl.kt | 8 ---- .../com/nextcloud/talk/users/UserManager.kt | 48 +------------------ 5 files changed, 3 insertions(+), 80 deletions(-) diff --git a/app/src/androidTest/java/com/nextcloud/talk/activities/MainActivityTest.kt b/app/src/androidTest/java/com/nextcloud/talk/activities/MainActivityTest.kt index cd34ac884..e1cf53bfb 100644 --- a/app/src/androidTest/java/com/nextcloud/talk/activities/MainActivityTest.kt +++ b/app/src/androidTest/java/com/nextcloud/talk/activities/MainActivityTest.kt @@ -18,7 +18,7 @@ class MainActivityTest { fun login() { val sut = activityRule.launchActivity(null) - val user = sut.userManager.createOrUpdateUser( + val user = sut.userManager.storeProfile( "test", UserManager.UserAttributes( null, diff --git a/app/src/main/java/com/nextcloud/talk/data/user/UsersDao.kt b/app/src/main/java/com/nextcloud/talk/data/user/UsersDao.kt index 121bc13ff..c8ac84a64 100644 --- a/app/src/main/java/com/nextcloud/talk/data/user/UsersDao.kt +++ b/app/src/main/java/com/nextcloud/talk/data/user/UsersDao.kt @@ -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 { const val TAG = "UsersDao" } diff --git a/app/src/main/java/com/nextcloud/talk/data/user/UsersRepository.kt b/app/src/main/java/com/nextcloud/talk/data/user/UsersRepository.kt index 40cd5a602..624d8df2b 100644 --- a/app/src/main/java/com/nextcloud/talk/data/user/UsersRepository.kt +++ b/app/src/main/java/com/nextcloud/talk/data/user/UsersRepository.kt @@ -41,6 +41,4 @@ interface UsersRepository { fun insertUser(user: User): Long fun setUserAsActiveWithId(id: Long): Single fun deleteUser(user: User): Int - fun setAnyUserAsActive(): Boolean - fun markUserForDeletion(id: Long): Boolean } diff --git a/app/src/main/java/com/nextcloud/talk/data/user/UsersRepositoryImpl.kt b/app/src/main/java/com/nextcloud/talk/data/user/UsersRepositoryImpl.kt index 7ef3ebbcc..5dbda623c 100644 --- a/app/src/main/java/com/nextcloud/talk/data/user/UsersRepositoryImpl.kt +++ b/app/src/main/java/com/nextcloud/talk/data/user/UsersRepositoryImpl.kt @@ -80,12 +80,4 @@ class UsersRepositoryImpl(private val usersDao: UsersDao) : UsersRepository { override fun deleteUser(user: User): Int { return usersDao.deleteUser(UserMapper.toEntity(user)) } - - override fun setAnyUserAsActive(): Boolean { - return usersDao.setAnyUserAsActive() - } - - override fun markUserForDeletion(id: Long): Boolean { - return usersDao.markUserForDeletion(id) - } } diff --git a/app/src/main/java/com/nextcloud/talk/users/UserManager.kt b/app/src/main/java/com/nextcloud/talk/users/UserManager.kt index c80716847..06f70b4ee 100644 --- a/app/src/main/java/com/nextcloud/talk/users/UserManager.kt +++ b/app/src/main/java/com/nextcloud/talk/users/UserManager.kt @@ -49,10 +49,6 @@ class UserManager internal constructor(private val userRepository: UsersReposito return userRepository.deleteUser(userRepository.getUserWithId(internalId).blockingGet()) } - fun getUserById(userId: String): Maybe { - return userRepository.getUserWithUserId(userId) - } - fun getUserWithId(id: Long): Maybe { return userRepository.getUserWithId(id) } @@ -154,9 +150,7 @@ class UserManager internal constructor(private val userRepository: UsersReposito } fun storeProfile(username: String?, userAttributes: UserAttributes): Maybe { - val userMaybe: Maybe = findUser(null, userAttributes) - - return userMaybe + return findUser(userAttributes) .map { user: User? -> when (user) { 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") - fun createOrUpdateUser( - username: String?, - userAttributes: UserAttributes - ): Maybe { - val userMaybe: Maybe = 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 { + private fun findUser(userAttributes: UserAttributes): Maybe { return if (userAttributes.id != null) { userRepository.getUserWithId(userAttributes.id) - } else if (username != null && userAttributes.serverUrl != null) { - userRepository.getUserWithUsernameAndServer(username, userAttributes.serverUrl) } else { Maybe.empty() } } - fun getUserWithUsernameAndServer(username: String, server: String): Maybe { - return userRepository.getUserWithUsernameAndServer(username, server) - } - private fun updateUserData(user: User, userAttributes: UserAttributes) { user.userId = userAttributes.userId user.token = userAttributes.token