Enforce auto-push settings coming from the project file

opengisch · Feb 28, 2024 · a5f1e82 · a5f1e82
1 parent 60bfd8e
commit a5f1e82
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 4 deletions.
diff --git a/src/core/qfieldcloudprojectsmodel.cpp b/src/core/qfieldcloudprojectsmodel.cpp
@@ -1961,12 +1961,25 @@ void QFieldCloudProjectsModel::projectSetAutoPushEnabled( const QString &project
   if ( projectIndex.isValid() )
   {
     CloudProject *project = mProjects[projectIndex.row()];
-    project->autoPushEnabled = !project->autoPushEnabled;
+    project->autoPushEnabled = enabled;
     QFieldCloudUtils::setProjectSetting( project->id, QStringLiteral( "autoPushEnabled" ), project->autoPushEnabled );
     emit dataChanged( projectIndex, projectIndex, QVector<int>() << AutoPushEnabledRole );
   }
 }
 
+void QFieldCloudProjectsModel::projectSetAutoPushIntervalMins( const QString &projectId, int minutes )
+{
+  const QModelIndex projectIndex = findProjectIndex( projectId );
+
+  if ( projectIndex.isValid() )
+  {
+    CloudProject *project = mProjects[projectIndex.row()];
+    project->autoPushIntervalMins = minutes;
+    QFieldCloudUtils::setProjectSetting( project->id, QStringLiteral( "autoPushIntervalMins" ), project->autoPushIntervalMins );
+    emit dataChanged( projectIndex, projectIndex, QVector<int>() << AutoPushIntervalMinsRole );
+  }
+}
+
 void QFieldCloudProjectsModel::reload( const QJsonArray &remoteProjects )
 {
   beginResetModel();

diff --git a/src/core/qfieldcloudprojectsmodel.h b/src/core/qfieldcloudprojectsmodel.h
@@ -279,6 +279,9 @@ class QFieldCloudProjectsModel : public QAbstractListModel
     //! Toggles the cloud project auto-push enabled state
     Q_INVOKABLE void projectSetAutoPushEnabled( const QString &projectId, bool enabled );
 
+    //! Sets the interval in \a minutes between which the project will auto-push changes
+    Q_INVOKABLE void projectSetAutoPushIntervalMins( const QString &projectId, int minutes );
+
   signals:
     void cloudConnectionChanged();
     void layerObserverChanged();

diff --git a/src/qml/QFieldCloudPopup.qml b/src/qml/QFieldCloudPopup.qml
@@ -476,13 +476,19 @@ Popup {
               bottomPadding: 10
               font: Theme.tipFont
               wrapMode: Text.WordWrap
-              color: autoPush.checked ? Theme.mainTextColor : Theme.secondaryTextColor
+              color: autoPush.checked || autoPush.forceAutoPush ? Theme.mainTextColor : Theme.secondaryTextColor
 
               text:  qsTr('Automatically push changes every %n minute(s)','',0 + cloudProjectsModel.currentProjectData.AutoPushIntervalMins)
 
               MouseArea {
                 anchors.fill: parent
-                onClicked: cloudProjectsModel.projectSetAutoPushEnabled(cloudProjectsModel.currentProjectId, !autoPush.checked)
+                onClicked: {
+                  if (autoPush.forceAutoPush) {
+                    displayToast(qsTr('The current project does not allow for auto-push to be turned off'))
+                  } else {
+                    cloudProjectsModel.projectSetAutoPushEnabled(cloudProjectsModel.currentProjectId, !autoPush.checked)
+                  }
+                }
               }
             }
 
@@ -493,7 +499,9 @@ Popup {
               width: implicitContentWidth
               small: true
 
+              property bool forceAutoPush: false
               checked: !!cloudProjectsModel.currentProjectData.AutoPushEnabled
+
               onClicked:  {
                 cloudProjectsModel.projectSetAutoPushEnabled(cloudProjectsModel.currentProjectId, checked)
               }
@@ -721,4 +729,20 @@ Popup {
     cloudProjectsModel.discardLocalChangesFromCurrentProject(cloudProjectsModel.currentProjectId)
     cloudProjectsModel.downloadProject(cloudProjectsModel.currentProjectId, true)
   }
+
+  function applyAutoPushProjectSettings() {
+    if (cloudProjectsModel.currentProjectId !== '') {
+      const forceAutoPush = iface.readProjectBoolEntry("qfieldsync", "forceAutoPush", false)
+      if (forceAutoPush) {
+        autoPush.forceAutoPush = true
+        autoPush.enabled = false
+        const forceAutoPushIntervalMins = iface.readProjectNumEntry("qfieldsync", "forceAutoPushIntervalMins", 30)
+        cloudProjectsModel.projectSetAutoPushEnabled(cloudProjectsModel.currentProjectId, true)
+        cloudProjectsModel.projectSetAutoPushIntervalMins(cloudProjectsModel.currentProjectId, forceAutoPushIntervalMins)
+      } else {
+        autoPush.forceAutoPush = false
+        autoPush.enabled = true
+      }
+    }
+  }
 }
diff --git a/src/qml/qgismobileapp.qml b/src/qml/qgismobileapp.qml
@@ -3377,7 +3377,7 @@ ApplicationWindow {
 
       recentProjectListModel.reloadModel()
 
-      var cloudProjectId = QFieldCloudUtils.getProjectId(qgisProject.fileName)
+      const cloudProjectId = QFieldCloudUtils.getProjectId(qgisProject.fileName)
       cloudProjectsModel.currentProjectId = cloudProjectId
       cloudProjectsModel.refreshProjectModification(cloudProjectId)
       if (cloudProjectId !== '') {
@@ -3411,6 +3411,8 @@ ApplicationWindow {
         if (cloudConnection.status === QFieldCloudConnection.LoggedIn) {
           cloudProjectsModel.refreshProjectFileOutdatedStatus(cloudProjectId)
         }
+
+        cloudPopup.applyAutoPushProjectSettings();
       } else {
         projectInfo.hasInsertRights = true
         projectInfo.hasEditRights = true