gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 03:59:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary type casts

Browse Source 
Signed-off-by: Tim Krüger <t@timkrueger.me>
This commit is contained in:
Tim Krüger 2021-10-08 13:18:39 +02:00
parent edf5260d35
commit 249e1a2a9a
No known key found for this signature in database
GPG Key ID: FECE3A7222C52A4E
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2316,17 +2316,15 @@ class ChatController(args: Bundle) :
} }
inflate(R.menu.chat_message_menu) inflate(R.menu.chat_message_menu)
menu.findItem(R.id.action_copy_message).isVisible = !(message as ChatMessage).isDeleted 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_to_message).isVisible = message.replyable
menu.findItem(R.id.action_reply_privately).isVisible = (message as ChatMessage).replyable && menu.findItem(R.id.action_reply_privately).isVisible = message.replyable &&
conversationUser?.userId?.isNotEmpty() == true && conversationUser.userId != "?" && conversationUser?.userId?.isNotEmpty() == true && conversationUser.userId != "?" &&
(message as ChatMessage).user.id.startsWith("users/") && message.user.id.startsWith("users/") &&
(message as ChatMessage).user.id.substring(6) != currentConversation?.actorId && message.user.id.substring(6) != currentConversation?.actorId &&
currentConversation?.type != Conversation.ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL 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_delete_message).isVisible = isShowMessageDeletionButton(message)
menu.findItem(R.id.action_forward_message).isVisible = ChatMessage.MessageType.REGULAR_TEXT_MESSAGE.equals( menu.findItem(R.id.action_forward_message).isVisible =
(message as ChatMessage) ChatMessage.MessageType.REGULAR_TEXT_MESSAGE == message.getMessageType()
.getMessageType()
)
if (menu.hasVisibleItems()) { if (menu.hasVisibleItems()) {
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) { if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) {
setForceShowIcon(true) setForceShowIcon(true)

2
app/src/main/java/com/nextcloud/talk/utils/AccountUtils.kt
View File

@ -37,7 +37,7 @@ import java.util.Arrays
object AccountUtils { object AccountUtils {
private val TAG = "AccountUtils" private const val TAG = "AccountUtils"
fun findAccounts(userEntitiesList: List<UserEntity>): List<Account> { fun findAccounts(userEntitiesList: List<UserEntity>): List<Account> {
val context = NextcloudTalkApplication.sharedApplication!!.applicationContext val context = NextcloudTalkApplication.sharedApplication!!.applicationContext