From cb3bdff0f22f0f3c3fea9f472b247d0fa14e4d63 Mon Sep 17 00:00:00 2001
From: Mygod <contact-github@mygod.be>
Date: Sat, 21 Apr 2018 21:29:17 -0700
Subject: [PATCH] Fix killall not available on lower versions

---
 mobile/src/main/AndroidManifest.xml                          | 1 +
 .../mygod/vpnhotspot/net/wifi/P2pSupplicantConfiguration.kt  | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/mobile/src/main/AndroidManifest.xml b/mobile/src/main/AndroidManifest.xml
index 8a9975db..58762bc9 100644
--- a/mobile/src/main/AndroidManifest.xml
+++ b/mobile/src/main/AndroidManifest.xml
@@ -22,6 +22,7 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
     <uses-permission android:name="android.permission.BLUETOOTH"/>
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.MANAGE_USB"
diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/P2pSupplicantConfiguration.kt b/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/P2pSupplicantConfiguration.kt
index 7dd0c2f9..48c8a619 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/P2pSupplicantConfiguration.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/P2pSupplicantConfiguration.kt
@@ -1,6 +1,7 @@
 package be.mygod.vpnhotspot.net.wifi
 
 import android.net.wifi.WifiConfiguration
+import android.os.Build
 import android.util.Log
 import android.widget.Toast
 import be.mygod.vpnhotspot.App.Companion.app
@@ -53,8 +54,10 @@ class P2pSupplicantConfiguration {
                 Log.w(TAG, "Invalid conf ($ssidFound, $pskFound): $content")
                 return false
             }
+            // pkill not available on Lollipop. Source: https://android.googlesource.com/platform/system/core/+/master/shell_and_utilities/README.md
             return noisySu("cat ${tempFile.absolutePath} > /data/misc/wifi/p2p_supplicant.conf",
-                    "killall wpa_supplicant")
+                    if (Build.VERSION.SDK_INT >= 23) "pkill wpa_supplicant"
+                    else "set `ps | grep wpa_supplicant`; kill \$2")
         } finally {
             if (!tempFile.delete()) tempFile.deleteOnExit()
         }