Merge pull request #72 from bondparkerbond/permissions-fix

devstepbcn · web-flow · commit 28d1b70b13ef · 2019-01-29T11:37:01.000+01:00
Don't request special permissions on SDK 24+ when calling forceWifiUsage
diff --git a/android/src/main/java/com/devstepbcn/wifi/AndroidWifiModule.java b/android/src/main/java/com/devstepbcn/wifi/AndroidWifiModule.java
@@ -106,7 +106,10 @@ public void forceWifiUsage(boolean useWifi) {
         if (useWifi) {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
 
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                    canWriteFlag = true;
+                    // Only need ACTION_MANAGE_WRITE_SETTINGS on 6.0.0, regular permissions suffice on later versions
+                } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                     canWriteFlag = Settings.System.canWrite(reactContext);
 
                     if (!canWriteFlag) {
@@ -520,4 +523,3 @@ public void onReceive(Context c, Intent intent) {
 		}
 	}
 }
-

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,10 @@ public void forceWifiUsage(boolean useWifi) {`
`106`	`106`	`if (useWifi) {`
`107`	`107`	`if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {`
`108`	`108`
`109`		`- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {`
	`109`	`+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {`
	`110`	`+ canWriteFlag = true;`
	`111`	`+ // Only need ACTION_MANAGE_WRITE_SETTINGS on 6.0.0, regular permissions suffice on later versions`
	`112`	`+ } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {`
`110`	`113`	`canWriteFlag = Settings.System.canWrite(reactContext);`
`111`	`114`
`112`	`115`	`if (!canWriteFlag) {`
`@@ -520,4 +523,3 @@ public void onReceive(Context c, Intent intent) {`
`520`	`523`	`}`
`521`	`524`	`}`
`522`	`525`	`}`
`523`		`-`