fix closing on back in android

Suwayomi · Aug 27, 2022 · 696683c · 696683c
1 parent 0689a85
commit 696683c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/src/qml/ApplicationContent.qml b/src/qml/ApplicationContent.qml
@@ -10,9 +10,13 @@ Item {
   }
 
   function back() {
-    stack.item.depth <= 1 ? stack.item.canClose = true : stack.item.canClose = false
+    stack.item.depth() <= 1 ? stack.item.canClose = true : stack.item.canClose = false
     stack.item.pop()
-    stack.item.depth > 1 ? stack.item.navigationVisible = false : stack.item.navigationVisible = true
+    stack.item.depth() > 1 ? stack.item.navigationVisible = false : stack.item.navigationVisible = true
+  }
+
+  function canExit() {
+    return stack.item.canClose
   }
 
   Loader {

diff --git a/src/qml/NavigationStack.qml b/src/qml/NavigationStack.qml
@@ -13,6 +13,10 @@ Item {
     stack.pop()
   }
 
+  function depth() {
+    return stack.depth
+  }
+
   function navigateHome() {
     if (stack.currentItem.url.toString() !== stack.initialItem.toString()) {
       stack.replace(null, stack.initialItem, {
@@ -22,7 +26,6 @@ Item {
   }
 
   function navigatePage(source, properties) {
-    canClose = false
     if (stack.currentItem && stack.currentItem.url
       && Qt.resolvedUrl(stack.currentItem.url) === Qt.resolvedUrl(source))
     {

diff --git a/src/qml/main.qml b/src/qml/main.qml
@@ -39,12 +39,12 @@ ApplicationWindow {
   }
 
   onClosing: (close) => {
-    if (Qt.platform.os != "android" || ac.canClose) {
+    if (Qt.platform.os != "android" || ac.canExit()) {
       close.accepted = true
       Qt.quit()
-    } else {
-      close.accepted = false
+      return
     }
+    close.accepted = false
   }
 
   ApplicationContent {