From 1b6bddbbcc373c8207659fd10c0e73f5994e9d8f Mon Sep 17 00:00:00 2001
From: OliE <olie.xdev@googlemail.com>
Date: Fri, 29 Sep 2017 19:40:59 +0200
Subject: [PATCH] add some try catch blocks

---
 .../com/health/openscale/core/OpenScale.java  | 19 ++++++---
 .../bluetooth/BluetoothCommunication.java     | 41 ++++++++++---------
 .../bluetooth/BluetoothCustomOpenScale.java   |  2 +-
 3 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/android_app/app/src/main/java/com/health/openscale/core/OpenScale.java b/android_app/app/src/main/java/com/health/openscale/core/OpenScale.java
index 09fc3b7a..93f52380 100644
--- a/android_app/app/src/main/java/com/health/openscale/core/OpenScale.java
+++ b/android_app/app/src/main/java/com/health/openscale/core/OpenScale.java
@@ -22,6 +22,7 @@ import android.os.Handler;
 import android.preference.PreferenceManager;
 import android.support.v4.app.Fragment;
 import android.util.Log;
+import android.widget.Toast;
 
 import com.health.openscale.core.alarm.AlarmHandler;
 import com.health.openscale.core.bluetooth.BluetoothCommunication;
@@ -114,16 +115,22 @@ public class OpenScale {
 
     public ScaleUser getSelectedScaleUser()
     {
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        int selectedUserId  = prefs.getInt("selectedUserId", -1);
+        ScaleUser scaleUser = new ScaleUser();
 
-        if (selectedUserId == -1) {
-            ScaleUser scaleUser = new ScaleUser();
+        try {
+            SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+            int selectedUserId  = prefs.getInt("selectedUserId", -1);
 
-            return scaleUser;
+            if (selectedUserId == -1) {
+                return scaleUser;
+            }
+
+            scaleUser = scaleUserDB.getScaleUser(selectedUserId);
+        } catch (Exception e) {
+            Toast.makeText(context, "Error: " + e.getMessage(), Toast.LENGTH_SHORT).show();
         }
 
-        return scaleUserDB.getScaleUser(selectedUserId);
+        return scaleUser;
     }
 
     public void deleteScaleUser(int id)
diff --git a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCommunication.java b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCommunication.java
index e46a7f3c..2e7b7ba7 100644
--- a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCommunication.java
+++ b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCommunication.java
@@ -430,26 +430,29 @@ public abstract class BluetoothCommunication {
             {
                 @Override
                 public void onLeScan(final BluetoothDevice device, int rssi, byte[] scanRecord) {
-                    if (device.getName() == null) {
-                        return;
-                    }
-
-                    for (int i=0; i<hwAddresses().size(); i++) {
-                        if (device.getAddress().replace(":", "").toUpperCase().startsWith(hwAddresses().get(i)) || hwAddresses().get(i) == "FFFFFF")
-                        {
-                            if (isDeviceNameCheck()) {
-                                if (!device.getName().toLowerCase().equals(btDeviceName.toLowerCase())) {
-                                    return;
-                                }
-                            }
-
-                            Log.d("BluetoothCommunication", btDeviceName + " found trying to connect...");
-
-                            bluetoothGatt = device.connectGatt(context, false, gattCallback);
-
-                            searchHandler.removeCallbacksAndMessages(null);
-                            btAdapter.stopLeScan(scanCallback);
+                    try {
+                        if (device.getName() == null) {
+                            return;
                         }
+
+                        for (int i = 0; i < hwAddresses().size(); i++) {
+                            if (device.getAddress().replace(":", "").toUpperCase().startsWith(hwAddresses().get(i)) || hwAddresses().get(i) == "FFFFFF") {
+                                if (isDeviceNameCheck()) {
+                                    if (!device.getName().toLowerCase().equals(btDeviceName.toLowerCase())) {
+                                        return;
+                                    }
+                                }
+
+                                Log.d("BluetoothCommunication", btDeviceName + " found trying to connect...");
+
+                                bluetoothGatt = device.connectGatt(context, false, gattCallback);
+
+                                searchHandler.removeCallbacksAndMessages(null);
+                                btAdapter.stopLeScan(scanCallback);
+                            }
+                        }
+                    } catch (Exception e) {
+                        setBtStatus(BT_STATUS_CODE.BT_UNEXPECTED_ERROR, e.getMessage());
                     }
                 }
             };
diff --git a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCustomOpenScale.java b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCustomOpenScale.java
index 98f1cdc0..9aec2dbe 100644
--- a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCustomOpenScale.java
+++ b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCustomOpenScale.java
@@ -89,7 +89,7 @@ public class BluetoothCustomOpenScale extends BluetoothCommunication {
 
         for (BluetoothDevice device : pairedDevices) {
             // check if we can found bluetooth device name in the pairing list
-            if (device.getName().equals(deviceName)) {
+            if (device != null && device.getName().equals(deviceName)) {
                 btDevice = device;
 
                 try {