From 26fd9151106b246089cb2006cdaf1a4b5a08be92 Mon Sep 17 00:00:00 2001
From: Mathieu Moran <mathieumoran1@gmail.com>
Date: Sat, 15 Aug 2026 20:37:36 -0400
Subject: [PATCH] fix(android): system back from trip replay returns to the
 list

---
 .../main/java/com/yarisobd/app/MainActivity.kt    | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/android/app/src/main/java/com/yarisobd/app/MainActivity.kt b/android/app/src/main/java/com/yarisobd/app/MainActivity.kt
index 7f930e4..b69b1b0 100644
--- a/android/app/src/main/java/com/yarisobd/app/MainActivity.kt
+++ b/android/app/src/main/java/com/yarisobd/app/MainActivity.kt
@@ -2,6 +2,7 @@ package com.yarisobd.app
 
 import android.os.Bundle
 import androidx.activity.ComponentActivity
+import androidx.activity.compose.BackHandler
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.compose.foundation.layout.Column
@@ -117,6 +118,20 @@ fun YarisMainScreen(client: OkHttpClient) {
         }
     }
 
+    // System back from a trip replay returns to the list instead of exiting.
+    BackHandler(enabled = selectedTrip != null || selectedPortalTrip != null) {
+        when {
+            selectedTrip != null -> {
+                selectedTrip = null
+                tripVm.clearRoute()
+            }
+            selectedPortalTrip != null -> {
+                selectedPortalTrip = null
+                portalVm.clearRoute()
+            }
+        }
+    }
+
     if (selectedTrip != null) {
         TripReplayScreen(
             trip = selectedTrip!!,