From 60b277637bed438b18007a22e4f55227a25af980 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Sun, 3 Apr 2022 11:44:35 +0200 Subject: [PATCH] improve detekt score Signed-off-by: Andy Scherzinger --- .../adapters/messages/MagicIncomingTextMessageViewHolder.kt | 3 ++- .../com/nextcloud/talk/adapters/messages/ReactionsInterface.kt | 2 +- .../main/java/com/nextcloud/talk/controllers/ChatController.kt | 1 - .../com/nextcloud/talk/controllers/WebViewLoginController.kt | 1 + .../java/com/nextcloud/talk/ui/dialog/MessageActionsDialog.kt | 3 +-- .../java/com/nextcloud/talk/ui/dialog/ShowReactionsDialog.kt | 3 +-- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.kt index 44d17ab6b..116629e88 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.kt @@ -142,7 +142,7 @@ class MagicIncomingTextMessageViewHolder(itemView: View, payload: Any) : Message ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT ) - params.setMargins(0, 0, 10, 0) + params.setMargins(0, 0, EMOJI_RIGHT_MARGIN, 0) reactionAmount.layoutParams = params binding.reactionsEmojiWrapper.addView(reactionEmoji) @@ -308,5 +308,6 @@ class MagicIncomingTextMessageViewHolder(itemView: View, payload: Any) : Message companion object { const val TEXT_SIZE_MULTIPLIER = 2.5 const val MAX_EMOJIS_TO_DISPLAY = 4 + const val EMOJI_RIGHT_MARGIN: Int = 10 } } diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/ReactionsInterface.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/ReactionsInterface.kt index 89c9625c4..e789a3af8 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/ReactionsInterface.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/ReactionsInterface.kt @@ -4,4 +4,4 @@ import com.nextcloud.talk.models.json.chat.ChatMessage interface ReactionsInterface { fun onClickReactions(message: ChatMessage) -} \ No newline at end of file +} diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt index 692af7567..9fffc106e 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt +++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt @@ -2432,7 +2432,6 @@ class ChatController(args: Bundle) : if (hasVisibleItems(message as ChatMessage)) { activity?.let { MessageActionsDialog( - activity!!, this, message, conversationUser?.userId, diff --git a/app/src/main/java/com/nextcloud/talk/controllers/WebViewLoginController.kt b/app/src/main/java/com/nextcloud/talk/controllers/WebViewLoginController.kt index 70869d0f3..1cc875873 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/WebViewLoginController.kt +++ b/app/src/main/java/com/nextcloud/talk/controllers/WebViewLoginController.kt @@ -277,6 +277,7 @@ class WebViewLoginController(args: Bundle? = null) : NewBaseController( } } + @Suppress("Detekt.TooGenericExceptionCaught") override fun onReceivedSslError(view: WebView, handler: SslErrorHandler, error: SslError) { try { val sslCertificate = error.certificate diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/MessageActionsDialog.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/MessageActionsDialog.kt index 46df84303..821072b49 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/dialog/MessageActionsDialog.kt +++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/MessageActionsDialog.kt @@ -34,13 +34,12 @@ import com.nextcloud.talk.models.json.chat.ChatMessage import com.nextcloud.talk.models.json.conversations.Conversation class MessageActionsDialog( - val activity: Activity, private val chatController: ChatController, private val message: ChatMessage, private val userId: String?, private val currentConversation: Conversation?, private val showMessageDeletionButton: Boolean -) : BottomSheetDialog(activity) { +) : BottomSheetDialog(chatController.activity!!) { private lateinit var dialogMessageActionsBinding: DialogMessageActionsBinding diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/ShowReactionsDialog.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/ShowReactionsDialog.kt index 1bdfb041a..b48b579cb 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/dialog/ShowReactionsDialog.kt +++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/ShowReactionsDialog.kt @@ -19,5 +19,4 @@ class ShowReactionsDialog( setContentView(dialogMessageReactionsBinding.root) window?.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT) } - -} \ No newline at end of file +}