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

remove api v1 variants for conversations canLeave and canDelete methods

Browse Source 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2022-02-11 12:49:29 +01:00
parent aedede9ffd
commit d76203a093
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
3 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt
View File

@ -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

15
app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.java
View File

@ -148,24 +148,13 @@ 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) { public boolean canLeave() {
if (canLeaveConversation != null) {
// Available since APIv2
return canLeaveConversation; return canLeaveConversation;
} }
// Fallback for APIv1
return !canModerate(conversationUser) ||
(getType() != ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL && this.participants.size() > 1);
}
public boolean canDelete(UserEntity conversationUser) { public boolean canDelete() {
if (canDeleteConversation != null) {
// Available since APIv2
return canDeleteConversation; return canDeleteConversation;
} }
// Fallback for APIv1
return canModerate(conversationUser);
}
public String getRoomId() { public String getRoomId() {
return this.roomId; return this.roomId;

2
app/src/main/java/com/nextcloud/talk/ui/dialog/ConversationOperationDialog.kt
View File

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