From c52d23fabf8d5a6180738f426be55974e969a459 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Wed, 11 May 2022 21:21:58 +0200 Subject: [PATCH] improve detekt score Signed-off-by: Andy Scherzinger --- .../talk/controllers/ContactsController.kt | 20 ++-- .../EnumSystemMessageTypeConverter.kt | 94 +++++++++---------- .../com/nextcloud/talk/utils/DrawableUtils.kt | 1 + 3 files changed, 61 insertions(+), 54 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.kt index d2ca359ef..13023f14c 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.kt +++ b/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.kt @@ -354,14 +354,18 @@ class ContactsController(args: Bundle) : } override fun onOptionsItemSelected(item: MenuItem): Boolean { - val itemId = item.itemId - if (itemId == R.id.home) { - return router.popCurrentController() - } else if (itemId == R.id.contacts_selection_done) { - selectionDone() - return true + return when (item.itemId) { + R.id.home -> { + router.popCurrentController() + } + R.id.contacts_selection_done -> { + selectionDone() + true + } + else -> { + super.onOptionsItemSelected(item) + } } - return super.onOptionsItemSelected(item) } override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { @@ -689,6 +693,7 @@ class ContactsController(args: Bundle) : dispose(null) } + @Suppress("Detekt.TooGenericExceptionCaught") override fun onQueryTextChange(newText: String): Boolean { if (newText != "" && adapter?.hasNewFilter(newText) == true) { adapter?.setFilter(newText) @@ -933,6 +938,7 @@ class ContactsController(args: Bundle) : } } + @Suppress("Detekt.TooGenericExceptionCaught") private fun toggleNewCallHeaderVisibility(showInitialLayout: Boolean) { try { if (showInitialLayout) { diff --git a/app/src/main/java/com/nextcloud/talk/models/json/converters/EnumSystemMessageTypeConverter.kt b/app/src/main/java/com/nextcloud/talk/models/json/converters/EnumSystemMessageTypeConverter.kt index 8273f378b..c20d09046 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/converters/EnumSystemMessageTypeConverter.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/converters/EnumSystemMessageTypeConverter.kt @@ -121,53 +121,53 @@ import com.nextcloud.talk.models.json.chat.ChatMessage.SystemMessageType.USER_RE */ class EnumSystemMessageTypeConverter : StringBasedTypeConverter() { override fun getFromString(string: String): ChatMessage.SystemMessageType { - when (string) { - "conversation_created" -> return CONVERSATION_CREATED - "conversation_renamed" -> return CONVERSATION_RENAMED - "description_set" -> return DESCRIPTION_SET - "description_removed" -> return DESCRIPTION_REMOVED - "call_started" -> return CALL_STARTED - "call_joined" -> return CALL_JOINED - "call_left" -> return CALL_LEFT - "call_ended" -> return CALL_ENDED - "call_ended_everyone" -> return CALL_ENDED_EVERYONE - "call_missed" -> return CALL_MISSED - "call_tried" -> return CALL_TRIED - "read_only_off" -> return READ_ONLY_OFF - "read_only" -> return READ_ONLY - "listable_none" -> return LISTABLE_NONE - "listable_users" -> return LISTABLE_USERS - "listable_all" -> return LISTABLE_ALL - "lobby_none" -> return LOBBY_NONE - "lobby_non_moderators" -> return LOBBY_NON_MODERATORS - "lobby_timer_reached" -> return LOBBY_OPEN_TO_EVERYONE - "guests_allowed" -> return GUESTS_ALLOWED - "guests_disallowed" -> return GUESTS_DISALLOWED - "password_set" -> return PASSWORD_SET - "password_removed" -> return PASSWORD_REMOVED - "user_added" -> return USER_ADDED - "user_removed" -> return USER_REMOVED - "group_added" -> return GROUP_ADDED - "group_removed" -> return GROUP_REMOVED - "circle_added" -> return CIRCLE_ADDED - "circle_removed" -> return CIRCLE_REMOVED - "moderator_promoted" -> return MODERATOR_PROMOTED - "moderator_demoted" -> return MODERATOR_DEMOTED - "guest_moderator_promoted" -> return GUEST_MODERATOR_PROMOTED - "guest_moderator_demoted" -> return GUEST_MODERATOR_DEMOTED - "message_deleted" -> return MESSAGE_DELETED - "file_shared" -> return FILE_SHARED - "object_shared" -> return OBJECT_SHARED - "matterbridge_config_added" -> return MATTERBRIDGE_CONFIG_ADDED - "matterbridge_config_edited" -> return MATTERBRIDGE_CONFIG_EDITED - "matterbridge_config_removed" -> return MATTERBRIDGE_CONFIG_REMOVED - "matterbridge_config_enabled" -> return MATTERBRIDGE_CONFIG_ENABLED - "matterbridge_config_disabled" -> return MATTERBRIDGE_CONFIG_DISABLED - "history_cleared" -> return CLEARED_CHAT - "reaction" -> return REACTION - "reaction_deleted" -> return REACTION_DELETED - "reaction_revoked" -> return REACTION_REVOKED - else -> return DUMMY + return when (string) { + "conversation_created" -> CONVERSATION_CREATED + "conversation_renamed" -> CONVERSATION_RENAMED + "description_set" -> DESCRIPTION_SET + "description_removed" -> DESCRIPTION_REMOVED + "call_started" -> CALL_STARTED + "call_joined" -> CALL_JOINED + "call_left" -> CALL_LEFT + "call_ended" -> CALL_ENDED + "call_ended_everyone" -> CALL_ENDED_EVERYONE + "call_missed" -> CALL_MISSED + "call_tried" -> CALL_TRIED + "read_only_off" -> READ_ONLY_OFF + "read_only" -> READ_ONLY + "listable_none" -> LISTABLE_NONE + "listable_users" -> LISTABLE_USERS + "listable_all" -> LISTABLE_ALL + "lobby_none" -> LOBBY_NONE + "lobby_non_moderators" -> LOBBY_NON_MODERATORS + "lobby_timer_reached" -> LOBBY_OPEN_TO_EVERYONE + "guests_allowed" -> GUESTS_ALLOWED + "guests_disallowed" -> GUESTS_DISALLOWED + "password_set" -> PASSWORD_SET + "password_removed" -> PASSWORD_REMOVED + "user_added" -> USER_ADDED + "user_removed" -> USER_REMOVED + "group_added" -> GROUP_ADDED + "group_removed" -> GROUP_REMOVED + "circle_added" -> CIRCLE_ADDED + "circle_removed" -> CIRCLE_REMOVED + "moderator_promoted" -> MODERATOR_PROMOTED + "moderator_demoted" -> MODERATOR_DEMOTED + "guest_moderator_promoted" -> GUEST_MODERATOR_PROMOTED + "guest_moderator_demoted" -> GUEST_MODERATOR_DEMOTED + "message_deleted" -> MESSAGE_DELETED + "file_shared" -> FILE_SHARED + "object_shared" -> OBJECT_SHARED + "matterbridge_config_added" -> MATTERBRIDGE_CONFIG_ADDED + "matterbridge_config_edited" -> MATTERBRIDGE_CONFIG_EDITED + "matterbridge_config_removed" -> MATTERBRIDGE_CONFIG_REMOVED + "matterbridge_config_enabled" -> MATTERBRIDGE_CONFIG_ENABLED + "matterbridge_config_disabled" -> MATTERBRIDGE_CONFIG_DISABLED + "history_cleared" -> CLEARED_CHAT + "reaction" -> REACTION + "reaction_deleted" -> REACTION_DELETED + "reaction_revoked" -> REACTION_REVOKED + else -> DUMMY } } diff --git a/app/src/main/java/com/nextcloud/talk/utils/DrawableUtils.kt b/app/src/main/java/com/nextcloud/talk/utils/DrawableUtils.kt index 5f5eabb86..4fc07da75 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/DrawableUtils.kt +++ b/app/src/main/java/com/nextcloud/talk/utils/DrawableUtils.kt @@ -25,6 +25,7 @@ import java.util.HashMap object DrawableUtils { + @Suppress("Detekt.LongMethod") fun getDrawableResourceIdForMimeType(mimetype: String?): Int { var localMimetype = mimetype val drawableMap = HashMap()