Add force kill option for WebUI process

DerGoogler · DerGoogler · commit c1e6deca683f · 2025-08-19T20:16:08.000+02:00
Introduces a new 'Force Kill WebUI Process' setting, allowing users to immediately terminate the running WebUI X process. This includes UI, data model, repository, and activity logic updates, as well as a corresponding string resource and JavaScript interface support.
diff --git a/app/src/main/java/com/dergoogler/mmrl/wx/ui/activity/webui/WebUIActivity.kt b/app/src/main/java/com/dergoogler/mmrl/wx/ui/activity/webui/WebUIActivity.kt
@@ -86,6 +86,7 @@ class WebUIActivity : WXActivity() {
             appVersionCode = BuildConfig.VERSION_CODE,
             remoteDebug = userPrefs.useWebUiDevUrl,
             enableEruda = userPrefs.enableErudaConsole,
+            forceKillWebUIProcess = userPrefs.forceKillWebUIProcess,
             autoOpenEruda = userPrefs.enableAutoOpenEruda,
             debugDomain = userPrefs.webUiDevUrl,
             userAgentString = userAgent,
diff --git a/app/src/main/java/com/dergoogler/mmrl/wx/ui/screens/settings/DeveloperScreen.kt b/app/src/main/java/com/dergoogler/mmrl/wx/ui/screens/settings/DeveloperScreen.kt
@@ -120,6 +120,14 @@ fun DeveloperScreen() {
                     Description(R.string.settings_security_auto_open_eruda_desc)
                 }
 
+                DeveloperSwitch(
+                    checked = userPreferences.forceKillWebUIProcess,
+                    onChange = viewModel::setForceKillWebUIProcess
+                ) {
+                    Title(R.string.settings_force_kill_webui_process)
+                    Description(R.string.settings_force_kill_webui_process_desc)
+                }
+
                 TextEditDialogItem(
                     enabled = userPreferences.developerMode,
                     value = userPreferences.webUiDevUrl,
diff --git a/app/src/main/java/com/dergoogler/mmrl/wx/viewmodel/SettingsViewModel.kt b/app/src/main/java/com/dergoogler/mmrl/wx/viewmodel/SettingsViewModel.kt
@@ -2,13 +2,12 @@ package com.dergoogler.mmrl.wx.viewmodel
 
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.lifecycle.ViewModel
-import com.dergoogler.mmrl.wx.datastore.UserPreferencesRepository
 import androidx.lifecycle.viewModelScope
 import com.dergoogler.mmrl.datastore.model.DarkMode
-import com.dergoogler.mmrl.datastore.model.Homepage
-import com.dergoogler.mmrl.wx.datastore.model.WebUIEngine
 import com.dergoogler.mmrl.datastore.model.WorkingMode
 import com.dergoogler.mmrl.platform.PlatformManager
+import com.dergoogler.mmrl.wx.datastore.UserPreferencesRepository
+import com.dergoogler.mmrl.wx.datastore.model.WebUIEngine
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
 import javax.inject.Inject
@@ -85,6 +84,12 @@ class SettingsViewModel @Inject constructor(
         }
     }
 
+    fun setForceKillWebUIProcess(value: Boolean) {
+        viewModelScope.launch {
+            userPreferencesRepository.setForceKillWebUIProcess(value)
+        }
+    }
+
     fun setWebUIEngine(value: WebUIEngine) {
         viewModelScope.launch {
             userPreferencesRepository.setWebUIEngine(value)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -127,4 +127,6 @@
     <string name="latest_commit_id">Latest Commit ID</string>
     <string name="build_tools_version">Build Tools Version</string>
     <string name="compile_sdk">Compile SDK</string>
+    <string name="settings_force_kill_webui_process">Force Kill WebUI Process</string>
+    <string name="settings_force_kill_webui_process_desc">Immediately terminates the currently running WebUI X process. [bold]This does not affect KSU WebUI.[/bold]</string>
 </resources>
diff --git a/datastore/src/main/kotlin/com/dergoogler/mmrl/wx/datastore/UserPreferencesDataSource.kt b/datastore/src/main/kotlin/com/dergoogler/mmrl/wx/datastore/UserPreferencesDataSource.kt
@@ -95,6 +95,14 @@ class UserPreferencesDataSource @Inject constructor(
         }
     }
 
+    suspend fun setForceKillWebUIProcess(value: Boolean) = withContext(Dispatchers.IO) {
+        userPreferences.updateData {
+            it.copy(
+                forceKillWebUIProcess = value
+            )
+        }
+    }
+
     suspend fun setWebUIEngine(value: WebUIEngine) = withContext(Dispatchers.IO) {
         userPreferences.updateData {
             it.copy(
diff --git a/datastore/src/main/kotlin/com/dergoogler/mmrl/wx/datastore/UserPreferencesRepository.kt b/datastore/src/main/kotlin/com/dergoogler/mmrl/wx/datastore/UserPreferencesRepository.kt
@@ -2,8 +2,8 @@ package com.dergoogler.mmrl.wx.datastore
 
 import com.dergoogler.mmrl.datastore.model.DarkMode
 import com.dergoogler.mmrl.datastore.model.ModulesMenu
-import com.dergoogler.mmrl.wx.datastore.model.WebUIEngine
 import com.dergoogler.mmrl.datastore.model.WorkingMode
+import com.dergoogler.mmrl.wx.datastore.model.WebUIEngine
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -39,6 +39,9 @@ class UserPreferencesRepository @Inject constructor(
     suspend fun setEnableAutoOpenEruda(value: Boolean) =
         userPreferencesDataSource.setEnableAutoOpenEruda(value)
 
+    suspend fun setForceKillWebUIProcess(value: Boolean) =
+        userPreferencesDataSource.setForceKillWebUIProcess(value)
+
     suspend fun setWebUIEngine(value: WebUIEngine) =
         userPreferencesDataSource.setWebUIEngine(value)
 }
diff --git a/datastore/src/main/kotlin/com/dergoogler/mmrl/wx/datastore/model/UserPreferences.kt b/datastore/src/main/kotlin/com/dergoogler/mmrl/wx/datastore/model/UserPreferences.kt
@@ -36,6 +36,7 @@ data class UserPreferences(
     @ProtoNumber(35) val enableErudaConsole: Boolean = false,
     @ProtoNumber(37) val webuiEngine: WebUIEngine = WebUIEngine.PREFER_MODULE,
     @ProtoNumber(38) val enableAutoOpenEruda: Boolean = false,
+    @ProtoNumber(39) val forceKillWebUIProcess: Boolean = false,
 ) {
     fun isDarkMode() = when (darkMode) {
         DarkMode.AlwaysOff -> false
diff --git a/webui/src/main/kotlin/com/dergoogler/mmrl/webui/activity/WXActivity.kt b/webui/src/main/kotlin/com/dergoogler/mmrl/webui/activity/WXActivity.kt
@@ -1,10 +1,12 @@
 package com.dergoogler.mmrl.webui.activity
 
+import android.app.Activity
 import android.app.ActivityManager
 import android.content.Context
 import android.content.Intent
 import android.graphics.Rect
 import android.os.Bundle
+import android.os.Process
 import android.view.Gravity
 import android.view.View
 import android.view.ViewGroup
@@ -40,6 +42,7 @@ import com.dergoogler.mmrl.webui.view.WXView
 import com.dergoogler.mmrl.webui.view.WebUIXView
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
+import kotlin.system.exitProcess
 
 /**
  * Base activity class for displaying web content using [WXView].
@@ -178,53 +181,55 @@ open class WXActivity : ComponentActivity() {
     private fun registerBackEvents() {
         onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(true) {
             override fun handleOnBackPressed() {
-                view.nullply {
-                    val backHandler = options.config.backHandler
-                    val interceptor = options.config.backInterceptor
+                val options = view?.options ?: return
+                val wx = view?.wx ?: return
 
-                    if (backHandler != true) {
-                        handleNativeBack()
-                        return
-                    }
+                val backHandler = options.config.backHandler
+                val interceptor = options.config.backInterceptor
 
-                    when (interceptor) {
-                        "native" -> handleNativeBack()
-                        "javascript" -> wx.postWXEvent(
-                            WXEventHandler(WXEvent.WX_ON_BACK, null)
-                        )
+                if (backHandler != true) {
+                    handleNativeBack()
+                    return
+                }
 
-                        true -> handleNativeBack()
-                        null -> handleNativeBack()
-                        false -> finish()
-                        else -> finish()
-                    }
+                when (interceptor) {
+                    "native" -> handleNativeBack()
+                    "javascript" -> wx.postWXEvent(
+                        WXEventHandler(WXEvent.WX_ON_BACK, null)
+                    )
+
+                    true -> handleNativeBack()
+                    null -> handleNativeBack()
+                    false -> exit(options)
+                    else -> exit(options)
                 }
             }
         })
     }
 
     private fun handleNativeBack() {
-        view.nullply {
-            if (wx.canGoBack()) {
-                wx.goBack()
-                return
-            }
+        val options = view?.options ?: return
+        val wx = view?.wx ?: return
 
-            if (options.config.exitConfirm) {
-                confirm(
-                    confirmData = ConfirmData(
-                        title = getString(R.string.exit),
-                        description = getString(R.string.exit_desc),
-                        onConfirm = { finish() },
-                        onClose = {}
-                    ),
-                    colorScheme = options.colorScheme
-                )
-                return
-            }
+        if (wx.canGoBack()) {
+            wx.goBack()
+            return
+        }
 
-            finish()
+        if (options.config.exitConfirm) {
+            confirm(
+                confirmData = ConfirmData(
+                    title = getString(R.string.exit),
+                    description = getString(R.string.exit_desc),
+                    onConfirm = { exit(options) },
+                    onClose = {}
+                ),
+                colorScheme = options.colorScheme
+            )
+            return
         }
+
+        exit(options)
     }
 
     @CallSuper
@@ -337,6 +342,17 @@ open class WXActivity : ComponentActivity() {
             this.startActivity(intent)
         }
 
+        internal fun Activity.exit(options: WebUIOptions) {
+            if (!options.forceKillWebUIProcess) {
+                finish()
+                return
+            }
+
+            finish()
+            Process.killProcess(Process.myPid())
+            exitProcess(0)
+        }
+
         /**
          * Launches a new instance of the specified [ComponentActivity] (`T`) as a Web UI.
          *
diff --git a/webui/src/main/kotlin/com/dergoogler/mmrl/webui/interfaces/ApplicationInterface.kt b/webui/src/main/kotlin/com/dergoogler/mmrl/webui/interfaces/ApplicationInterface.kt
@@ -7,6 +7,7 @@ import androidx.annotation.Keep
 import androidx.core.content.pm.PackageInfoCompat
 import com.dergoogler.mmrl.compat.MediaStoreCompat.getPathForUri
 import com.dergoogler.mmrl.platform.PlatformManager
+import com.dergoogler.mmrl.webui.activity.WXActivity.Companion.exit
 import com.dergoogler.mmrl.webui.model.App
 import com.squareup.moshi.JsonClass
 import kotlinx.coroutines.Dispatchers
@@ -21,8 +22,8 @@ class ApplicationInterface(
 
     @JavascriptInterface
     fun exit() {
-        withActivity<Unit> {
-            finish()
+        withActivity {
+            exit(options)
         }
     }
 
diff --git a/webui/src/main/kotlin/com/dergoogler/mmrl/webui/util/rememberWebUIOptions.kt b/webui/src/main/kotlin/com/dergoogler/mmrl/webui/util/rememberWebUIOptions.kt
@@ -73,6 +73,7 @@ data class WebUIOptions(
     val debugDomain: String = "https://127.0.0.1:8080",
     val onUnsafeDomainRequest: ((Uri) -> Unit)? = null,
     val isDarkMode: Boolean = false,
+    val forceKillWebUIProcess: Boolean = false,
     val userAgentString: String = "DON'T TRACK ME DOWN MOTHERFUCKER!",
     val colorScheme: ColorScheme = context.getColorScheme(id = 0, darkMode = isDarkMode),
     val client: ((WebUIOptions, Insets, assetHandlers: List<Pair<String, PathHandler>>) -> WXClient)? = null,

Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,14 @@ class UserPreferencesDataSource @Inject constructor(`
`95`	`95`	`}`
`96`	`96`	`}`
`97`	`97`
	`98`	`+ suspend fun setForceKillWebUIProcess(value: Boolean) = withContext(Dispatchers.IO) {`
	`99`	`+ userPreferences.updateData {`
	`100`	`+ it.copy(`
	`101`	`+ forceKillWebUIProcess = value`
	`102`	`+ )`
	`103`	`+ }`
	`104`	`+ }`
	`105`	`+`
`98`	`106`	`suspend fun setWebUIEngine(value: WebUIEngine) = withContext(Dispatchers.IO) {`
`99`	`107`	`userPreferences.updateData {`
`100`	`108`	`it.copy(`