mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-21 16:02:04 +02:00
Code Issues Releases Wiki Activity

using extra method for Bluetooth connection

Browse Source
This commit is contained in:
oliexdev
2021-11-16 16:28:12 +01:00
parent 7a0dcff820
commit 7d776144df
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -591,10 +591,19 @@ public class MainActivity extends AppCompatActivity
return;
}
connectToBluetooth();
}
private void connectToBluetooth() {
String deviceName = prefs.getString(
BluetoothSettingsFragment.PREFERENCE_KEY_BLUETOOTH_DEVICE_NAME, "");
String hwAddress = prefs.getString(
BluetoothSettingsFragment.PREFERENCE_KEY_BLUETOOTH_HW_ADDRESS, "");
Toast.makeText(getApplicationContext(), getResources().getString(R.string.info_bluetooth_try_connection) + " " + deviceName, Toast.LENGTH_SHORT).show();
setBluetoothStatusIcon(R.drawable.ic_bluetooth_searching);
if (!openScale.connectToBluetoothDevice(deviceName, hwAddress, callbackBtHandler)) {
if (!OpenScale.getInstance().connectToBluetoothDevice(deviceName, hwAddress, callbackBtHandler)) {
setBluetoothStatusIcon(R.drawable.ic_bluetooth_connection_lost);
Toast.makeText(getApplicationContext(), deviceName + " " + getResources().getString(R.string.label_bt_device_no_support), Toast.LENGTH_SHORT).show();
}
@@ -902,7 +911,7 @@ public class MainActivity extends AppCompatActivity
if (allGranted) {
Timber.d("All Bluetooth permissions granted");
invokeConnectToBluetoothDevice();
connectToBluetooth();
} else {
Timber.d("At least one Bluetooth permission was not granted");
Toast.makeText(this, R.string.permission_not_granted, Toast.LENGTH_SHORT).show();