From 1a63b355a88f319fc967d6e5aadd5e5a057287f5 Mon Sep 17 00:00:00 2001 From: AndyScherzinger Date: Thu, 21 Jun 2018 15:41:53 +0200 Subject: [PATCH 1/6] update android gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index d071e2c3e..4dbf173ae 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.2' + classpath 'com.android.tools.build:gradle:3.1.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}" // NOTE: Do not place your application dependencies here; they belong From 066e0702d77da6e73a31ae7980b6be7336f89b89 Mon Sep 17 00:00:00 2001 From: AndyScherzinger Date: Thu, 21 Jun 2018 15:47:21 +0200 Subject: [PATCH 2/6] 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 @@ Start a conversation Configure room + Configure room %1$s Leave conversation Rename conversation Set a password From 2e519e6e211a4b1df05035d3e15d3f42170963a8 Mon Sep 17 00:00:00 2001 From: AndyScherzinger Date: Thu, 21 Jun 2018 15:49:12 +0200 Subject: [PATCH 3/6] room->conversation --- app/src/main/res/values/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 900320dad..75af892ac 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -84,8 +84,8 @@ Start a conversation - Configure room - Configure room %1$s + Configure conversation + Configure conversation %1$s Leave conversation Rename conversation Set a password From 2f3c2c0f17b39110e3187d8e70e2924eab89189e Mon Sep 17 00:00:00 2001 From: AndyScherzinger Date: Thu, 21 Jun 2018 16:20:47 +0200 Subject: [PATCH 4/6] use TextUtils for null/empty checks --- .../talk/controllers/bottomsheet/CallMenuController.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 20cb280ed..f7baf0ccd 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 @@ -26,6 +26,7 @@ import android.os.Bundle; import android.support.annotation.NonNull; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -123,12 +124,12 @@ public class CallMenuController extends BaseController implements FlexibleAdapte menuItems = new ArrayList<>(); if (menuType.equals(MenuType.REGULAR)) { - if (room.displayName != null && room.displayName.length()>0) { + if (!TextUtils.isEmpty(room.displayName)) { 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) { + } else if (!TextUtils.isEmpty(room.name)) { menuItems.add(new MenuItem(getResources().getString( R.string.nc_configure_named_room, room.name), 0, null) ); From 1cbe3c0d041aff39f59888c7721da154b18c8fd1 Mon Sep 17 00:00:00 2001 From: AndyScherzinger Date: Thu, 21 Jun 2018 20:28:03 +0200 Subject: [PATCH 5/6] use getters --- .../talk/controllers/bottomsheet/CallMenuController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 f7baf0ccd..8dc18dde9 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 @@ -124,14 +124,14 @@ public class CallMenuController extends BaseController implements FlexibleAdapte menuItems = new ArrayList<>(); if (menuType.equals(MenuType.REGULAR)) { - if (!TextUtils.isEmpty(room.displayName)) { + if (!TextUtils.isEmpty(room.getDisplayName())) { menuItems.add(new MenuItem( getResources().getString( - R.string.nc_configure_named_room, room.displayName), 0, null) + R.string.nc_configure_named_room, getDisplayName()), 0, null) ); - } else if (!TextUtils.isEmpty(room.name)) { + } else if (!TextUtils.isEmpty(room.getName())) { menuItems.add(new MenuItem(getResources().getString( - R.string.nc_configure_named_room, room.name), 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)); From 0709ce1270faf56d89f5b95cd3f2a037175d2273 Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Thu, 21 Jun 2018 21:55:41 +0200 Subject: [PATCH 6/6] Fix a missing instance for method Signed-off-by: Mario Danic --- .../talk/controllers/bottomsheet/CallMenuController.java | 2 +- 1 file changed, 1 insertion(+), 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 8dc18dde9..20dc25865 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 @@ -127,7 +127,7 @@ public class CallMenuController extends BaseController implements FlexibleAdapte if (!TextUtils.isEmpty(room.getDisplayName())) { menuItems.add(new MenuItem( getResources().getString( - R.string.nc_configure_named_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(