From d76203a0933bb0430f185a1508bda5925cf1336c Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Fri, 11 Feb 2022 12:49:29 +0100 Subject: [PATCH] remove api v1 variants for conversations canLeave and canDelete methods Signed-off-by: Marcel Hibbe --- .../controllers/ConversationInfoController.kt | 4 ++-- .../json/conversations/Conversation.java | 19 ++++--------------- .../ui/dialog/ConversationOperationDialog.kt | 2 +- 3 files changed, 7 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt index e1ffca885..65b7cd90b 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt +++ b/app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt @@ -598,13 +598,13 @@ class ConversationInfoController(args: Bundle) : setupWebinaryView() - if (!conversation!!.canLeave(conversationUser)) { + if (!conversation!!.canLeave()) { binding.leaveConversationAction.visibility = View.GONE } else { binding.leaveConversationAction.visibility = View.VISIBLE } - if (!conversation!!.canDelete(conversationUser)) { + if (!conversation!!.canDelete()) { binding.deleteConversationAction.visibility = View.GONE } else { binding.deleteConversationAction.visibility = View.VISIBLE diff --git a/app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.java b/app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.java index 880c37bd1..82e557b29 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.java +++ b/app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.java @@ -148,23 +148,12 @@ public class Conversation { return (canModerate(conversationUser) && !ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL.equals(type)); } - public boolean canLeave(UserEntity conversationUser) { - if (canLeaveConversation != null) { - // Available since APIv2 - return canLeaveConversation; - } - // Fallback for APIv1 - return !canModerate(conversationUser) || - (getType() != ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL && this.participants.size() > 1); + public boolean canLeave() { + return canLeaveConversation; } - public boolean canDelete(UserEntity conversationUser) { - if (canDeleteConversation != null) { - // Available since APIv2 - return canDeleteConversation; - } - // Fallback for APIv1 - return canModerate(conversationUser); + public boolean canDelete() { + return canDeleteConversation; } public String getRoomId() { diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/ConversationOperationDialog.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/ConversationOperationDialog.kt index 7495c2156..f41522f28 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/dialog/ConversationOperationDialog.kt +++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/ConversationOperationDialog.kt @@ -123,7 +123,7 @@ class ConversationOperationDialog( ) binding.conversationOperationLeave.visibility = setVisibleIf( - conversation.canLeave(currentUser) + conversation.canLeave() ) }