mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-18 22:41:44 +02:00
Code Issues Releases Wiki Activity

added some debug information for the permission handling

Browse Source
This commit is contained in:
oliexdev
2021-11-07 11:10:43 +01:00
parent 46fb92b351
commit b85fd08f28
2 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
android_app/app/src/main/java/com/health/openscale/gui/preferences/BluetoothSettingsFragment.java
View File

@@ -100,9 +100,7 @@ public class BluetoothSettingsFragment extends Fragment {
@Override @Override
public void onResume() { public void onResume() {
if (PermissionHelper.requestBluetoothPermission(this)) { if (PermissionHelper.requestBluetoothPermission(this)) {
if (PermissionHelper.requestLocationServicePermission(this)) { startBluetoothDiscovery();
startBluetoothDiscovery();
}
} }
super.onResume(); super.onResume();
} }
@@ -401,10 +399,10 @@ public class BluetoothSettingsFragment extends Fragment {
} }
if (allGranted) { if (allGranted) {
if (PermissionHelper.requestLocationServicePermission(this)) { Timber.d("All Bluetooth permissions granted");
startBluetoothDiscovery(); startBluetoothDiscovery();
}
} else { } else {
Timber.d("At least one Bluetooth permission was not granted");
Toast.makeText(requireContext(), R.string.permission_not_granted, Toast.LENGTH_SHORT).show(); Toast.makeText(requireContext(), R.string.permission_not_granted, Toast.LENGTH_SHORT).show();
} }
break; break;

44
android_app/app/src/main/java/com/health/openscale/gui/utils/PermissionHelper.java
View File

@@ -35,6 +35,8 @@ import androidx.fragment.app.Fragment;
import com.health.openscale.R; import com.health.openscale.R;
import timber.log.Timber;
public class PermissionHelper { public class PermissionHelper {
public final static int PERMISSIONS_REQUEST_ACCESS_BLUETOOTH = 1; public final static int PERMISSIONS_REQUEST_ACCESS_BLUETOOTH = 1;
public final static int PERMISSIONS_REQUEST_ACCESS_READ_STORAGE = 2; public final static int PERMISSIONS_REQUEST_ACCESS_READ_STORAGE = 2;
@@ -67,43 +69,51 @@ public class PermissionHelper {
String[] requiredPermissions; String[] requiredPermissions;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && targetSdkVersion >= Build.VERSION_CODES.S) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && targetSdkVersion >= Build.VERSION_CODES.S) {
Timber.d("SDK >= 31 request for Bluetooth Scan and Bluetooth connect permissions");
requiredPermissions = new String[]{Manifest.permission.BLUETOOTH_SCAN, Manifest.permission.BLUETOOTH_CONNECT}; requiredPermissions = new String[]{Manifest.permission.BLUETOOTH_SCAN, Manifest.permission.BLUETOOTH_CONNECT};
fragment.requestPermissions(requiredPermissions, PERMISSIONS_REQUEST_ACCESS_BLUETOOTH); fragment.requestPermissions(requiredPermissions, PERMISSIONS_REQUEST_ACCESS_BLUETOOTH);
} else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && targetSdkVersion >= Build.VERSION_CODES.Q) { } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && targetSdkVersion >= Build.VERSION_CODES.Q) {
Timber.d("SDK >= 29 request for Access fine location permission");
return requestLocationPermission(fragment, new String[]{Manifest.permission.ACCESS_FINE_LOCATION}); return requestLocationPermission(fragment, new String[]{Manifest.permission.ACCESS_FINE_LOCATION});
} else return requestLocationPermission(fragment, new String[]{Manifest.permission.ACCESS_COARSE_LOCATION}); } else {
Timber.d("SDK < 29 request for coarse location permission");
return requestLocationPermission(fragment, new String[]{Manifest.permission.ACCESS_COARSE_LOCATION});
}
return true; return true;
} }
private static boolean requestLocationPermission(final Fragment fragment, String[] requiredPermissions) { private static boolean requestLocationPermission(final Fragment fragment, String[] requiredPermissions) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
if (fragment.getContext().checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) { if (requestLocationServicePermission(fragment)) {
AlertDialog.Builder builder = new AlertDialog.Builder(fragment.getActivity()); if (fragment.getContext().checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
AlertDialog.Builder builder = new AlertDialog.Builder(fragment.getActivity());
builder.setMessage(R.string.permission_bluetooth_info) builder.setMessage(R.string.permission_bluetooth_info)
.setTitle(R.string.permission_bluetooth_info_title) .setTitle(R.string.permission_bluetooth_info_title)
.setIcon(R.drawable.ic_preferences_about) .setIcon(R.drawable.ic_preferences_about)
.setPositiveButton(R.string.label_ok, new DialogInterface.OnClickListener() { .setPositiveButton(R.string.label_ok, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) { public void onClick(DialogInterface dialog, int id) {
dialog.dismiss(); dialog.dismiss();
fragment.requestPermissions(requiredPermissions, PERMISSIONS_REQUEST_ACCESS_BLUETOOTH); fragment.requestPermissions(requiredPermissions, PERMISSIONS_REQUEST_ACCESS_BLUETOOTH);
} }
}); });
Dialog alertDialog = builder.create(); Dialog alertDialog = builder.create();
alertDialog.setCanceledOnTouchOutside(false); alertDialog.setCanceledOnTouchOutside(false);
alertDialog.show(); alertDialog.show();
return false; return false;
}
} }
} }
return true; return true;
} }
public static boolean requestLocationServicePermission(final Fragment fragment) { private static boolean requestLocationServicePermission(final Fragment fragment) {
LocationManager locationManager = (LocationManager) fragment.getActivity().getSystemService(LOCATION_SERVICE); LocationManager locationManager = (LocationManager) fragment.getActivity().getSystemService(LOCATION_SERVICE);
if (!(locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER) || locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER))) { if (!(locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER) || locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER))) {
Timber.d("No GPS or Network location service is enabled, ask user for permission");
AlertDialog.Builder builder = new AlertDialog.Builder(fragment.getContext()); AlertDialog.Builder builder = new AlertDialog.Builder(fragment.getContext());
builder.setTitle(R.string.permission_bluetooth_info_title); builder.setTitle(R.string.permission_bluetooth_info_title);