From 8acee57118433960a3f966c844cd6e4265dbcd4d Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Thu, 11 Jun 2020 22:01:04 +0200
Subject: [PATCH] Implement my suggestions

---
 .../src/main/res/values/strings.xml           |  2 +-
 .../RoomMemberProfileController.kt            | 44 ++++++++++---------
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/matrix-sdk-android/src/main/res/values/strings.xml b/matrix-sdk-android/src/main/res/values/strings.xml
index 12b9e726e4..3cd7674253 100644
--- a/matrix-sdk-android/src/main/res/values/strings.xml
+++ b/matrix-sdk-android/src/main/res/values/strings.xml
@@ -97,7 +97,7 @@
 
     <!-- parameter will be a comma separated list of values of notice_power_level_diff -->
     <string name="notice_power_level_changed_by_you">You changed the power level of %1$s.</string>
-    <!-- parameter will be a comma separated list of values of notice_power_level_diff -->
+    <!-- First parameter will be a userId or display name, second one will be a comma separated list of values of notice_power_level_diff -->
     <string name="notice_power_level_changed">%1$s changed the power level of %2$s.</string>
     <!-- First parameter will be a userId or display name, the two last ones will be value of power_level_* -->
     <string name="notice_power_level_diff">%1$s from %2$s to %3$s</string>
diff --git a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/RoomMemberProfileController.kt b/vector/src/main/java/im/vector/riotx/features/roommemberprofile/RoomMemberProfileController.kt
index b70be02d63..1ad72ad424 100644
--- a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/RoomMemberProfileController.kt
+++ b/vector/src/main/java/im/vector/riotx/features/roommemberprofile/RoomMemberProfileController.kt
@@ -245,26 +245,30 @@ class RoomMemberProfileController @Inject constructor(
         }
 
         if (canKick) {
-            if (membership == Membership.JOIN) {
-                buildProfileAction(
-                        id = "kick",
-                        editable = false,
-                        divider = canBan,
-                        destructive = true,
-                        title = stringProvider.getString(R.string.room_participants_action_kick),
-                        dividerColor = dividerColor,
-                        action = { callback?.onKickClicked() }
-                )
-            } else if (membership == Membership.INVITE) {
-                buildProfileAction(
-                        id = "cancel_invite",
-                        title = stringProvider.getString(R.string.room_participants_action_cancel_invite),
-                        divider = canBan,
-                        dividerColor = dividerColor,
-                        destructive = true,
-                        editable = false,
-                        action = { callback?.onCancelInviteClicked() }
-                )
+            when (membership) {
+                Membership.JOIN   -> {
+                    buildProfileAction(
+                            id = "kick",
+                            editable = false,
+                            divider = canBan,
+                            destructive = true,
+                            title = stringProvider.getString(R.string.room_participants_action_kick),
+                            dividerColor = dividerColor,
+                            action = { callback?.onKickClicked() }
+                    )
+                }
+                Membership.INVITE -> {
+                    buildProfileAction(
+                            id = "cancel_invite",
+                            title = stringProvider.getString(R.string.room_participants_action_cancel_invite),
+                            divider = canBan,
+                            dividerColor = dividerColor,
+                            destructive = true,
+                            editable = false,
+                            action = { callback?.onCancelInviteClicked() }
+                    )
+                }
+                else              -> Unit
             }
         }
         if (canBan) {