Merge pull request #6032 from opengisch/android_crash_fix

Fix 3.5.0 crashes reported by Googe Play Store
opengisch · Feb 23, 2025 · c8a9bc6 · c8a9bc6 · qfield-fairy · Feb 23, 2025
2 parents 6573c1d + f074876
commit c8a9bc6
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 12 deletions.
diff --git a/platform/android/src/ch/opengis/qfield/QFieldPositioningService.java b/platform/android/src/ch/opengis/qfield/QFieldPositioningService.java
@@ -112,7 +112,7 @@ public void onDestroy() {
     public int onStartCommand(Intent intent, int flags, int startId) {
         Log.v("QFieldPositioningService", "onStartCommand triggered");
 
-        if (intent.hasExtra("content")) {
+        if (intent != null && intent.hasExtra("content")) {
             ClipboardManager clipboard =
                 (ClipboardManager)getSystemService(Context.CLIPBOARD_SERVICE);
             clipboard.setText(intent.getStringExtra("content"));
@@ -156,11 +156,17 @@ public int onStartCommand(Intent intent, int flags, int startId) {
 
         Notification notification = builder.build();
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-            startForeground(NOTIFICATION_ID, notification,
-                            ServiceInfo.FOREGROUND_SERVICE_TYPE_LOCATION);
-        } else {
-            startForeground(NOTIFICATION_ID, notification);
+        try {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+                startForeground(NOTIFICATION_ID, notification,
+                                ServiceInfo.FOREGROUND_SERVICE_TYPE_LOCATION);
+            } else {
+                startForeground(NOTIFICATION_ID, notification);
+            }
+        } catch (SecurityException e) {
+            Log.v("QFieldPositioningService",
+                  "Missing permission to launch the positioning service");
+            return START_NOT_STICKY;
         }
 
         return START_STICKY;

diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -103,7 +103,7 @@ function(create_executable)
   qt_import_plugins(${exe_TARGET} INCLUDE Qt::QSvgPlugin)
   qt_import_plugins(${exe_TARGET} INCLUDE Qt::Core5Compat)
 
-  if(IOS)
+  if(IOS OR CMAKE_SYSTEM_NAME STREQUAL "Darwin")
     target_link_libraries(
       ${exe_TARGET}
       PUBLIC Qt6::QDarwinCameraPermissionPlugin
@@ -121,6 +121,9 @@ function(create_executable)
 
   set_target_properties(${exe_TARGET} PROPERTIES AUTORCC TRUE)
   if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+    # Handles platform-specific tasks, including insuring permission plugins
+    qt_finalize_executable(qfield)
+
     set_target_properties(
       ${exe_TARGET}
       PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "${PROJECT_NAME}"

diff --git a/src/core/qgismobileapp.cpp b/src/core/qgismobileapp.cpp
@@ -688,6 +688,7 @@ void QgisMobileapp::onAfterFirstRendering()
         }
       }
     }
+    rootObjects().first()->setProperty( "sceneLoaded", true );
     mFirstRenderingFlag = false;
   }
 }

diff --git a/src/qml/qgismobileapp.qml b/src/qml/qgismobileapp.qml
@@ -46,10 +46,19 @@ ApplicationWindow {
   Material.theme: Theme.darkTheme ? "Dark" : "Light"
   Material.accent: Theme.mainColor
 
+  property bool sceneLoaded: false
   property bool sceneBorderless: false
   property double sceneTopMargin: platformUtilities.sceneMargins(mainWindow)["top"]
   property double sceneBottomMargin: platformUtilities.sceneMargins(mainWindow)["bottom"]
 
+  onSceneLoadedChanged: {
+    // This requires the scene to be fully loaded not to crash due to possibility of
+    // a thread blocking permission request being thrown
+    if (positioningSettings.positioningActivated) {
+      positionSource.active = true;
+    }
+  }
+
   Timer {
     id: refreshSceneMargins
     running: false
@@ -384,11 +393,13 @@ ApplicationWindow {
     objectName: "positioningSettings"
 
     onPositioningActivatedChanged: {
-      if (positioningActivated) {
-        displayToast(qsTr("Activating positioning service"));
-        positionSource.active = true;
-      } else {
-        positionSource.active = false;
+      if (mainWindow.sceneLoaded) {
+        if (positioningActivated) {
+          displayToast(qsTr("Activating positioning service"));
+          positionSource.active = true;
+        } else {
+          positionSource.active = false;
+        }
       }
     }
   }

diff --git a/test/testdata/control_images/test_projection/expected_test_projection-Darwin.png b/test/testdata/control_images/test_projection/expected_test_projection-Darwin.png
-Original file line number
+Diff line change
@@ Expand Up / @@ -688,6 +688,7 @@ void QgisMobileapp::onAfterFirstRendering() @@
             }
           }
         }
+        rootObjects().first()->setProperty( "sceneLoaded", true );
         mFirstRenderingFlag = false;
       }
     }
@@ Expand Down @@