From 3af91f1e0da8a1a8cca56f1edbb3fa5c2cd49885 Mon Sep 17 00:00:00 2001
From: Toby Woerthle <tobiaswoerthle@gmail.com>
Date: Wed, 24 Jan 2018 21:56:31 -0500
Subject: [PATCH] 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
---
 .../com/flashwifi/wifip2p/WelcomeActivity.java | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/flashwifi/wifip2p/WelcomeActivity.java b/app/src/main/java/com/flashwifi/wifip2p/WelcomeActivity.java
index 1248b2a..1d648a9 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/WelcomeActivity.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/WelcomeActivity.java
@@ -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
      */