Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Android Marshmallow Location Permissions Request #77

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Android Marshmallow Location Permissions Request #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
<license>Apache 2.0</license>
<repo>https://github.com/parsonsmatt/WifiWizard/</repo>

<dependency id="cordova-plugin-compat" version="^1.0.0" />

<js-module src="www/WifiWizard.js" name="WifiWizard">
<clobbers target="window.WifiWizard"/>
</js-module>
Expand Down
49 changes: 37 additions & 12 deletions src/android/src/com/pylonproducts/wifiwizard/WifiWizard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,17 @@
*/
package com.pylonproducts.wifiwizard;

import android.Manifest;
import android.content.Context;
import android.content.pm.PackageManager;
import android.net.wifi.*;
import android.util.Log;
import org.apache.cordova.*;
import java.util.List;

import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;

import android.net.NetworkInfo;
import android.net.wifi.WifiManager;
import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiEnterpriseConfig;
import android.net.wifi.ScanResult;
import android.net.wifi.WifiInfo;
import android.net.wifi.SupplicantState;
import android.content.Context;
import android.util.Log;
import java.util.List;


public class WifiWizard extends CordovaPlugin {
Expand All @@ -47,6 +42,11 @@ public class WifiWizard extends CordovaPlugin {
private static final String SET_WIFI_ENABLED = "setWifiEnabled";
private static final String TAG = "WifiWizard";

private static final int PERMISSION_DENIED_ERROR = 20;
private static final int FINE_LOCATION_SEC = 0;

private JSONArray scanResultData;

private WifiManager wifiManager;
private CallbackContext callbackContext;

Expand Down Expand Up @@ -91,7 +91,14 @@ else if(action.equals(START_SCAN)) {
return this.startScan(callbackContext);
}
else if(action.equals(GET_SCAN_RESULTS)) {
return this.getScanResults(callbackContext, data);
if(!PermissionHelper.hasPermission(this, Manifest.permission.ACCESS_FINE_LOCATION)) {
scanResultData = data;
PermissionHelper.requestPermission(this, FINE_LOCATION_SEC, Manifest.permission.ACCESS_FINE_LOCATION);
Log.d(TAG, "Location permission not found, requesting from user");
return true;
}else{
return this.getScanResults(callbackContext, data);
}
}
else if(action.equals(DISCONNECT)) {
return this.disconnect(callbackContext);
Expand Down Expand Up @@ -567,4 +574,22 @@ private boolean validateData(JSONArray data) {
return false;
}

public void onRequestPermissionResult(int requestCode, String[] permissions,
int[] grantResults) throws JSONException {
for (int r : grantResults) {
if (r == PackageManager.PERMISSION_DENIED) {
this.callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.ERROR, PERMISSION_DENIED_ERROR));
return;
}
}

switch (requestCode) {
case FINE_LOCATION_SEC:
Log.d(TAG, "Location permission granted, returning scan results");
this.getScanResults(callbackContext, scanResultData);
this.scanResultData = null;
break;
}
}

}