gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-10 14:24:05 +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-04-03 11:44:35 +02:00 committed by Marcel Hibbe
parent b06927726c
commit 60b277637b
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
6 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.kt
View File

@ -142,7 +142,7 @@ class MagicIncomingTextMessageViewHolder(itemView: View, payload: Any) : Message
ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT,
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 reactionAmount.layoutParams = params
binding.reactionsEmojiWrapper.addView(reactionEmoji) binding.reactionsEmojiWrapper.addView(reactionEmoji)
@ -308,5 +308,6 @@ class MagicIncomingTextMessageViewHolder(itemView: View, payload: Any) : Message
companion object { companion object {
const val TEXT_SIZE_MULTIPLIER = 2.5 const val TEXT_SIZE_MULTIPLIER = 2.5
const val MAX_EMOJIS_TO_DISPLAY = 4 const val MAX_EMOJIS_TO_DISPLAY = 4
const val EMOJI_RIGHT_MARGIN: Int = 10
} }
} }

2
app/src/main/java/com/nextcloud/talk/adapters/messages/ReactionsInterface.kt
View File

@ -4,4 +4,4 @@ import com.nextcloud.talk.models.json.chat.ChatMessage
interface ReactionsInterface { interface ReactionsInterface {
fun onClickReactions(message: ChatMessage) fun onClickReactions(message: ChatMessage)
} }

1
app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
View File

@ -2432,7 +2432,6 @@ class ChatController(args: Bundle) :
if (hasVisibleItems(message as ChatMessage)) { if (hasVisibleItems(message as ChatMessage)) {
activity?.let { activity?.let {
MessageActionsDialog( MessageActionsDialog(
activity!!,
this, this,
message, message,
conversationUser?.userId, conversationUser?.userId,

1
app/src/main/java/com/nextcloud/talk/controllers/WebViewLoginController.kt
View File

@ -277,6 +277,7 @@ class WebViewLoginController(args: Bundle? = null) : NewBaseController(
} }
} }
@Suppress("Detekt.TooGenericExceptionCaught")
override fun onReceivedSslError(view: WebView, handler: SslErrorHandler, error: SslError) { override fun onReceivedSslError(view: WebView, handler: SslErrorHandler, error: SslError) {
try { try {
val sslCertificate = error.certificate val sslCertificate = error.certificate

3
app/src/main/java/com/nextcloud/talk/ui/dialog/MessageActionsDialog.kt
View File

@ -34,13 +34,12 @@ import com.nextcloud.talk.models.json.chat.ChatMessage
import com.nextcloud.talk.models.json.conversations.Conversation import com.nextcloud.talk.models.json.conversations.Conversation
class MessageActionsDialog( class MessageActionsDialog(
val activity: Activity,
private val chatController: ChatController, private val chatController: ChatController,
private val message: ChatMessage, private val message: ChatMessage,
private val userId: String?, private val userId: String?,
private val currentConversation: Conversation?, private val currentConversation: Conversation?,
private val showMessageDeletionButton: Boolean private val showMessageDeletionButton: Boolean
) : BottomSheetDialog(activity) { ) : BottomSheetDialog(chatController.activity!!) {
private lateinit var dialogMessageActionsBinding: DialogMessageActionsBinding private lateinit var dialogMessageActionsBinding: DialogMessageActionsBinding

3
app/src/main/java/com/nextcloud/talk/ui/dialog/ShowReactionsDialog.kt
View File

@ -19,5 +19,4 @@ class ShowReactionsDialog(
setContentView(dialogMessageReactionsBinding.root) setContentView(dialogMessageReactionsBinding.root)
window?.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT) window?.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
} }
}
}