Parcourir la source

remove api v1 variants for conversations canLeave and canDelete methods

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
Marcel Hibbe il y a 3 ans
Parent
commit
d76203a093

+ 2 - 2
app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt

@@ -598,13 +598,13 @@ class ConversationInfoController(args: Bundle) :
 
 
                             setupWebinaryView()
                             setupWebinaryView()
 
 
-                            if (!conversation!!.canLeave(conversationUser)) {
+                            if (!conversation!!.canLeave()) {
                                 binding.leaveConversationAction.visibility = View.GONE
                                 binding.leaveConversationAction.visibility = View.GONE
                             } else {
                             } else {
                                 binding.leaveConversationAction.visibility = View.VISIBLE
                                 binding.leaveConversationAction.visibility = View.VISIBLE
                             }
                             }
 
 
-                            if (!conversation!!.canDelete(conversationUser)) {
+                            if (!conversation!!.canDelete()) {
                                 binding.deleteConversationAction.visibility = View.GONE
                                 binding.deleteConversationAction.visibility = View.GONE
                             } else {
                             } else {
                                 binding.deleteConversationAction.visibility = View.VISIBLE
                                 binding.deleteConversationAction.visibility = View.VISIBLE

+ 4 - 15
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));
         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() {
     public String getRoomId() {

+ 1 - 1
app/src/main/java/com/nextcloud/talk/ui/dialog/ConversationOperationDialog.kt

@@ -123,7 +123,7 @@ class ConversationOperationDialog(
         )
         )
 
 
         binding.conversationOperationLeave.visibility = setVisibleIf(
         binding.conversationOperationLeave.visibility = setVisibleIf(
-            conversation.canLeave(currentUser)
+            conversation.canLeave()
         )
         )
     }
     }