Răsfoiți Sursa

extract checks to separate methods

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
Andy Scherzinger 3 ani în urmă
părinte
comite
5a76f3a3d3

+ 11 - 4
app/src/main/java/com/nextcloud/talk/ui/dialog/MessageActionsDialog.kt

@@ -76,10 +76,8 @@ class MessageActionsDialog(
         initMenuReplyToMessage(message.replyable)
         initMenuReplyToMessage(message.replyable)
         initMenuReplyPrivately(
         initMenuReplyPrivately(
             message.replyable &&
             message.replyable &&
-                user?.userId?.isNotEmpty() == true &&
-                user?.userId != "?" &&
-                message.user.id.startsWith("users/") &&
-                message.user.id.substring(ACTOR_LENGTH) != currentConversation?.actorId &&
+                hasUserId(user) &&
+                hasUserActorId(message) &&
                 currentConversation?.type != Conversation.ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL
                 currentConversation?.type != Conversation.ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL
         )
         )
         initMenuDeleteMessage(showMessageDeletionButton)
         initMenuDeleteMessage(showMessageDeletionButton)
@@ -101,6 +99,15 @@ class MessageActionsDialog(
         behavior.state = BottomSheetBehavior.STATE_EXPANDED
         behavior.state = BottomSheetBehavior.STATE_EXPANDED
     }
     }
 
 
+    private fun hasUserId(user: UserEntity?): Boolean {
+        return user?.userId?.isNotEmpty() == true && user?.userId != "?"
+    }
+
+    private fun hasUserActorId(message: ChatMessage): Boolean {
+        return message.user.id.startsWith("users/") &&
+            message.user.id.substring(ACTOR_LENGTH) != currentConversation?.actorId
+    }
+
     @SuppressLint("ClickableViewAccessibility")
     @SuppressLint("ClickableViewAccessibility")
     private fun initEmojiMore() {
     private fun initEmojiMore() {
         dialogMessageActionsBinding.emojiMore.setOnTouchListener { v, event ->
         dialogMessageActionsBinding.emojiMore.setOnTouchListener { v, event ->