From a6a8dc76a80452c738d854329f9a7b208bdb0717 Mon Sep 17 00:00:00 2001 From: Erik Johansson Date: Mon, 28 May 2018 21:58:25 +0200 Subject: [PATCH] Block widget creation when no user exists Fix #276 --- .../openscale/gui/widget/WidgetConfigure.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/android_app/app/src/main/java/com/health/openscale/gui/widget/WidgetConfigure.java b/android_app/app/src/main/java/com/health/openscale/gui/widget/WidgetConfigure.java index 6019112b..539088d6 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/widget/WidgetConfigure.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/widget/WidgetConfigure.java @@ -67,16 +67,22 @@ public class WidgetConfigure extends BaseAppCompatActivity { users.add(scaleUser.getUserName()); userIds.add(scaleUser.getId()); } - ArrayAdapter userAdapter = new ArrayAdapter<>( - this, android.R.layout.simple_spinner_item, users); - userAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - userSpinner.setAdapter(userAdapter); // Hide user selector when there's only one user if (users.size() == 1) { TableRow row = (TableRow) userSpinner.getParent(); row.setVisibility(View.GONE); } + else if (users.isEmpty()) { + users.add(getResources().getString(R.string.info_no_selected_user)); + userIds.add(-1); + findViewById(R.id.widget_save).setEnabled(false); + } + + ArrayAdapter userAdapter = new ArrayAdapter<>( + this, android.R.layout.simple_spinner_item, users); + userAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); + userSpinner.setAdapter(userAdapter); // Set up measurement spinner final Spinner measurementSpinner = findViewById(R.id.widget_measurement_spinner);