From 476f721f5eaac9f9ecb10108a6486189fc114e96 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 26 Nov 2020 22:43:51 +0100
Subject: [PATCH] Cleanup

---
 .../historyvisibility/RoomHistoryVisibilityAction.kt     | 5 ++---
 .../historyvisibility/RoomHistoryVisibilityController.kt | 3 +--
 .../roomprofile/settings/joinrule/RoomJoinRuleAction.kt  | 5 ++---
 .../settings/joinrule/RoomJoinRuleController.kt          | 9 +++------
 4 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/historyvisibility/RoomHistoryVisibilityAction.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/historyvisibility/RoomHistoryVisibilityAction.kt
index f37964ae23..3c989a7dbe 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/historyvisibility/RoomHistoryVisibilityAction.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/historyvisibility/RoomHistoryVisibilityAction.kt
@@ -24,11 +24,10 @@ class RoomHistoryVisibilityAction(
         val roomHistoryVisibility: RoomHistoryVisibility,
         title: String,
         @DrawableRes iconResId: Int,
-        isSelected: Boolean,
-        destructive: Boolean
+        isSelected: Boolean
 ) : BottomSheetGenericAction(
         title = title,
         iconResId = iconResId,
         isSelected = isSelected,
-        destructive = destructive
+        destructive = false
 )
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/historyvisibility/RoomHistoryVisibilityController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/historyvisibility/RoomHistoryVisibilityController.kt
index 9c9abc03a1..6727b0580c 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/historyvisibility/RoomHistoryVisibilityController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/historyvisibility/RoomHistoryVisibilityController.kt
@@ -37,8 +37,7 @@ class RoomHistoryVisibilityController @Inject constructor(
                             roomHistoryVisibility = roomHistoryVisibility,
                             title = historyVisibilityFormatter.getSetting(roomHistoryVisibility),
                             iconResId = 0,
-                            isSelected = roomHistoryVisibility == state.currentRoomHistoryVisibility,
-                            destructive = false
+                            isSelected = roomHistoryVisibility == state.currentRoomHistoryVisibility
                     )
                 }
     }
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleAction.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleAction.kt
index 1c9018d9d1..6f71669002 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleAction.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleAction.kt
@@ -26,11 +26,10 @@ class RoomJoinRuleAction(
         val roomGuestAccess: GuestAccess?,
         title: String,
         @DrawableRes iconResId: Int,
-        isSelected: Boolean,
-        destructive: Boolean
+        isSelected: Boolean
 ) : BottomSheetGenericAction(
         title = title,
         iconResId = iconResId,
         isSelected = isSelected,
-        destructive = destructive
+        destructive = false
 )
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleController.kt
index 6fd481c91f..1829707dae 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleController.kt
@@ -34,24 +34,21 @@ class RoomJoinRuleController @Inject constructor(
                         roomGuestAccess = null,
                         title = stringProvider.getString(R.string.room_settings_room_access_entry_only_invited),
                         iconResId = 0,
-                        isSelected = state.currentRoomJoinRule == RoomJoinRules.INVITE,
-                        destructive = false
+                        isSelected = state.currentRoomJoinRule == RoomJoinRules.INVITE
                 ),
                 RoomJoinRuleAction(
                         roomJoinRule = RoomJoinRules.PUBLIC,
                         roomGuestAccess = GuestAccess.Forbidden,
                         title = stringProvider.getString(R.string.room_settings_room_access_entry_anyone_with_link_apart_guest),
                         iconResId = 0,
-                        isSelected = state.currentRoomJoinRule == RoomJoinRules.PUBLIC && state.currentGuestAccess == GuestAccess.Forbidden,
-                        destructive = false
+                        isSelected = state.currentRoomJoinRule == RoomJoinRules.PUBLIC && state.currentGuestAccess == GuestAccess.Forbidden
                 ),
                 RoomJoinRuleAction(
                         roomJoinRule = RoomJoinRules.PUBLIC,
                         roomGuestAccess = GuestAccess.CanJoin,
                         title = stringProvider.getString(R.string.room_settings_room_access_entry_anyone_with_link_including_guest),
                         iconResId = 0,
-                        isSelected = state.currentRoomJoinRule == RoomJoinRules.PUBLIC && state.currentGuestAccess == GuestAccess.CanJoin,
-                        destructive = false
+                        isSelected = state.currentRoomJoinRule == RoomJoinRules.PUBLIC && state.currentGuestAccess == GuestAccess.CanJoin
                 )
         )
     }