From 066e0702d77da6e73a31ae7980b6be7336f89b89 Mon Sep 17 00:00:00 2001
From: AndyScherzinger <info@andy-scherzinger.de>
Date: Thu, 21 Jun 2018 15:47:21 +0200
Subject: [PATCH] dynamic bottom sheet header for room config

---
 .../controllers/bottomsheet/CallMenuController.java | 13 ++++++++++++-
 app/src/main/res/values/strings.xml                 |  1 +
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/CallMenuController.java b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/CallMenuController.java
index f7cdb129f..20cb280ed 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/CallMenuController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/CallMenuController.java
@@ -123,7 +123,18 @@ public class CallMenuController extends BaseController implements FlexibleAdapte
         menuItems = new ArrayList<>();
 
         if (menuType.equals(MenuType.REGULAR)) {
-            menuItems.add(new MenuItem(getResources().getString(R.string.nc_configure_room), 0, null));
+            if (room.displayName != null && room.displayName.length()>0) {
+                menuItems.add(new MenuItem(
+                        getResources().getString(
+                                R.string.nc_configure_named_room, room.displayName), 0, null)
+                );
+            } else if (room.name != null && room.name.length()>0) {
+                menuItems.add(new MenuItem(getResources().getString(
+                        R.string.nc_configure_named_room, room.name), 0, null)
+                );
+            } else {
+                menuItems.add(new MenuItem(getResources().getString(R.string.nc_configure_room), 0, null));
+            }
 
             if (room.isNameEditable()) {
                 menuItems.add(new MenuItem(getResources().getString(R.string.nc_rename), 2, getResources().getDrawable(R.drawable
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index aebea1154..900320dad 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -85,6 +85,7 @@
     <!-- Room menu -->
     <string name="nc_start_conversation">Start a conversation</string>
     <string name="nc_configure_room">Configure room</string>
+    <string name="nc_configure_named_room">Configure room %1$s</string>
     <string name="nc_leave">Leave conversation</string>
     <string name="nc_rename">Rename conversation</string>
     <string name="nc_set_password">Set a password</string>