Skip to content

Commit 7d77614

Browse files
committed
using extra method for Bluetooth connection
1 parent 7a0dcff commit 7d77614

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -591,10 +591,19 @@ private void invokeConnectToBluetoothDevice() {
591591
return;
592592
}
593593

594+
connectToBluetooth();
595+
}
596+
597+
private void connectToBluetooth() {
598+
String deviceName = prefs.getString(
599+
BluetoothSettingsFragment.PREFERENCE_KEY_BLUETOOTH_DEVICE_NAME, "");
600+
String hwAddress = prefs.getString(
601+
BluetoothSettingsFragment.PREFERENCE_KEY_BLUETOOTH_HW_ADDRESS, "");
602+
594603
Toast.makeText(getApplicationContext(), getResources().getString(R.string.info_bluetooth_try_connection) + " " + deviceName, Toast.LENGTH_SHORT).show();
595604
setBluetoothStatusIcon(R.drawable.ic_bluetooth_searching);
596605

597-
if (!openScale.connectToBluetoothDevice(deviceName, hwAddress, callbackBtHandler)) {
606+
if (!OpenScale.getInstance().connectToBluetoothDevice(deviceName, hwAddress, callbackBtHandler)) {
598607
setBluetoothStatusIcon(R.drawable.ic_bluetooth_connection_lost);
599608
Toast.makeText(getApplicationContext(), deviceName + " " + getResources().getString(R.string.label_bt_device_no_support), Toast.LENGTH_SHORT).show();
600609
}
@@ -902,7 +911,7 @@ public void onRequestPermissionsResult(int requestCode, String permissions[], in
902911

903912
if (allGranted) {
904913
Timber.d("All Bluetooth permissions granted");
905-
invokeConnectToBluetoothDevice();
914+
connectToBluetooth();
906915
} else {
907916
Timber.d("At least one Bluetooth permission was not granted");
908917
Toast.makeText(this, R.string.permission_not_granted, Toast.LENGTH_SHORT).show();

0 commit comments

Comments
 (0)