Эх сурвалжийг харах

UsersDao/Repository: get rid of suspend functions

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
Álvaro Brey 2 жил өмнө
parent
commit
0ac26f557b

+ 2 - 2
app/src/main/java/com/nextcloud/talk/data/user/UsersDao.kt

@@ -99,7 +99,7 @@ abstract class UsersDao {
     }
     }
 
 
     @Transaction
     @Transaction
-    open suspend fun markUserForDeletion(id: Long): Boolean {
+    open fun markUserForDeletion(id: Long): Boolean {
         getUserWithId(id).blockingGet()?.let { user ->
         getUserWithId(id).blockingGet()?.let { user ->
             user.current = FALSE
             user.current = FALSE
             updateUser(user)
             updateUser(user)
@@ -109,7 +109,7 @@ abstract class UsersDao {
     }
     }
 
 
     @Transaction
     @Transaction
-    open suspend fun setAnyUserAsActive(): Boolean {
+    open fun setAnyUserAsActive(): Boolean {
         val users = getUsers().blockingGet()
         val users = getUsers().blockingGet()
 
 
         val result = users.firstOrNull()?.let { user ->
         val result = users.firstOrNull()?.let { user ->

+ 2 - 2
app/src/main/java/com/nextcloud/talk/data/user/UsersRepository.kt

@@ -41,6 +41,6 @@ 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 deleteUserWithId(id: Long)
     fun deleteUserWithId(id: Long)
-    suspend fun setAnyUserAsActive(): Boolean
-    suspend fun markUserForDeletion(id: Long): Boolean
+    fun setAnyUserAsActive(): Boolean
+    fun markUserForDeletion(id: Long): Boolean
 }
 }

+ 2 - 2
app/src/main/java/com/nextcloud/talk/data/user/UsersRepositoryImpl.kt

@@ -81,11 +81,11 @@ class UsersRepositoryImpl(private val usersDao: UsersDao) : UsersRepository {
         usersDao.deleteUserWithId(id)
         usersDao.deleteUserWithId(id)
     }
     }
 
 
-    override suspend fun setAnyUserAsActive(): Boolean {
+    override fun setAnyUserAsActive(): Boolean {
         return usersDao.setAnyUserAsActive()
         return usersDao.setAnyUserAsActive()
     }
     }
 
 
-    override suspend fun markUserForDeletion(id: Long): Boolean {
+    override fun markUserForDeletion(id: Long): Boolean {
         return usersDao.markUserForDeletion(id)
         return usersDao.markUserForDeletion(id)
     }
     }
 }
 }