From 5eae0044a6dc902e5fbbc5174bc3f7efae4e0287 Mon Sep 17 00:00:00 2001
From: OliE <olie.xdev@googlemail.com>
Date: Fri, 16 Dec 2016 12:59:39 +0100
Subject: [PATCH] use MI_SCALE as default device name check if bluetooth on the
 device is enabled

---
 .../java/com/health/openscale/gui/MainActivity.java  | 12 +++++++++---
 android_app/app/src/main/res/xml/preferences.xml     |  2 +-
 2 files changed, 10 insertions(+), 4 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 e870df8d..aaefdcec 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
@@ -16,6 +16,7 @@
 
 package com.health.openscale.gui;
 
+import android.bluetooth.BluetoothAdapter;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
@@ -144,11 +145,12 @@ public class MainActivity extends ActionBarActivity implements
 		if (id == R.id.action_bluetooth_status) {
 			SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
 
-			if (prefs.getBoolean("btEnable", false)) {
-				String deviceName = prefs.getString("btDeviceName", "openScale");
+			if (prefs.getBoolean("btEnable", false) && BluetoothAdapter.getDefaultAdapter().isEnabled()) {
+				String deviceName = prefs.getString("btDeviceName", "MI_SCALE");
 				Toast.makeText(getApplicationContext(), getResources().getString(R.string.info_bluetooth_try_reconnection) + " " + deviceName, Toast.LENGTH_SHORT).show();
 				invokeSearchBluetoothDevice();
 			} else {
+				bluetoothStatus.setIcon(getResources().getDrawable(R.drawable.bluetooth_disabled));
 				Toast.makeText(getApplicationContext(), "Bluetooth " + getResources().getString(R.string.info_is_not_enable), Toast.LENGTH_SHORT).show();
 			}
 			return true;
@@ -165,10 +167,14 @@ public class MainActivity extends ActionBarActivity implements
 	}
 
 	private void invokeSearchBluetoothDevice() {
+		if (!BluetoothAdapter.getDefaultAdapter().isEnabled()) {
+			return;
+		}
+
 		SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
 
 		if(prefs.getBoolean("btEnable", false)) {
-			String deviceName = prefs.getString("btDeviceName", "openScale");
+			String deviceName = prefs.getString("btDeviceName", "MI_SCALE");
 			String deviceType = prefs.getString("btDeviceTypes", "0");
 
 			// Check if Bluetooth 4.x is available
diff --git a/android_app/app/src/main/res/xml/preferences.xml b/android_app/app/src/main/res/xml/preferences.xml
index d4c072c0..2c8fc00c 100644
--- a/android_app/app/src/main/res/xml/preferences.xml
+++ b/android_app/app/src/main/res/xml/preferences.xml
@@ -7,7 +7,7 @@
 <PreferenceCategory android:title="@string/label_bluetooth_title">
     <CheckBoxPreference android:title="@string/label_bluetooth_enable" android:summaryOn="@string/info_is_enable" android:summaryOff="@string/info_is_not_enable" android:key="btEnable" android:defaultValue="false"/>
     <ListPreference android:title="@string/label_device_type" android:key="btDeviceTypes" android:entries="@array/btDeviceTypes" android:entryValues="@array/btDeviceTypesAlias" android:defaultValue="0"/>
-    <EditTextPreference android:title="@string/label_device_name" android:key="btDeviceName" android:defaultValue="openScale" />
+    <EditTextPreference android:title="@string/label_device_name" android:key="btDeviceName" android:defaultValue="MI_SCALE" />
 </PreferenceCategory>
 
 <PreferenceCategory android:title="@string/title_graph">