From 4233e1bbc14e2e25d17ed27f7be3b2ed7131f5fc Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Thu, 23 Jun 2022 20:35:59 +0200 Subject: [PATCH] Rename UserNgEntity to UserEntity Signed-off-by: Andy Scherzinger --- .../talk/data/source/local/TalkDatabase.kt | 4 +-- .../nextcloud/talk/data/user/UserMapper.kt | 32 ++++++++--------- .../com/nextcloud/talk/data/user/UsersDao.kt | 34 +++++++++---------- .../model/{UserNgEntity.kt => UserEntity.kt} | 2 +- .../com/nextcloud/talk/users/UserManager.kt | 4 +-- 5 files changed, 38 insertions(+), 38 deletions(-) rename app/src/main/java/com/nextcloud/talk/data/user/model/{UserNgEntity.kt => UserEntity.kt} (99%) diff --git a/app/src/main/java/com/nextcloud/talk/data/source/local/TalkDatabase.kt b/app/src/main/java/com/nextcloud/talk/data/source/local/TalkDatabase.kt index 5f854f38c..284387093 100644 --- a/app/src/main/java/com/nextcloud/talk/data/source/local/TalkDatabase.kt +++ b/app/src/main/java/com/nextcloud/talk/data/source/local/TalkDatabase.kt @@ -35,13 +35,13 @@ import com.nextcloud.talk.data.source.local.converters.SignalingSettingsConverte import com.nextcloud.talk.data.storage.ArbitraryStoragesDao import com.nextcloud.talk.data.storage.model.ArbitraryStorageNgEntity import com.nextcloud.talk.data.user.UsersDao -import com.nextcloud.talk.data.user.model.UserNgEntity +import com.nextcloud.talk.data.user.model.UserEntity import net.sqlcipher.database.SQLiteDatabase import net.sqlcipher.database.SupportFactory import java.util.Locale @Database( - entities = [UserNgEntity::class, ArbitraryStorageNgEntity::class], + entities = [UserEntity::class, ArbitraryStorageNgEntity::class], version = 8, exportSchema = true ) diff --git a/app/src/main/java/com/nextcloud/talk/data/user/UserMapper.kt b/app/src/main/java/com/nextcloud/talk/data/user/UserMapper.kt index c89c4165c..7ef24b74b 100644 --- a/app/src/main/java/com/nextcloud/talk/data/user/UserMapper.kt +++ b/app/src/main/java/com/nextcloud/talk/data/user/UserMapper.kt @@ -21,10 +21,10 @@ package com.nextcloud.talk.data.user import com.nextcloud.talk.data.user.model.User -import com.nextcloud.talk.data.user.model.UserNgEntity +import com.nextcloud.talk.data.user.model.UserEntity object UserMapper { - fun toModel(entities: List?): List { + fun toModel(entities: List?): List { return if (entities == null) { ArrayList() } else { @@ -36,7 +36,7 @@ object UserMapper { } } - fun toModel(entity: UserNgEntity?): User? { + fun toModel(entity: UserEntity?): User? { return if (entity == null) { null } else { @@ -57,23 +57,23 @@ object UserMapper { } } - fun toEntity(model: User): UserNgEntity { - var userNgEntity: UserNgEntity? = null + fun toEntity(model: User): UserEntity { + var UserEntity: UserEntity? = null model.id?.let { - userNgEntity = UserNgEntity(it, model.userId, model.username, model.baseUrl) + UserEntity = UserEntity(it, model.userId, model.username, model.baseUrl) } ?: run { - userNgEntity = UserNgEntity(userId = model.userId, username = model.username, baseUrl = model.baseUrl) + UserEntity = UserEntity(userId = model.userId, username = model.username, baseUrl = model.baseUrl) } - userNgEntity!!.token = model.token - userNgEntity!!.displayName = model.displayName - userNgEntity!!.pushConfigurationState = model.pushConfigurationState - userNgEntity!!.capabilities = model.capabilities - userNgEntity!!.clientCertificate = model.clientCertificate - userNgEntity!!.externalSignalingServer = model.externalSignalingServer - userNgEntity!!.current = model.current - userNgEntity!!.scheduledForDeletion = model.scheduledForDeletion + UserEntity!!.token = model.token + UserEntity!!.displayName = model.displayName + UserEntity!!.pushConfigurationState = model.pushConfigurationState + UserEntity!!.capabilities = model.capabilities + UserEntity!!.clientCertificate = model.clientCertificate + UserEntity!!.externalSignalingServer = model.externalSignalingServer + UserEntity!!.current = model.current + UserEntity!!.scheduledForDeletion = model.scheduledForDeletion - return userNgEntity!! + return UserEntity!! } } 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 5f3a61d31..4a9c89d47 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 @@ -29,7 +29,7 @@ import androidx.room.OnConflictStrategy import androidx.room.Query import androidx.room.Transaction import androidx.room.Update -import com.nextcloud.talk.data.user.model.UserNgEntity +import com.nextcloud.talk.data.user.model.UserEntity import io.reactivex.Single import io.reactivex.SingleObserver import io.reactivex.disposables.Disposable @@ -41,58 +41,58 @@ import java.lang.Boolean.TRUE abstract class UsersDao { // get active user @Query("SELECT * FROM User where current = 1") - abstract fun getActiveUser(): Single + abstract fun getActiveUser(): Single @Query("SELECT * FROM User where current = 1") - abstract fun getActiveUserSynchronously(): UserNgEntity? + abstract fun getActiveUserSynchronously(): UserEntity? @Query("SELECT * FROM User WHERE current = 1") - abstract fun getActiveUserLiveData(): Single + abstract fun getActiveUserLiveData(): Single @Query("DELETE FROM User WHERE id = :id") abstract fun deleteUserWithId(id: Long) @Update - abstract fun updateUser(user: UserNgEntity): Int + abstract fun updateUser(user: UserEntity): Int @Insert(onConflict = OnConflictStrategy.REPLACE) - abstract fun saveUser(user: UserNgEntity): Long + abstract fun saveUser(user: UserEntity): Long @Insert(onConflict = OnConflictStrategy.REPLACE) - abstract fun saveUsers(vararg users: UserNgEntity): List + abstract fun saveUsers(vararg users: UserEntity): List // get all users not scheduled for deletion @Query("SELECT * FROM User where current != 0") - abstract fun getUsers(): Single> + abstract fun getUsers(): Single> @Query("SELECT * FROM User where id = :id") - abstract fun getUserWithId(id: Long): Single + abstract fun getUserWithId(id: Long): Single @Query("SELECT * FROM User where id = :id AND scheduledForDeletion != 1") - abstract fun getUserWithIdNotScheduledForDeletion(id: Long): Single + abstract fun getUserWithIdNotScheduledForDeletion(id: Long): Single @Query("SELECT * FROM User where userId = :userId") - abstract fun getUserWithUserId(userId: String): Single + abstract fun getUserWithUserId(userId: String): Single @Query("SELECT * FROM User where userId != :userId") - abstract fun getUsersWithoutUserId(userId: Long): Single> + abstract fun getUsersWithoutUserId(userId: Long): Single> @Query("SELECT * FROM User where current = 0") - abstract fun getUsersScheduledForDeletion(): Single> + abstract fun getUsersScheduledForDeletion(): Single> @Query("SELECT * FROM User where scheduledForDeletion = 0") - abstract fun getUsersNotScheduledForDeletion(): Single> + abstract fun getUsersNotScheduledForDeletion(): Single> @Query("SELECT * FROM User WHERE username = :username AND baseUrl = :server") - abstract fun getUserWithUsernameAndServer(username: String, server: String): Single + abstract fun getUserWithUsernameAndServer(username: String, server: String): Single @Transaction open suspend fun setUserAsActiveWithId(id: Long): Boolean { val users = getUsers() var result = TRUE - users.subscribe(object : SingleObserver> { - override fun onSuccess(users: List) { + users.subscribe(object : SingleObserver> { + override fun onSuccess(users: List) { for (user in users) { // removed from clause: && UserStatus.ACTIVE == user.status if (user.id != id) { diff --git a/app/src/main/java/com/nextcloud/talk/data/user/model/UserNgEntity.kt b/app/src/main/java/com/nextcloud/talk/data/user/model/UserEntity.kt similarity index 99% rename from app/src/main/java/com/nextcloud/talk/data/user/model/UserNgEntity.kt rename to app/src/main/java/com/nextcloud/talk/data/user/model/UserEntity.kt index 2bda65e6e..e7224539c 100644 --- a/app/src/main/java/com/nextcloud/talk/data/user/model/UserNgEntity.kt +++ b/app/src/main/java/com/nextcloud/talk/data/user/model/UserEntity.kt @@ -37,7 +37,7 @@ import java.lang.Boolean.FALSE @Parcelize @Serializable @Entity(tableName = "User") -data class UserNgEntity( +data class UserEntity( @PrimaryKey(autoGenerate = true) @ColumnInfo(name = "id") var id: Long = 0, @ColumnInfo(name = "userId") var userId: String? = null, @ColumnInfo(name = "username") var username: String? = null, 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 625359900..ba3c0e3c9 100644 --- a/app/src/main/java/com/nextcloud/talk/users/UserManager.kt +++ b/app/src/main/java/com/nextcloud/talk/users/UserManager.kt @@ -25,7 +25,7 @@ import android.text.TextUtils import com.bluelinelabs.logansquare.LoganSquare import com.nextcloud.talk.data.user.UsersRepository import com.nextcloud.talk.data.user.model.User -import com.nextcloud.talk.data.user.model.UserNgEntity +import com.nextcloud.talk.data.user.model.UserEntity import com.nextcloud.talk.models.ExternalSignalingServer import com.nextcloud.talk.models.json.capabilities.Capabilities import com.nextcloud.talk.models.json.push.PushConfigurationState @@ -195,7 +195,7 @@ class UserManager internal constructor(private val userRepository: UsersReposito return user } - private fun validDisplayName(displayName: String?, user: UserNgEntity): Boolean { + private fun validDisplayName(displayName: String?, user: UserEntity): Boolean { return if (displayName == null) { false } else {