mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-24 01:03:20 +02:00
Code Issues Releases Wiki Activity

add some try catch blocks

Browse Source
This commit is contained in:
OliE
2017-09-29 19:40:59 +02:00
parent dc820d8118
commit 1b6bddbbcc
3 changed files with 36 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
android_app/app/src/main/java/com/health/openscale/core/OpenScale.java
View File

@@ -22,6 +22,7 @@ import android.os.Handler;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.util.Log; import android.util.Log;
import android.widget.Toast;
import com.health.openscale.core.alarm.AlarmHandler; import com.health.openscale.core.alarm.AlarmHandler;
import com.health.openscale.core.bluetooth.BluetoothCommunication; import com.health.openscale.core.bluetooth.BluetoothCommunication;
@@ -114,16 +115,22 @@ public class OpenScale {
public ScaleUser getSelectedScaleUser() public ScaleUser getSelectedScaleUser()
{ {
ScaleUser scaleUser = new ScaleUser();
try {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
int selectedUserId = prefs.getInt("selectedUserId", -1); int selectedUserId = prefs.getInt("selectedUserId", -1);
if (selectedUserId == -1) { if (selectedUserId == -1) {
ScaleUser scaleUser = new ScaleUser();
return scaleUser; return scaleUser;
} }
return scaleUserDB.getScaleUser(selectedUserId); scaleUser = scaleUserDB.getScaleUser(selectedUserId);
} catch (Exception e) {
Toast.makeText(context, "Error: " + e.getMessage(), Toast.LENGTH_SHORT).show();
}
return scaleUser;
} }
public void deleteScaleUser(int id) public void deleteScaleUser(int id)

7
android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCommunication.java
View File

@@ -430,13 +430,13 @@ public abstract class BluetoothCommunication {
{ {
@Override @Override
public void onLeScan(final BluetoothDevice device, int rssi, byte[] scanRecord) { public void onLeScan(final BluetoothDevice device, int rssi, byte[] scanRecord) {
try {
if (device.getName() == null) { if (device.getName() == null) {
return; return;
} }
for (int i = 0; i < hwAddresses().size(); i++) { for (int i = 0; i < hwAddresses().size(); i++) {
if (device.getAddress().replace(":", "").toUpperCase().startsWith(hwAddresses().get(i)) || hwAddresses().get(i) == "FFFFFF") if (device.getAddress().replace(":", "").toUpperCase().startsWith(hwAddresses().get(i)) || hwAddresses().get(i) == "FFFFFF") {
{
if (isDeviceNameCheck()) { if (isDeviceNameCheck()) {
if (!device.getName().toLowerCase().equals(btDeviceName.toLowerCase())) { if (!device.getName().toLowerCase().equals(btDeviceName.toLowerCase())) {
return; return;
@@ -451,6 +451,9 @@ public abstract class BluetoothCommunication {
btAdapter.stopLeScan(scanCallback); btAdapter.stopLeScan(scanCallback);
} }
} }
} catch (Exception e) {
setBtStatus(BT_STATUS_CODE.BT_UNEXPECTED_ERROR, e.getMessage());
}
} }
}; };
} }

2
android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCustomOpenScale.java
View File

@@ -89,7 +89,7 @@ public class BluetoothCustomOpenScale extends BluetoothCommunication {
for (BluetoothDevice device : pairedDevices) { for (BluetoothDevice device : pairedDevices) {
// check if we can found bluetooth device name in the pairing list // 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; btDevice = device;
try { try {