gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-19 19:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update conflicts

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-07-13 15:39:29 +02:00
parent 4031412f85
commit 493ec6ebd6
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/CallMenuController.java
View File

@ -125,18 +125,9 @@ public class CallMenuController extends BaseController implements FlexibleAdapte
if (menuType.equals(MenuType.REGULAR)) { if (menuType.equals(MenuType.REGULAR)) {
if (!TextUtils.isEmpty(room.getDisplayName())) { if (!TextUtils.isEmpty(room.getDisplayName())) {
<<<<<<< Updated upstream
menuItems.add(new MenuItem(
getResources().getString(
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));
=======
menuItems.add(new MenuItem(room.getDisplayName(), 0, null)); menuItems.add(new MenuItem(room.getDisplayName(), 0, null));
} else if (!TextUtils.isEmpty(room.getName())) { } else if (!TextUtils.isEmpty(room.getName())) {
menuItems.add(new MenuItem(room.getName(), 0, null)); menuItems.add(new MenuItem(room.getName(), 0, null));
>>>>>>> Stashed changes
} else { } else {
menuItems.add(new MenuItem(getResources().getString(R.string.nc_configure_room), 0, null)); menuItems.add(new MenuItem(getResources().getString(R.string.nc_configure_room), 0, null));
} }