mirror of
https://github.com/DanielPollithy/flashwifi.git
synced 2025-10-16 11:45:32 +00:00
Android 6.0 CHANGE_NETWORK_STATE permission check - bug fix
-Android 6.0 - BUG: https://stackoverflow.com/questions/32185628/connectivitymanager-requestnetwork-in-android-6-0 -"If you have WRITE_SETTINGS you don't need CHANGE_NETWORK_STATE" -Added check: if on Android 6.0 and permissions not granded, ignore and proceed
This commit is contained in:
parent
cb57557acc
commit
3af91f1e0d
@ -329,8 +329,10 @@ public class WelcomeActivity extends AppCompatActivity {
|
||||
boolean ok = true;
|
||||
for (int grantResult: grantResults) {
|
||||
if (grantResult != PackageManager.PERMISSION_GRANTED) {
|
||||
ok = false;
|
||||
Log.d("Permissions", "onRequestPermissionsResult: denied: " + permissions[i]);
|
||||
ok = androidSixDotZeroBugCheck(permissions[i]);
|
||||
if(!ok){
|
||||
Log.d("Permissions", "onRequestPermissionsResult: denied: " + permissions[i]);
|
||||
}
|
||||
}
|
||||
i++;
|
||||
}
|
||||
@ -372,6 +374,18 @@ public class WelcomeActivity extends AppCompatActivity {
|
||||
}
|
||||
}
|
||||
|
||||
private boolean androidSixDotZeroBugCheck(String permission) {
|
||||
if(permission.equals("android.permission.CHANGE_NETWORK_STATE")) {
|
||||
if (Build.VERSION.RELEASE.equals("6.0")) {
|
||||
return true;
|
||||
}
|
||||
else{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* View pager adapter
|
||||
*/
|
||||
|
||||
Loading…
Reference in New Issue
Block a user