From 4b5efdd310cfe9a8abb8cb7f8e5d006445031074 Mon Sep 17 00:00:00 2001 From: Mygod Date: Thu, 4 Jan 2018 16:08:09 +0800 Subject: [PATCH] Refine clean up procedure --- mobile/src/main/java/be/mygod/vpnhotspot/SettingsFragment.kt | 2 +- mobile/src/main/java/be/mygod/vpnhotspot/Utils.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/SettingsFragment.kt b/mobile/src/main/java/be/mygod/vpnhotspot/SettingsFragment.kt index 82cf0c75..4f358eeb 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/SettingsFragment.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/SettingsFragment.kt @@ -31,7 +31,7 @@ class SettingsFragment : PreferenceFragmentCompatDividers(), ServiceConnection { "while iptables -D FORWARD -j vpnhotspot_fwd; do done", "iptables -F vpnhotspot_fwd", "iptables -X vpnhotspot_fwd", - "ip rule del lookup 62", + "while ip rule del lookup 62; do done", "ip route flush table 62") true } diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/Utils.kt b/mobile/src/main/java/be/mygod/vpnhotspot/Utils.kt index 8a3b675b..15abd454 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/Utils.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/Utils.kt @@ -26,7 +26,7 @@ const val NOISYSU_TAG = "NoisySU" const val NOISYSU_SUFFIX = "SUCCESS\n" fun noisySu(vararg commands: String): Boolean { val process = ProcessBuilder("su", "-c", """function noisy() { "$@" || echo "$@" exited with $?; } -${commands.joinToString("\n") { "noisy $it" }} +${commands.joinToString("\n") { if (it.startsWith("while ")) it else "noisy $it" }} echo $NOISYSU_SUFFIX""") .redirectErrorStream(true) .start()