|
@@ -282,11 +282,12 @@ public class SplashActivity
|
|
|
|| (ActivityCompat.checkSelfPermission(ctx, Manifest.permission.ACCESS_BACKGROUND_LOCATION) != PackageManager.PERMISSION_GRANTED)
|
|
|
) {
|
|
|
|
|
|
- ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE,
|
|
|
+ ActivityCompat.requestPermissions(this, new String[]{
|
|
|
+
|
|
|
Manifest.permission.INTERNET,
|
|
|
Manifest.permission.ACCESS_FINE_LOCATION,
|
|
|
Manifest.permission.ACCESS_COARSE_LOCATION,
|
|
|
- Manifest.permission.ACCESS_BACKGROUND_LOCATION,
|
|
|
+
|
|
|
}, REQUEST_CODE);
|
|
|
} else {
|
|
|
|
|
@@ -305,12 +306,13 @@ public class SplashActivity
|
|
|
@Override
|
|
|
public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
|
|
|
if (requestCode == REQUEST_CODE) {
|
|
|
- if ((grantResults.length >= 5)
|
|
|
+
|
|
|
+ if ((grantResults.length >= 3)
|
|
|
&& (grantResults[0] == PackageManager.PERMISSION_GRANTED)
|
|
|
&& (grantResults[1] == PackageManager.PERMISSION_GRANTED)
|
|
|
&& (grantResults[2] == PackageManager.PERMISSION_GRANTED)
|
|
|
- && (grantResults[3] == PackageManager.PERMISSION_GRANTED)
|
|
|
- && (grantResults[4] == PackageManager.PERMISSION_GRANTED)
|
|
|
+
|
|
|
+
|
|
|
) {
|
|
|
|
|
|
initExec();
|