1 files changed, 10 insertions, 0 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
index a7a6f3dbef..44996b55b8 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
@@ -77,6 +77,8 @@ class MainActivity : FragmentActivity() {
         }
     }
 
+    var backButtonHandler: (() -> Boolean)? = null
+
     override fun onCreate(savedInstanceState: Bundle?) {
         if (deviceIsTv) {
             setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE)
@@ -122,6 +124,14 @@ class MainActivity : FragmentActivity() {
         setVpnPermission(resultCode == Activity.RESULT_OK)
     }
 
+    override fun onBackPressed() {
+        val handled = backButtonHandler?.invoke() ?: false
+
+        if (!handled) {
+            super.onBackPressed()
+        }
+    }
+
     override fun onStop() {
         android.util.Log.d("mullvad", "Stoping main activity")
         isUiVisible = false