Skip to content

Bugfix: improve branching logic and permissions comments #94

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Bugfix: improve branching logic and permissions comments #94

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52d9098
Improve comments and if statement logic to make it more clear that we…
andrewhavens Sep 12, 2019
bc68db9
Fix bug in placement of code within try/catch block.
andrewhavens Sep 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 12 additions & 15 deletions android/src/main/java/com/devstepbcn/wifi/AndroidWifiModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,21 +105,16 @@ public void forceWifiUsage(boolean useWifi) {

if (useWifi) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {

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.RELEASE.toString().equals("6.0.1")) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N || Build.VERSION.RELEASE.toString().equals("6.0.1")) {
// In versions >= 6.0.1, we no longer need to request permission to write to settings.
canWriteFlag = true;
// Don't need ACTION_MANAGE_WRITE_SETTINGS on 6.0.1, if we can positively identify it treat like 7+
} else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
// On M 6.0.0 (N+ or higher and 6.0.1 hit above), we need ACTION_MANAGE_WRITE_SETTINGS to forceWifi.
// In version 6.0.0, we need to request permission to write to settings in order to forceWifi.
canWriteFlag = Settings.System.canWrite(reactContext);
if (!canWriteFlag) {
Intent intent = new Intent(Settings.ACTION_MANAGE_WRITE_SETTINGS);
intent.setData(Uri.parse("package:" + reactContext.getPackageName()));
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

reactContext.startActivity(intent);
}
}
Expand All @@ -136,17 +131,19 @@ public void forceWifiUsage(boolean useWifi) {
manager.requestNetwork(builder.build(), new ConnectivityManager.NetworkCallback() {
@Override
public void onAvailable(Network network) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
manager.bindProcessToNetwork(network);
} else {
//This method was deprecated in API level 23
ConnectivityManager.setProcessDefaultNetwork(network);
}
try {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
manager.bindProcessToNetwork(network);
} else {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
//This method was deprecated in API level 23
ConnectivityManager.setProcessDefaultNetwork(network);
}
}
manager.unregisterNetworkCallback(this);
} catch (Exception e) {
e.printStackTrace();
}
manager.unregisterNetworkCallback(this);
}
});
}
Expand Down