From 0d8d03d459dc9a16a151f4a752645353b7de7be1 Mon Sep 17 00:00:00 2001
From: Erik Johansson <erik@ejohansson.se>
Date: Thu, 15 Feb 2018 09:26:47 +0100
Subject: [PATCH] Don't start data entry activity if no user is selected

Also, don't allow search for bluetooth scale if no user is selected.

Fixes #192 and potentially also #158.
---
 .../health/openscale/gui/MainActivity.java    | 20 ++++++++++++++++++-
 .../gui/activities/DataEntryActivity.java     |  5 -----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java b/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java
index c53dd7ce..cfa9a0e4 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java
@@ -323,10 +323,18 @@ public class MainActivity extends AppCompatActivity {
         drawerLayout.closeDrawers();
     }
 
+    private void showNoSelectedUserDialog() {
+        AlertDialog.Builder infoDialog = new AlertDialog.Builder(this);
+
+        infoDialog.setMessage(getResources().getString(R.string.info_no_selected_user));
+        infoDialog.setPositiveButton(getResources().getString(R.string.label_ok), null);
+        infoDialog.show();
+    }
+
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
 
-        if(drawerToggle.onOptionsItemSelected(item)){
+        if (drawerToggle.onOptionsItemSelected(item)) {
             return true;
         }
 
@@ -335,6 +343,11 @@ public class MainActivity extends AppCompatActivity {
                 drawerLayout.openDrawer(GravityCompat.START);
                 return true;
             case R.id.action_add_measurement:
+                if (OpenScale.getInstance(getApplicationContext()).getSelectedScaleUserId() == -1) {
+                    showNoSelectedUserDialog();
+                    return true;
+                }
+
                 Intent intent = new Intent(getApplicationContext(), DataEntryActivity.class);
                 startActivity(intent);
                 return true;
@@ -380,6 +393,11 @@ public class MainActivity extends AppCompatActivity {
     }
 
     private void invokeSearchBluetoothDevice() {
+        if (OpenScale.getInstance(getApplicationContext()).getSelectedScaleUserId() == -1) {
+            showNoSelectedUserDialog();
+            return;
+        }
+
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
 
         String deviceName = prefs.getString("btDeviceName", "-");
diff --git a/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java b/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java
index d4e3a475..899df425 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java
@@ -388,11 +388,6 @@ public class DataEntryActivity extends AppCompatActivity {
 
         OpenScale openScale = OpenScale.getInstance(getApplicationContext());
         if (openScale.getSelectedScaleUserId() == -1) {
-            AlertDialog.Builder infoDialog = new AlertDialog.Builder(context);
-
-            infoDialog.setMessage(getResources().getString(R.string.info_no_selected_user));
-            infoDialog.setPositiveButton(getResources().getString(R.string.label_ok), null);
-            infoDialog.show();
             return;
         }