From a8b41bdfd84fb348f92414c571f1b6b6033cbe1b Mon Sep 17 00:00:00 2001 From: charlie Date: Thu, 21 May 2026 14:14:06 +0800 Subject: [PATCH] Revert "fix(android): finish activity at native root back" This reverts commit 3a21c8bc7f9102f83a85f0be21dc55174772f2b9. --- .../main/java/com/logseq/app/MainActivity.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/android/app/src/main/java/com/logseq/app/MainActivity.java b/android/app/src/main/java/com/logseq/app/MainActivity.java index 83117b3731..10f3e39200 100644 --- a/android/app/src/main/java/com/logseq/app/MainActivity.java +++ b/android/app/src/main/java/com/logseq/app/MainActivity.java @@ -229,17 +229,15 @@ public class MainActivity extends BridgeActivity { WebView webView = getBridge().getWebView(); if (webView != null) { NavigationRenderState nativePopState = navigationCoordinator.prepareNativePop(); - if (nativePopState == null) { - finish(); - return; + if (nativePopState != null) { + Log.d( + "NavStack", + NAV_STACK_DEBUG_PREFIX + " activity.nativeBack consumed=native-stack-pop target=" + + nativePopState.getPath() + + " paths=" + nativePopState.getPaths() + ); + ComposeHost.applyNavigation(nativePopState); } - Log.d( - "NavStack", - NAV_STACK_DEBUG_PREFIX + " activity.nativeBack consumed=native-stack-pop target=" - + nativePopState.getPath() - + " paths=" + nativePopState.getPaths() - ); - ComposeHost.applyNavigation(nativePopState); // Send "native back" into JS. JS will call your UILocal/route-change, // which flows into ComposeHost.applyNavigation(...) and animates. sendJsBack(webView);