Merge pull request #3462 from MerginMaps/fix-project-opening-anr

Fix ANR when opening project with searchbar focus
MerginMaps · May 28, 2024 · c567e61 · c567e61
2 parents c5f123c + 92e08bb
commit c567e61
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/app/qml/project/MMProjectHomeTab.qml b/app/qml/project/MMProjectHomeTab.qml
@@ -142,6 +142,19 @@ Item {
     }
 
     onOpenProjectRequested: function( projectFilePath ) {
+
+      //
+      // There was an issue when closing the projects controller while having the searchbar textField focused
+      // (not neccessarily with keyboard opened). This is a kind-of workaround and hotfix.
+      // It might be related to https://bugreports.qt.io/browse/QTBUG-123876 as it started
+      // to occur more frequently when we upgraded to Qt 6.6.3
+      //
+      // See https://github.com/MerginMaps/mobile/issues/3027
+      //
+      if ( searchBar.textField.activeFocus ) {
+        searchBar.textField.focus = false
+      }
+
       root.openProjectRequested( projectFilePath )
     }
     onShowLocalChangesRequested: function( projectId ) {

diff --git a/app/qml/project/MMProjectServerTab.qml b/app/qml/project/MMProjectServerTab.qml
@@ -64,6 +64,19 @@ Item {
     }
 
     onOpenProjectRequested: function( projectFilePath ) {
+
+      //
+      // There was an issue when closing the projects controller while having the searchbar textField focused
+      // (not neccessarily with keyboard opened). This is a kind-of workaround and hotfix.
+      // It might be related to https://bugreports.qt.io/browse/QTBUG-123876 as it started
+      // to occur more frequently when we upgraded to Qt 6.6.3
+      //
+      // See https://github.com/MerginMaps/mobile/issues/3027
+      //
+      if ( searchBar.textField.activeFocus ) {
+        searchBar.textField.focus = false
+      }
+
       root.openProjectRequested( projectFilePath )
     }
     onShowLocalChangesRequested: function( projectId ) {