gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-11 14:54:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

improve detekt score

Browse Source 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2022-05-11 21:21:58 +02:00
parent e6a78405ed
commit c52d23fabf
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
3 changed files with 61 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/com/nextcloud/talk/controllers/ContactsController.kt
View File

@ -354,14 +354,18 @@ class ContactsController(args: Bundle) :
} }
override fun onOptionsItemSelected(item: MenuItem): Boolean { override fun onOptionsItemSelected(item: MenuItem): Boolean {
val itemId = item.itemId return when (item.itemId) {
if (itemId == R.id.home) { R.id.home -> {
return router.popCurrentController() router.popCurrentController()
} else if (itemId == R.id.contacts_selection_done) { }
selectionDone() R.id.contacts_selection_done -> {
return true selectionDone()
true
}
else -> {
super.onOptionsItemSelected(item)
}
} }
return super.onOptionsItemSelected(item)
} }
override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
@ -689,6 +693,7 @@ class ContactsController(args: Bundle) :
dispose(null) dispose(null)
} }
@Suppress("Detekt.TooGenericExceptionCaught")
override fun onQueryTextChange(newText: String): Boolean { override fun onQueryTextChange(newText: String): Boolean {
if (newText != "" && adapter?.hasNewFilter(newText) == true) { if (newText != "" && adapter?.hasNewFilter(newText) == true) {
adapter?.setFilter(newText) adapter?.setFilter(newText)
@ -933,6 +938,7 @@ class ContactsController(args: Bundle) :
} }
} }
@Suppress("Detekt.TooGenericExceptionCaught")
private fun toggleNewCallHeaderVisibility(showInitialLayout: Boolean) { private fun toggleNewCallHeaderVisibility(showInitialLayout: Boolean) {
try { try {
if (showInitialLayout) { if (showInitialLayout) {

94
app/src/main/java/com/nextcloud/talk/models/json/converters/EnumSystemMessageTypeConverter.kt
View File

@ -121,53 +121,53 @@ import com.nextcloud.talk.models.json.chat.ChatMessage.SystemMessageType.USER_RE
*/ */
class EnumSystemMessageTypeConverter : StringBasedTypeConverter<ChatMessage.SystemMessageType>() { class EnumSystemMessageTypeConverter : StringBasedTypeConverter<ChatMessage.SystemMessageType>() {
override fun getFromString(string: String): ChatMessage.SystemMessageType { override fun getFromString(string: String): ChatMessage.SystemMessageType {
when (string) { return when (string) {
"conversation_created" -> return CONVERSATION_CREATED "conversation_created" -> CONVERSATION_CREATED
"conversation_renamed" -> return CONVERSATION_RENAMED "conversation_renamed" -> CONVERSATION_RENAMED
"description_set" -> return DESCRIPTION_SET "description_set" -> DESCRIPTION_SET
"description_removed" -> return DESCRIPTION_REMOVED "description_removed" -> DESCRIPTION_REMOVED
"call_started" -> return CALL_STARTED "call_started" -> CALL_STARTED
"call_joined" -> return CALL_JOINED "call_joined" -> CALL_JOINED
"call_left" -> return CALL_LEFT "call_left" -> CALL_LEFT
"call_ended" -> return CALL_ENDED "call_ended" -> CALL_ENDED
"call_ended_everyone" -> return CALL_ENDED_EVERYONE "call_ended_everyone" -> CALL_ENDED_EVERYONE
"call_missed" -> return CALL_MISSED "call_missed" -> CALL_MISSED
"call_tried" -> return CALL_TRIED "call_tried" -> CALL_TRIED
"read_only_off" -> return READ_ONLY_OFF "read_only_off" -> READ_ONLY_OFF
"read_only" -> return READ_ONLY "read_only" -> READ_ONLY
"listable_none" -> return LISTABLE_NONE "listable_none" -> LISTABLE_NONE
"listable_users" -> return LISTABLE_USERS "listable_users" -> LISTABLE_USERS
"listable_all" -> return LISTABLE_ALL "listable_all" -> LISTABLE_ALL
"lobby_none" -> return LOBBY_NONE "lobby_none" -> LOBBY_NONE
"lobby_non_moderators" -> return LOBBY_NON_MODERATORS "lobby_non_moderators" -> LOBBY_NON_MODERATORS
"lobby_timer_reached" -> return LOBBY_OPEN_TO_EVERYONE "lobby_timer_reached" -> LOBBY_OPEN_TO_EVERYONE
"guests_allowed" -> return GUESTS_ALLOWED "guests_allowed" -> GUESTS_ALLOWED
"guests_disallowed" -> return GUESTS_DISALLOWED "guests_disallowed" -> GUESTS_DISALLOWED
"password_set" -> return PASSWORD_SET "password_set" -> PASSWORD_SET
"password_removed" -> return PASSWORD_REMOVED "password_removed" -> PASSWORD_REMOVED
"user_added" -> return USER_ADDED "user_added" -> USER_ADDED
"user_removed" -> return USER_REMOVED "user_removed" -> USER_REMOVED
"group_added" -> return GROUP_ADDED "group_added" -> GROUP_ADDED
"group_removed" -> return GROUP_REMOVED "group_removed" -> GROUP_REMOVED
"circle_added" -> return CIRCLE_ADDED "circle_added" -> CIRCLE_ADDED
"circle_removed" -> return CIRCLE_REMOVED "circle_removed" -> CIRCLE_REMOVED
"moderator_promoted" -> return MODERATOR_PROMOTED "moderator_promoted" -> MODERATOR_PROMOTED
"moderator_demoted" -> return MODERATOR_DEMOTED "moderator_demoted" -> MODERATOR_DEMOTED
"guest_moderator_promoted" -> return GUEST_MODERATOR_PROMOTED "guest_moderator_promoted" -> GUEST_MODERATOR_PROMOTED
"guest_moderator_demoted" -> return GUEST_MODERATOR_DEMOTED "guest_moderator_demoted" -> GUEST_MODERATOR_DEMOTED
"message_deleted" -> return MESSAGE_DELETED "message_deleted" -> MESSAGE_DELETED
"file_shared" -> return FILE_SHARED "file_shared" -> FILE_SHARED
"object_shared" -> return OBJECT_SHARED "object_shared" -> OBJECT_SHARED
"matterbridge_config_added" -> return MATTERBRIDGE_CONFIG_ADDED "matterbridge_config_added" -> MATTERBRIDGE_CONFIG_ADDED
"matterbridge_config_edited" -> return MATTERBRIDGE_CONFIG_EDITED "matterbridge_config_edited" -> MATTERBRIDGE_CONFIG_EDITED
"matterbridge_config_removed" -> return MATTERBRIDGE_CONFIG_REMOVED "matterbridge_config_removed" -> MATTERBRIDGE_CONFIG_REMOVED
"matterbridge_config_enabled" -> return MATTERBRIDGE_CONFIG_ENABLED "matterbridge_config_enabled" -> MATTERBRIDGE_CONFIG_ENABLED
"matterbridge_config_disabled" -> return MATTERBRIDGE_CONFIG_DISABLED "matterbridge_config_disabled" -> MATTERBRIDGE_CONFIG_DISABLED
"history_cleared" -> return CLEARED_CHAT "history_cleared" -> CLEARED_CHAT
"reaction" -> return REACTION "reaction" -> REACTION
"reaction_deleted" -> return REACTION_DELETED "reaction_deleted" -> REACTION_DELETED
"reaction_revoked" -> return REACTION_REVOKED "reaction_revoked" -> REACTION_REVOKED
else -> return DUMMY else -> DUMMY
} }
} }

1
app/src/main/java/com/nextcloud/talk/utils/DrawableUtils.kt
View File

@ -25,6 +25,7 @@ import java.util.HashMap
object DrawableUtils { object DrawableUtils {
@Suppress("Detekt.LongMethod")
fun getDrawableResourceIdForMimeType(mimetype: String?): Int { fun getDrawableResourceIdForMimeType(mimetype: String?): Int {
var localMimetype = mimetype var localMimetype = mimetype
val drawableMap = HashMap<String, Int>() val drawableMap = HashMap<String, Int>()