From 3f897bdff5a2220d9cdc6ab898f45b153cd23375 Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Wed, 3 Sep 2025 01:10:56 +0200
Subject: [PATCH] UI: attempt to fix #2508

---
 src/Logic/Web/AndroidPolyfill.ts | 6 +++++-
 src/UI/AllThemesGui.svelte       | 6 ++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/Logic/Web/AndroidPolyfill.ts b/src/Logic/Web/AndroidPolyfill.ts
index 57436c6a2..b92e07b2b 100644
--- a/src/Logic/Web/AndroidPolyfill.ts
+++ b/src/Logic/Web/AndroidPolyfill.ts
@@ -120,7 +120,7 @@ export class AndroidPolyfill {
             if (typeof v === "string") {
                 v = JSON.parse(v)
             }
-            console.log("Got inset sizes:", result)
+            console.log("Got inset sizes:", JSON.stringify(result))
             insets.bottom.set(v.bottom / window.devicePixelRatio)
             insets.top.set(v.top / window.devicePixelRatio)
         })
@@ -186,4 +186,8 @@ export class AndroidPolyfill {
             }
         )
     }
+
+    static exit() {
+        this.databridgePlugin.request({key: "exit"})
+    }
 }
diff --git a/src/UI/AllThemesGui.svelte b/src/UI/AllThemesGui.svelte
index 483898bfa..61a0cdbdb 100644
--- a/src/UI/AllThemesGui.svelte
+++ b/src/UI/AllThemesGui.svelte
@@ -122,10 +122,16 @@
 
   AndroidPolyfill.onBackButton(
     () => {
+      console.log("AllThemesGui received a backbutton from Android")
+      if(guistate.closeAll()){
+        return true
+      }
       if (searchIsFocussed.data) {
         searchIsFocussed.set(false)
         return true
       }
+      // We'll probably want to exit the app
+      AndroidPolyfill.exit()
       return false
     },
     { returnToIndex: new ImmutableStore(false) }