Просмотр исходного кода

Fix #229

Signed-off-by: Mario Danic <mario@lovelyhq.com>
Mario Danic 6 лет назад
Родитель
Сommit
1dc0ac8133

+ 2 - 4
app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/CallMenuController.java

@@ -127,12 +127,10 @@ public class CallMenuController extends BaseController implements FlexibleAdapte
             if (!TextUtils.isEmpty(room.getDisplayName())) {
                 menuItems.add(new MenuItem(
                         getResources().getString(
-                                R.string.nc_configure_named_room, room.getDisplayName()), 0, null)
-                );
+                                R.string.nc_configure_named_room, room.getDisplayName()), 0, null));
             } else if (!TextUtils.isEmpty(room.getName())) {
                 menuItems.add(new MenuItem(getResources().getString(
-                        R.string.nc_configure_named_room, room.getName()), 0, null)
-                );
+                        R.string.nc_configure_named_room, room.getName()), 0, null));
             } else {
                 menuItems.add(new MenuItem(getResources().getString(R.string.nc_configure_room), 0, null));
             }

+ 4 - 0
app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/EntryMenuController.java

@@ -184,6 +184,10 @@ public class EntryMenuController extends BaseController {
         super.onViewBound(view);
         NextcloudTalkApplication.getSharedApplication().getComponentApplication().inject(this);
 
+        if (room != null && operationCode == 2) {
+            editText.setText(room.getName());
+        }
+
         editText.setOnEditorActionListener((v, actionId, event) -> {
             if (actionId == EditorInfo.IME_ACTION_DONE && proceedButton != null && proceedButton.isEnabled()) {
                 proceedButton.callOnClick();