From 17f4a20cbde6dc4e6f7ec216098876f8ac779c78 Mon Sep 17 00:00:00 2001 From: sowjanyakch Date: Wed, 19 Mar 2025 11:00:55 +0100 Subject: [PATCH] ktlintformat Signed-off-by: sowjanyakch --- .../nextcloud/talk/activities/MainActivity.kt | 1 - .../database/dao/UserCirclesOrGroupsDao.kt | 5 +- .../data/database/model/UserCirclesEntity.kt | 2 +- .../model/UserGroupsCirclesRepository.kt | 86 ++++++++++--------- .../data/database/model/UserGroupsEntity.kt | 2 +- .../talk/data/source/local/TalkDatabase.kt | 2 +- .../talk/utils/message/MessageUtils.kt | 2 +- 7 files changed, 50 insertions(+), 50 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt index 47d50d8b5..bc5234956 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt @@ -164,7 +164,6 @@ class MainActivity : BaseActivity(), ActionBarProvider { } private fun handleActionFromContact(intent: Intent) { - if (intent.action == Intent.ACTION_VIEW && intent.data != null) { val cursor = contentResolver.query(intent.data!!, null, null, null, null) diff --git a/app/src/main/java/com/nextcloud/talk/data/database/dao/UserCirclesOrGroupsDao.kt b/app/src/main/java/com/nextcloud/talk/data/database/dao/UserCirclesOrGroupsDao.kt index 9ef26f110..922271c28 100644 --- a/app/src/main/java/com/nextcloud/talk/data/database/dao/UserCirclesOrGroupsDao.kt +++ b/app/src/main/java/com/nextcloud/talk/data/database/dao/UserCirclesOrGroupsDao.kt @@ -18,10 +18,10 @@ import com.nextcloud.talk.data.database.model.UserGroupsEntity interface UserCirclesOrGroupsDao { @Query("SELECT groups FROM user_groups") - fun getUserGroups():List + fun getUserGroups(): List @Insert(onConflict = OnConflictStrategy.REPLACE) - suspend fun insertUserGroups(groups:List) + suspend fun insertUserGroups(groups: List) @Query("SELECT displayName FROM user_circles") fun getUserCircles(): List @@ -34,5 +34,4 @@ interface UserCirclesOrGroupsDao { @Query("DELETE FROM user_circles") suspend fun deleteAllUserCircles() - } diff --git a/app/src/main/java/com/nextcloud/talk/data/database/model/UserCirclesEntity.kt b/app/src/main/java/com/nextcloud/talk/data/database/model/UserCirclesEntity.kt index edf587034..2e34cd6ca 100644 --- a/app/src/main/java/com/nextcloud/talk/data/database/model/UserCirclesEntity.kt +++ b/app/src/main/java/com/nextcloud/talk/data/database/model/UserCirclesEntity.kt @@ -15,5 +15,5 @@ import androidx.room.PrimaryKey data class UserCirclesEntity( @PrimaryKey @ColumnInfo(name = "displayName") - var displayName: String, + var displayName: String ) diff --git a/app/src/main/java/com/nextcloud/talk/data/database/model/UserGroupsCirclesRepository.kt b/app/src/main/java/com/nextcloud/talk/data/database/model/UserGroupsCirclesRepository.kt index 85485158a..c8b2001d2 100644 --- a/app/src/main/java/com/nextcloud/talk/data/database/model/UserGroupsCirclesRepository.kt +++ b/app/src/main/java/com/nextcloud/talk/data/database/model/UserGroupsCirclesRepository.kt @@ -24,58 +24,60 @@ class UserGroupsCirclesRepository @Inject constructor( private val currentUserProvider: CurrentUserProviderNew ) { val user = currentUserProvider.currentUser.blockingGet() - suspend fun initialize(): Boolean = withContext(Dispatchers.IO) { - try { - val credentials: String = ApiUtils.getCredentials(user.username, user.token)!! - coroutineScope { - launch { - userCirclesOrGroupsDao.deleteAllUserGroups() - val response = ncApiCoroutines.getUserGroups( - credentials, - ApiUtils.getUrlForUserGroups( - user.baseUrl!!, - user.userId!! + @Suppress("Detekt.TooGenericExceptionCaught") + suspend fun initialize(): Boolean = + withContext(Dispatchers.IO) { + try { + val credentials: String = ApiUtils.getCredentials(user.username, user.token)!! + + coroutineScope { + launch { + userCirclesOrGroupsDao.deleteAllUserGroups() + val response = ncApiCoroutines.getUserGroups( + credentials, + ApiUtils.getUrlForUserGroups( + user.baseUrl!!, + user.userId!! + ) ) - ) - val groups = response.ocs?.data?.groups?: emptyList() - Log.d("UserDataRepo","$groups") - userCirclesOrGroupsDao.insertUserGroups( - groups.map{ - UserGroupsEntity(it) - } - ) + val groups = response.ocs?.data?.groups ?: emptyList() + Log.d("UserDataRepo", "$groups") + userCirclesOrGroupsDao.insertUserGroups( + groups.map { + UserGroupsEntity(it) + } + ) + } + + launch { + userCirclesOrGroupsDao.deleteAllUserCircles() + val response = ncApiCoroutines.getUserCircles( + credentials, + ApiUtils.getUrlForUserCircles(user.baseUrl!!) + ) + val circles = response.ocs?.data?.map { it.displayName!! } ?: emptyList() + Log.d("UserDataRepo", "$circles") + userCirclesOrGroupsDao.insertUserCircles( + circles.map { + UserCirclesEntity(it) + } + ) + } } - launch { - userCirclesOrGroupsDao.deleteAllUserCircles() - val response = ncApiCoroutines.getUserCircles( - credentials, - ApiUtils.getUrlForUserCircles(user.baseUrl!!) - ) - val circles = response.ocs?.data?.map { it.displayName!! }?: emptyList() - Log.d("UserDataRepo","$circles") - userCirclesOrGroupsDao.insertUserCircles( - circles.map{ - UserCirclesEntity(it) - } - ) - } + return@withContext true + } catch (e: Exception) { + Log.e("UserDataRepo", "Error initializing user data", e) + return@withContext false } - - return@withContext true - } catch (e: Exception) { - Log.e("UserDataRepo", "Error initializing user data", e) - return@withContext false } - } - - fun getUserGroups(): List { + fun getUserGroups(): List { return userCirclesOrGroupsDao.getUserGroups() } - fun getUserCircles(): List{ + fun getUserCircles(): List { return userCirclesOrGroupsDao.getUserCircles() } } diff --git a/app/src/main/java/com/nextcloud/talk/data/database/model/UserGroupsEntity.kt b/app/src/main/java/com/nextcloud/talk/data/database/model/UserGroupsEntity.kt index 8ce47db52..b8938bef3 100644 --- a/app/src/main/java/com/nextcloud/talk/data/database/model/UserGroupsEntity.kt +++ b/app/src/main/java/com/nextcloud/talk/data/database/model/UserGroupsEntity.kt @@ -14,5 +14,5 @@ import androidx.room.PrimaryKey @Entity(tableName = "user_groups") data class UserGroupsEntity( @PrimaryKey - @ColumnInfo (name="groups") var groups: String, + @ColumnInfo(name = "groups") var groups: String ) 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 d064e56c1..05f8c467a 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 @@ -51,7 +51,7 @@ import java.util.Locale ConversationEntity::class, ChatMessageEntity::class, ChatBlockEntity::class, - UserCirclesEntity:: class, + UserCirclesEntity::class, UserGroupsEntity::class ], version = 16, diff --git a/app/src/main/java/com/nextcloud/talk/utils/message/MessageUtils.kt b/app/src/main/java/com/nextcloud/talk/utils/message/MessageUtils.kt index 456b5ab52..71392dac2 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/message/MessageUtils.kt +++ b/app/src/main/java/com/nextcloud/talk/utils/message/MessageUtils.kt @@ -98,7 +98,7 @@ class MessageUtils(val context: Context) { return processedMessageText } - @Suppress("NestedBlockDepth", "LongParameterList") + @Suppress("NestedBlockDepth", "LongParameterList", "Detekt.LongMethod") private fun processMessageParameters( themingContext: Context, viewThemeUtils: ViewThemeUtils,