Browse Source

solve detekt issues

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
Andy Scherzinger 3 years ago
parent
commit
142c362474

+ 21 - 1
app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/ConversationOperationEnum.kt

@@ -1,3 +1,23 @@
+/*
+ * Nextcloud Talk application
+ *
+ * @author Marcel Hibbe
+ * Copyright (C) 2022 Marcel Hibbe <dev@mhibbe.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package com.nextcloud.talk.controllers.bottomsheet
 package com.nextcloud.talk.controllers.bottomsheet
 
 
 enum class ConversationOperationEnum {
 enum class ConversationOperationEnum {
@@ -14,4 +34,4 @@ enum class ConversationOperationEnum {
     REMOVE_FAVORITE,
     REMOVE_FAVORITE,
     ADD_FAVORITE,
     ADD_FAVORITE,
     JOIN_ROOM
     JOIN_ROOM
-}
+}

+ 2 - 2
app/src/main/java/com/nextcloud/talk/ui/dialog/ConversationsListBottomDialog.kt

@@ -128,10 +128,10 @@ class ConversationsListBottomDialog(
         )
         )
 
 
         binding.conversationOperationLeave.visibility = setVisibleIf(
         binding.conversationOperationLeave.visibility = setVisibleIf(
-            conversation.canLeave()
+            conversation.canLeave() &&
                 // leaving is by api not possible for the last user with moderator permissions.
                 // leaving is by api not possible for the last user with moderator permissions.
                 // for now, hide this option for all moderators.
                 // for now, hide this option for all moderators.
-                && !conversation.canModerate(currentUser)
+                !conversation.canModerate(currentUser)
         )
         )
     }
     }