diff --git a/android_app/app/app.iml b/android_app/app/app.iml index 3aac24dc..ac43b567 100644 --- a/android_app/app/app.iml +++ b/android_app/app/app.iml @@ -98,7 +98,6 @@ - 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 a9e8b7d8..64b97de7 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 @@ -56,8 +56,8 @@ public class MainActivity extends ActionBarActivity implements */ private SectionsPagerAdapter mSectionsPagerAdapter; - private static boolean firstAppStart = false; - private static int bluetoothStatusIcon = 0; + private static boolean firstAppStart = true; + private static int bluetoothStatusIcon = R.drawable.bluetooth_disabled; private static MenuItem bluetoothStatus; /** @@ -127,10 +127,12 @@ public class MainActivity extends ActionBarActivity implements bluetoothStatus = menu.findItem(R.id.action_bluetooth_status); - // Just search for a bluetooth device just once at the start of the app - if (!firstAppStart) { + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); + + // Just search for a bluetooth device just once at the start of the app and if start preference enabled + if (firstAppStart && prefs.getBoolean("btEnable", false)) { invokeSearchBluetoothDevice(); - firstAppStart = true; + firstAppStart = false; } else { // Set current bluetooth status icon while e.g. orientation changes setBluetoothStatusIcon(bluetoothStatusIcon); @@ -155,9 +157,9 @@ public class MainActivity extends ActionBarActivity implements if (id == R.id.action_bluetooth_status) { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); - if (prefs.getBoolean("btEnable", false) && BluetoothAdapter.getDefaultAdapter().isEnabled()) { + if (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(); + Toast.makeText(getApplicationContext(), getResources().getString(R.string.info_bluetooth_try_connection) + " " + deviceName, Toast.LENGTH_SHORT).show(); invokeSearchBluetoothDevice(); } else { setBluetoothStatusIcon(R.drawable.bluetooth_disabled); @@ -183,26 +185,22 @@ public class MainActivity extends ActionBarActivity implements SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); - if(prefs.getBoolean("btEnable", false)) { - String deviceName = prefs.getString("btDeviceName", "MI_SCALE"); - String deviceType = prefs.getString("btDeviceTypes", "0"); + String deviceName = prefs.getString("btDeviceName", "MI_SCALE"); + String deviceType = prefs.getString("btDeviceTypes", "0"); - // Check if Bluetooth 4.x is available - if (Integer.parseInt(deviceType) == BluetoothCommunication.BT_MI_SCALE) { - if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH_LE)) { - setBluetoothStatusIcon(R.drawable.bluetooth_disabled); - Toast.makeText(getApplicationContext(), "Bluetooth 4.x " + getResources().getString(R.string.info_is_not_available), Toast.LENGTH_SHORT).show(); - return; - } + // Check if Bluetooth 4.x is available + if (Integer.parseInt(deviceType) == BluetoothCommunication.BT_MI_SCALE) { + if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH_LE)) { + setBluetoothStatusIcon(R.drawable.bluetooth_disabled); + Toast.makeText(getApplicationContext(), "Bluetooth 4.x " + getResources().getString(R.string.info_is_not_available), Toast.LENGTH_SHORT).show(); + return; } - - setBluetoothStatusIcon(R.drawable.bluetooth_searching); - - OpenScale.getInstance(getApplicationContext()).stopSearchingForBluetooth(); - OpenScale.getInstance(getApplicationContext()).startSearchingForBluetooth(Integer.parseInt(deviceType), deviceName, callbackBtHandler); - } else { - setBluetoothStatusIcon(R.drawable.bluetooth_disabled); } + + setBluetoothStatusIcon(R.drawable.bluetooth_searching); + + OpenScale.getInstance(getApplicationContext()).stopSearchingForBluetooth(); + OpenScale.getInstance(getApplicationContext()).startSearchingForBluetooth(Integer.parseInt(deviceType), deviceName, callbackBtHandler); } private final Handler callbackBtHandler = new Handler() { diff --git a/android_app/app/src/main/java/com/health/openscale/gui/SettingsActivity.java b/android_app/app/src/main/java/com/health/openscale/gui/SettingsActivity.java index 290bddf8..314a08ab 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/SettingsActivity.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/SettingsActivity.java @@ -135,16 +135,6 @@ private void updatePrefSummary(Preference p) { EditTextPreference editTextPref = (EditTextPreference) p; p.setSummary(editTextPref.getText()); } - - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); - if(prefs.getBoolean("btEnable", true)) - { - findPreference("btDeviceName").setEnabled(true); - findPreference("btDeviceTypes").setEnabled(true); - } else { - findPreference("btDeviceName").setEnabled(false); - findPreference("btDeviceTypes").setEnabled(false); - } } @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) diff --git a/android_app/app/src/main/res/values-de/strings.xml b/android_app/app/src/main/res/values-de/strings.xml index 63b18c70..17a78c42 100644 --- a/android_app/app/src/main/res/values-de/strings.xml +++ b/android_app/app/src/main/res/values-de/strings.xml @@ -38,7 +38,7 @@ Dein Gewicht war Hinzufügen Geburtstag - Suche nach Bluetooth Waage + Suche nach Waage beim Start Bluetooth BMI Körpergröße @@ -101,7 +101,7 @@ Bluetooth Verbindung verloren Verbindung erfolgreich hergestellt Kein Bluetooth Gerät gefunden - Versuche Verbindung herzustellen zu + Versuche Verbindung herzustellen zu Gerätetyp Initializiere Bluetooth Gerät \ No newline at end of file diff --git a/android_app/app/src/main/res/values-ja/strings.xml b/android_app/app/src/main/res/values-ja/strings.xml index fd2188e5..3faebbcf 100644 --- a/android_app/app/src/main/res/values-ja/strings.xml +++ b/android_app/app/src/main/res/values-ja/strings.xml @@ -42,7 +42,7 @@ 最終の計測 目標期日は 全てデリート - Bluetoothの体重計を探索する + 起動時に体重計を探索します 過去30日 過去7日 デバイス名 @@ -98,7 +98,7 @@ ウエストヒップ比 Bluetoothステータス Bluetooth接続を確立できなかった場合 - 再接続しようとしています + 接続しようとしています Bluetoothに予期しないエラーがあります Bluetooth接続を失いました 接続に成功しました diff --git a/android_app/app/src/main/res/values/strings.xml b/android_app/app/src/main/res/values/strings.xml index e7e86ec2..b2199234 100644 --- a/android_app/app/src/main/res/values/strings.xml +++ b/android_app/app/src/main/res/values/strings.xml @@ -92,7 +92,7 @@ is not available Clear all Bluetooth data Bluetooth data was successful cleared - Trying to reconnect to + Trying to connect to Lost Bluetooth connection. No Bluetooth device found Connection successful established @@ -107,7 +107,7 @@ Do you really want to delete the user? Bluetooth - Search for Bluetooth scale + Search for scale on startup Device Name Device Type