Merge branch 'master' into enhancement/measurementTool

.zenodo.json

@@ -2,7 +2,7 @@
     "description": "<p>Mergin Maps mobile app is a QGIS powered app for Android and iOS devices.</p>", 
     "license": "GPLv3", 
     "title": "Mergin Maps mobile app", 
-    "version": "2024.5.0",
+    "version": "2024.4.1",
     "upload_type": "software", 
     "publication_date": "2022-02-24", 
     "creators": [
@@ -39,7 +39,7 @@
     "related_identifiers": [
         {
             "scheme": "url", 
-            "identifier": "https://github.com/MerginMaps/mobile/tree/2024.5.0", 
+            "identifier": "https://github.com/MerginMaps/mobile/tree/2024.4.1", 
             "relation": "isSupplementTo"
         }, 
         {

CITATION.cff

@@ -1,4 +1,4 @@
-cff-version: 2024.5.0
+cff-version: 2024.4.1
 message: "If you use this software, please cite it as below."
 authors:
 - family-names: "Martin"

CMakeLists.txt

@@ -6,8 +6,8 @@ cmake_minimum_required(VERSION 3.22)
 
 # TODO automatically change with the scripts/update version script
 set(MM_VERSION_MAJOR "2024")
-set(MM_VERSION_MINOR "5")
-set(MM_VERSION_PATCH "0")
+set(MM_VERSION_MINOR "4")
+set(MM_VERSION_PATCH "1")
 set(QT_VERSION_DEFAULT "6.6.3")
 
 # Note: we cannot set this for non-android build, since CMake will start looking for

app/CMakeLists.txt

@@ -53,7 +53,6 @@ set(MM_SRCS
     compass.cpp
     featurelayerpair.cpp
     featuresmodel.cpp
-    featuresproxymodel.cpp
     fieldsmodel.cpp
     guidelinecontroller.cpp
     identifykit.cpp
@@ -138,7 +137,6 @@ set(MM_HDRS
     enumhelper.h
     featurelayerpair.h
     featuresmodel.h
-    featuresproxymodel.h
     fieldsmodel.h
     guidelinecontroller.h
     identifykit.h

app/android/src/uk/co/lutraconsulting/PositionTrackingBroadcastMiddleware.java

@@ -10,6 +10,7 @@
 package uk.co.lutraconsulting;
 
 import android.util.Log;
+import android.os.Build;
 
 import android.content.Intent;
 import android.content.Context;
@@ -46,7 +47,12 @@ public void registerBroadcastReceiver( Context context ) {
         intentFilter.addAction( TRACKING_ALIVE_STATUS_ACTION );
 
         // Set this as the receiver of POSITION_UPDATE and STATUS_MESSAGE intent actions
-        context.registerReceiver( serviceMessageReceiver, intentFilter );
+        if ( Build.VERSION.SDK_INT >= 34 ) { // Android 14 ( Upside Down Cake )
+            context.registerReceiver( serviceMessageReceiver, intentFilter, Context.RECEIVER_EXPORTED );
+        }
+        else {
+            context.registerReceiver( serviceMessageReceiver, intentFilter );
+        }
     }
 
     public void unregisterBroadcastReceiver( Context context ) {

app/android/src/uk/co/lutraconsulting/PositionTrackingService.java

@@ -16,6 +16,7 @@
 import android.content.Intent;
 import android.app.PendingIntent;
 import android.content.pm.PackageManager;
+import android.content.pm.ServiceInfo;
 
 import android.app.Notification;
 import android.app.NotificationChannel;
@@ -65,7 +66,7 @@ public void onCreate() {
         File file = new File( getFilesDir(), "tracking_updates.txt" );
 
         sendStatusUpdateMessage( "Tracking file path:" + file.getAbsolutePath() );
-        
+
         try {
             // Open the FileOutputStream in append mode
             positionUpdatesStream = new FileOutputStream(file, true);
@@ -166,7 +167,12 @@ public int onStartCommand( Intent intent, int flags, int startId ) {
 
         Notification notification = notificationBuilder.build();
 
-        startForeground( SERVICE_ID, notification );
+        if ( Build.VERSION.SDK_INT >= 34) { // Android 14 ( Upside Down Cake )
+            startForeground( SERVICE_ID, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_LOCATION );
+        }
+        else {
+            startForeground( SERVICE_ID, notification );
+        }
 
         sendStatusUpdateMessage( "Position tracking: Started the foreground service!" );
 

app/featuresmodel.cpp

@@ -141,7 +141,6 @@ QVariant FeaturesModel::data( const QModelIndex &index, int role ) const
     case LayerName: return pair.layer() ? pair.layer()->name() : QString();
     case LayerIcon: return pair.layer() ? InputUtils::loadIconFromLayer( pair.layer() ) : QString();
     case Qt::DisplayRole: return featureTitle( pair );
-    case SortValue: return sortValue( pair );
   }
 
   return QVariant();
@@ -178,15 +177,6 @@ QVariant FeaturesModel::featureTitle( const FeatureLayerPair &featurePair ) cons
   return title;
 }
 
-QVariant FeaturesModel::sortValue( const FeatureLayerPair &featurePair ) const
-{
-  QgsExpressionContext context( QgsExpressionContextUtils::globalProjectLayerScopes( featurePair.layer() ) );
-  context.setFeature( featurePair.feature() );
-  QgsExpression expr( mSortExpression );
-  QVariant result = expr.evaluate( &context );
-  return result;
-}
-
 QString FeaturesModel::searchResultPair( const FeatureLayerPair &pair ) const
 {
   if ( mSearchExpression.isEmpty() )
@@ -261,6 +251,20 @@ void FeaturesModel::setupFeatureRequest( QgsFeatureRequest &request )
     request.setFilterExpression( buildSearchExpression() );
   }
 
+  if ( mUseAttributeTableSortOrder && mLayer && !mLayer->attributeTableConfig().sortExpression().isEmpty() )
+  {
+    // get a context with global, project and layer scopes
+    // QGIS docs are not very clear, but this context is also used for evaluation of the request's 'order by' expressions too
+    QgsExpressionContext context = mLayer->createExpressionContext();
+    request.setExpressionContext( context );
+    request.setOrderBy( QgsFeatureRequest::OrderBy(
+    {
+      QgsFeatureRequest::OrderByClause(
+      mLayer->attributeTableConfig().sortExpression(),
+      mLayer->attributeTableConfig().sortOrder() == Qt::AscendingOrder )
+    } ) );
+  }
+
   request.setLimit( FEATURES_LIMIT );
 }
 
@@ -290,7 +294,6 @@ QHash<int, QByteArray> FeaturesModel::roleNames() const
   roleNames[SearchResult] = QStringLiteral( "SearchResult" ).toLatin1();
   roleNames[LayerName] = QStringLiteral( "LayerName" ).toLatin1();
   roleNames[LayerIcon] = QStringLiteral( "LayerIcon" ).toLatin1();
-  roleNames[SortValue] = QStringLiteral( "SortValue" ).toLatin1();
   return roleNames;
 }
 
@@ -363,7 +366,6 @@ void FeaturesModel::setLayer( QgsVectorLayer *newLayer )
     }
 
     mLayer = newLayer;
-    setupSorting();
     emit layerChanged( mLayer );
 
     if ( mLayer )
@@ -384,19 +386,3 @@ QgsVectorLayer *FeaturesModel::layer() const
 {
   return mLayer;
 }
-
-void FeaturesModel::setupSorting()
-{
-  mSortExpression = mLayer ? mLayer->attributeTableConfig().sortExpression() : QString();
-  mSortOrder = mLayer ? mLayer->attributeTableConfig().sortOrder() : Qt::AscendingOrder;
-}
-
-bool FeaturesModel::sortingEnabled() const
-{
-  return !mSortExpression.isEmpty();
-}
-
-Qt::SortOrder FeaturesModel::sortOrder() const
-{
-  return mSortOrder;
-}

app/featuresmodel.h

@@ -52,6 +52,9 @@ class FeaturesModel : public QAbstractListModel
     // Name of the property is intentionally `count` so that it matches ListModel's count property
     Q_PROPERTY( int count READ count NOTIFY countChanged )
 
+    // Returns if the model should be sorted according to the layer's attribute table configuration sort order
+    Q_PROPERTY( bool useAttributeTableSortOrder MEMBER mUseAttributeTableSortOrder )
+
   public:
 
     enum ModelRoles
@@ -64,7 +67,6 @@ class FeaturesModel : public QAbstractListModel
       SearchResult, // pair of attribute and its value by which the feature was found, empty if search expression is empty
       LayerName,
       LayerIcon,
-      SortValue,
     };
     Q_ENUM( ModelRoles );
 
@@ -118,15 +120,6 @@ class FeaturesModel : public QAbstractListModel
 
     int layerFeaturesCount() const;
 
-    //! Populates the sort expression and sort order for the model
-    virtual void setupSorting();
-
-    //! Returns true if there is a sort expression set for the model
-    bool sortingEnabled() const;
-
-    //! Returns the order in witch the model should be sorted
-    Qt::SortOrder sortOrder() const;
-
   signals:
 
     void featuresLimitChanged( int featuresLimit );
@@ -149,9 +142,6 @@ class FeaturesModel : public QAbstractListModel
 
     virtual QVariant featureTitle( const FeatureLayerPair &featurePair ) const;
 
-    QString mSortExpression;
-    Qt::SortOrder mSortOrder = Qt::AscendingOrder;
-
   private slots:
     void onFutureFinished();
 
@@ -164,9 +154,6 @@ class FeaturesModel : public QAbstractListModel
     //! Returns found attribute and its value from search expression for feature
     QString searchResultPair( const FeatureLayerPair &feat ) const;
 
-    //! Evaluates the sort expression and returns the value used for this feature when sorting the model
-    QVariant sortValue( const FeatureLayerPair &featurePair ) const;
-
     const int FEATURES_LIMIT = 10000; //!< Number of maximum features loaded from layer
 
     FeatureLayerPairs mFeatures;
@@ -176,6 +163,9 @@ class FeaturesModel : public QAbstractListModel
     QAtomicInt mNextSearchId = 0;
     QFutureWatcher<QgsFeatureList> mSearchResultWatcher;
     bool mFetchingResults = false;
+    bool mUseAttributeTableSortOrder = false;
+
+    friend class TestModels;
 };
 
 #endif // FEATURESMODEL_H

app/i18n/input_en.ts

@@ -156,7 +156,7 @@
 <context>
     <name>FeaturesModel</name>
     <message>
-        <location filename="../featuresmodel.cpp" line="165"/>
+        <location filename="../featuresmodel.cpp" line="164"/>
         <source>Unknown title</source>
         <translation type="unfinished"></translation>
     </message>
@@ -735,7 +735,7 @@ Won&apos;t be added to the project.</source>
 <context>
     <name>MMFeaturesListPage</name>
     <message>
-        <location filename="../qml/layers/MMFeaturesListPage.qml" line="96"/>
+        <location filename="../qml/layers/MMFeaturesListPage.qml" line="94"/>
         <source>Add feature</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2791,12 +2791,12 @@ only allows up to %1 downloaded projects.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="539"/>
+        <location filename="../main.cpp" line="537"/>
         <source>Report submitted. Please contact us on %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="544"/>
+        <location filename="../main.cpp" line="542"/>
         <source>Failed to submit report. Please check your internet connection.</source>
         <translation type="unfinished"></translation>
     </message>