diff --git a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCommunication.java b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCommunication.java index 9e20af48..dd0131ab 100644 --- a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCommunication.java +++ b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCommunication.java @@ -484,7 +484,8 @@ public abstract class BluetoothCommunication { LocationManager locationManager = (LocationManager)context.getSystemService(LOCATION_SERVICE); if (ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_COARSE_LOCATION) - == PackageManager.PERMISSION_GRANTED && locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER) + == PackageManager.PERMISSION_GRANTED && (locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER) + || locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER)) ) { Timber.d("Do LE scan before connecting to device"); scanSubscription = bleClient.scanBleDevices( diff --git a/android_app/app/src/main/java/com/health/openscale/gui/utils/PermissionHelper.java b/android_app/app/src/main/java/com/health/openscale/gui/utils/PermissionHelper.java index 948b6343..e236e3eb 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/utils/PermissionHelper.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/utils/PermissionHelper.java @@ -87,7 +87,7 @@ public class PermissionHelper { public static boolean requestLocationServicePermission(final Activity activity) { LocationManager locationManager = (LocationManager) activity.getSystemService(LOCATION_SERVICE); - if (!locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) { + if (!(locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER) || locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER))) { AlertDialog.Builder builder = new AlertDialog.Builder(activity); builder.setTitle(R.string.permission_bluetooth_info_title);