Workaround Android handling navigation bar's back vs. edge swipe back…

… differently
opengisch · Jan 2, 2025 · d57a1d1 · d57a1d1
1 parent 2bd0b35
commit d57a1d1
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 0 deletions.
diff --git a/platform/android/src/ch/opengis/qfield/QFieldActivity.java b/platform/android/src/ch/opengis/qfield/QFieldActivity.java
@@ -118,6 +118,7 @@ public class QFieldActivity extends QtActivity {
     public static native void openProject(String url);
     public static native void openPath(String path);
 
+    public static native void backPressed();
     public static native void volumeKeyDown(int volumeKeyCode);
     public static native void volumeKeyUp(int volumeKeyCode);
 
@@ -208,6 +209,13 @@ public void onNewIntent(Intent intent) {
         }
     }
 
+    @Override
+    public void onBackPressed() {
+        // Workaround issue handling navigation bar back vs. edge swipe back
+        // gesture
+        backPressed();
+    }
+
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         if (handleVolumeKeys && (keyCode == KeyEvent.KEYCODE_VOLUME_UP ||
@@ -216,6 +224,11 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
             // Forward volume keys' presses to QField
             volumeKeyDown(keyCode);
             return true;
+        } else if (keyCode == KeyEvent.KEYCODE_BACK) {
+            // Workaround issue handling navigation bar back vs. edge swipe back
+            // gesture
+            backPressed();
+            return true;
         }
         return super.onKeyDown(keyCode, event);
     }
@@ -228,6 +241,8 @@ public boolean onKeyUp(int keyCode, KeyEvent event) {
             // Forward volume keys's releases to QField
             volumeKeyUp(keyCode);
             return true;
+        } else if (keyCode == KeyEvent.KEYCODE_BACK) {
+            return true;
         }
         return super.onKeyUp(keyCode, event);
     }

diff --git a/src/core/appinterface.h b/src/core/appinterface.h
@@ -179,6 +179,9 @@ class AppInterface : public QObject
     //! Emitted when a volume key is pressed while QField is set to handle those keys.
     void volumeKeyUp( int volumeKeyCode );
 
+    //! Emitted when the OS 'back' navigation bar or edges swipe gesture has been triggered.
+    void backPressed();
+
   private:
     static AppInterface *sAppInterface;
 

diff --git a/src/core/platforms/android/androidplatformutilities.cpp b/src/core/platforms/android/androidplatformutilities.cpp
@@ -801,6 +801,15 @@ JNIEXPORT void JNICALL JNI_FUNCTION_NAME( APP_PACKAGE_JNI_NAME, QFieldActivity,
 #define ANDROID_VOLUME_DOWN 25
 #define ANDROID_VOLUME_UP 24
 
+JNIEXPORT void JNICALL JNI_FUNCTION_NAME( APP_PACKAGE_JNI_NAME, QFieldActivity, backPressed )( JNIEnv *env, jobject obj )
+{
+  if ( AppInterface::instance() )
+  {
+    emit AppInterface::instance()->backPressed();
+  }
+  return;
+}
+
 JNIEXPORT void JNICALL JNI_FUNCTION_NAME( APP_PACKAGE_JNI_NAME, QFieldActivity, volumeKeyDown )( JNIEnv *env, jobject obj, int volumeKeyCode )
 {
   if ( AppInterface::instance() )

diff --git a/src/qml/qgismobileapp.qml b/src/qml/qgismobileapp.qml
@@ -102,6 +102,7 @@ ApplicationWindow {
   }
 
   Shortcut {
+    id: stackShortcut
     enabled: true
     sequences: ["Escape", StandardKey.Back]
     onActivated: {
@@ -394,6 +395,7 @@ ApplicationWindow {
     id: mapCanvas
     objectName: "mapCanvas"
     clip: true
+    focus: true
 
     DragHandler {
       id: freehandHandler
@@ -3527,6 +3529,10 @@ ApplicationWindow {
   Connections {
     target: iface
 
+    function onBackPressed() {
+      stackShortcut.activated();
+    }
+
     function onVolumeKeyUp(volumeKeyCode) {
       if (stateMachine.state === 'browse' || !mapCanvasMap.isEnabled) {
         return;