Merge branch 'master' into s

2021-07-10 19:26:22 -04:00
parent 4733b294cf 91afda8fdf
commit 3572ce2713
10 changed files with 41 additions and 31 deletions
--- a/mobile/src/main/java/be/mygod/vpnhotspot/root/MiscCommands.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/root/MiscCommands.kt
@@ -213,8 +213,8 @@ data class SettingsGlobalPut(val name: String, val value: String) : RootCommandN
    override suspend fun execute() = withContext(Dispatchers.IO) {
        val process = ProcessBuilder("settings", "put", "global", name, value).fixPath(true).start()
        val error = process.inputStream.bufferedReader().readText()
-        check(process.waitFor() == 0)
-        if (error.isNotEmpty()) throw RemoteException(error)
+        val exit = process.waitFor()
+        if (exit != 0 || error.isNotEmpty()) throw RemoteException("Process exited with $exit: $error")
        null
    }
 }