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

use "return when" in isShowMessageDeletionButton()

Browse Source 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2022-05-12 14:44:33 +02:00
parent 681dbfa025
commit 729e30d25b
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2849,31 +2849,27 @@ class ChatController(args: Bundle) :
private fun isShowMessageDeletionButton(message: ChatMessage): Boolean { private fun isShowMessageDeletionButton(message: ChatMessage): Boolean {
if (conversationUser == null) return false if (conversationUser == null) return false
if (message.systemMessageType != ChatMessage.SystemMessageType.DUMMY) return false
if (message.isDeleted) return false
if (message.hasFileAttachment()) return false
if (OBJECT_MESSAGE.equals(message.message)) return false
val isOlderThanSixHours = message
.createdAt
?.before(Date(System.currentTimeMillis() - AGE_THREHOLD_FOR_DELETE_MESSAGE)) == true
if (isOlderThanSixHours) return false
val isUserAllowedByPrivileges = if (message.actorId == conversationUser.userId) { val isUserAllowedByPrivileges = if (message.actorId == conversationUser.userId) {
true true
} else { } else {
currentConversation!!.canModerate(conversationUser) currentConversation!!.canModerate(conversationUser)
} }
if (!isUserAllowedByPrivileges) return false
if (!CapabilitiesUtil.hasSpreedFeatureCapability(conversationUser, "delete-messages")) return false val isOlderThanSixHours = message
.createdAt
?.before(Date(System.currentTimeMillis() - AGE_THREHOLD_FOR_DELETE_MESSAGE)) == true
if (!hasChatPermission) return false return when {
!isUserAllowedByPrivileges -> false
return true isOlderThanSixHours -> false
message.systemMessageType != ChatMessage.SystemMessageType.DUMMY -> false
message.isDeleted -> false
message.hasFileAttachment() -> false
OBJECT_MESSAGE == message.message -> false
!CapabilitiesUtil.hasSpreedFeatureCapability(conversationUser, "delete-messages") -> false
!hasChatPermission -> false
else -> true
}
} }
override fun hasContentFor(message: ChatMessage, type: Byte): Boolean { override fun hasContentFor(message: ChatMessage, type: Byte): Boolean {