try to toggle wifi without root first, and use root as fallback if the former doesn't work

Author: pgp

app/build.gradle

@@ -7,7 +7,7 @@ android {
 
     defaultConfig {
         applicationId "it.pgp.currenttoggles"
-        minSdkVersion 21
+        minSdkVersion 21 // for sdk 19 and lower, just use the great PowerToggles :)
         targetSdkVersion 28
         versionCode 111220816
         versionName "1.1.1"

app/src/main/AndroidManifest.xml

@@ -10,6 +10,7 @@
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
     <uses-permission android:name="android.permission.CAMERA"/>
     <uses-permission android:name="android.permission.FLASHLIGHT"/>
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
     <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
     <uses-permission android:name="android.permission.TETHER_PRIVILEGED" />

app/src/main/java/it/pgp/currenttoggles/MainActivity.java

@@ -8,6 +8,7 @@
 import android.content.SharedPreferences;
 import android.hardware.camera2.CameraManager;
 import android.net.Uri;
+import android.net.wifi.WifiManager;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
@@ -49,6 +50,16 @@ public static void launchWriteSettings(Context context) {
         context.startActivity(i);
     }
 
+    public static void toggleWifi(Context context) {
+        WifiManager wifiManager = (WifiManager) context.getApplicationContext().getSystemService(Context.WIFI_SERVICE);
+        boolean stateToSet = !wifiManager.isWifiEnabled();
+        if(!wifiManager.setWifiEnabled(stateToSet)) {
+            // try with root
+            toggleDataWifiBluetoothGps(context, "wifi", Misc::isWifiEnabled);
+        }
+        else Toast.makeText(context, "Wifi "+(stateToSet?"enabled":"disabled"), Toast.LENGTH_SHORT).show();
+    }
+
     public static void toggleDataWifiBluetoothGps(Context context, String channel, II ii) { // channel: "data" or "wifi"
         String[][] cmdsAndErrors = {
                 {channel + " currently DISABLED -> enabling...", "enable"},
@@ -275,7 +286,7 @@ public void toggle(View v) {
                 toggleDataWifiBluetoothGps(this, "data", Misc::isDataConnectionEnabled);
                 break;
             case R.id.toggleWifi:
-                toggleDataWifiBluetoothGps(this, "wifi", Misc::isWifiEnabled);
+                toggleWifi(this);
                 break;
             case R.id.toggleBt:
 //                toggleDataWifiBluetoothGps(this, "bluetooth", Misc::isBluetoothEnabled); // no need to do this using root

app/src/main/java/it/pgp/currenttoggles/MainWidget.java

@@ -125,7 +125,7 @@ public void onReceive(Context context, Intent intent) {
             switch(a) {
                 case onDemandWifi:
                     Log.d(LOG_PREFIX,"onDemand Wifi");
-                    MainActivity.toggleDataWifiBluetoothGps(context, "wifi", Misc::isWifiEnabled);
+                    MainActivity.toggleWifi(context);
                     break;
                 case onDemandData:
                     Log.d(LOG_PREFIX,"onDemand Data");