From 249e1a2a9a3877a8841c504e9e6e5b4c12c9759d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Kr=C3=BCger?= Date: Fri, 8 Oct 2021 13:18:39 +0200 Subject: [PATCH] Remove unnecessary type casts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Tim Krüger --- .../nextcloud/talk/controllers/ChatController.kt | 14 ++++++-------- .../java/com/nextcloud/talk/utils/AccountUtils.kt | 2 +- 2 files changed, 7 insertions(+), 9 deletions(-) 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 4b386cb81..7569f76f3 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt +++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt @@ -2316,17 +2316,15 @@ class ChatController(args: Bundle) : } inflate(R.menu.chat_message_menu) menu.findItem(R.id.action_copy_message).isVisible = !(message as ChatMessage).isDeleted - menu.findItem(R.id.action_reply_to_message).isVisible = (message as ChatMessage).replyable - menu.findItem(R.id.action_reply_privately).isVisible = (message as ChatMessage).replyable && + menu.findItem(R.id.action_reply_to_message).isVisible = message.replyable + menu.findItem(R.id.action_reply_privately).isVisible = message.replyable && conversationUser?.userId?.isNotEmpty() == true && conversationUser.userId != "?" && - (message as ChatMessage).user.id.startsWith("users/") && - (message as ChatMessage).user.id.substring(6) != currentConversation?.actorId && + message.user.id.startsWith("users/") && + message.user.id.substring(6) != currentConversation?.actorId && currentConversation?.type != Conversation.ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL menu.findItem(R.id.action_delete_message).isVisible = isShowMessageDeletionButton(message) - menu.findItem(R.id.action_forward_message).isVisible = ChatMessage.MessageType.REGULAR_TEXT_MESSAGE.equals( - (message as ChatMessage) - .getMessageType() - ) + menu.findItem(R.id.action_forward_message).isVisible = + ChatMessage.MessageType.REGULAR_TEXT_MESSAGE == message.getMessageType() if (menu.hasVisibleItems()) { if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) { setForceShowIcon(true) diff --git a/app/src/main/java/com/nextcloud/talk/utils/AccountUtils.kt b/app/src/main/java/com/nextcloud/talk/utils/AccountUtils.kt index 8f3a3c5c2..d6cbd1c68 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/AccountUtils.kt +++ b/app/src/main/java/com/nextcloud/talk/utils/AccountUtils.kt @@ -37,7 +37,7 @@ import java.util.Arrays object AccountUtils { - private val TAG = "AccountUtils" + private const val TAG = "AccountUtils" fun findAccounts(userEntitiesList: List): List { val context = NextcloudTalkApplication.sharedApplication!!.applicationContext