Don't prompt to cancel the news feed task on shutdown

If it hasn't completed, just cancel it immediately without prompting users -- it's not essential that it completes (cherry picked from commit da4a195)
qgis · Apr 20, 2020 · 271761e · 271761e
1 parent 468f481
commit 271761e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/python/core/auto_generated/qgsnetworkcontentfetchertask.sip.in b/python/core/auto_generated/qgsnetworkcontentfetchertask.sip.in
@@ -34,15 +34,15 @@ without danger of the task being first removed by the QgsTaskManager.
 %End
   public:
 
-    QgsNetworkContentFetcherTask( const QUrl &url, const QString &authcfg = QString() );
+    QgsNetworkContentFetcherTask( const QUrl &url, const QString &authcfg = QString(), QgsTask::Flags flags = QgsTask::CanCancel );
 %Docstring
 Constructor for a QgsNetworkContentFetcherTask which fetches
 the specified ``url``.
 
 Optionally, authentication configuration can be set via the ``authcfg`` argument.
 %End
 
-    QgsNetworkContentFetcherTask( const QNetworkRequest &request, const QString &authcfg = QString() );
+    QgsNetworkContentFetcherTask( const QNetworkRequest &request, const QString &authcfg = QString(), QgsTask::Flags flags = QgsTask::CanCancel );
 %Docstring
 Constructor for a QgsNetworkContentFetcherTask which fetches
 the specified network ``request``.

diff --git a/src/core/qgsnetworkcontentfetchertask.cpp b/src/core/qgsnetworkcontentfetchertask.cpp
@@ -19,13 +19,13 @@
 #include "qgsnetworkcontentfetchertask.h"
 #include "qgsnetworkcontentfetcher.h"
 
-QgsNetworkContentFetcherTask::QgsNetworkContentFetcherTask( const QUrl &url, const QString &authcfg )
-  : QgsNetworkContentFetcherTask( QNetworkRequest( url ), authcfg )
+QgsNetworkContentFetcherTask::QgsNetworkContentFetcherTask( const QUrl &url, const QString &authcfg, Flags flags )
+  : QgsNetworkContentFetcherTask( QNetworkRequest( url ), authcfg, flags )
 {
 }
 
-QgsNetworkContentFetcherTask::QgsNetworkContentFetcherTask( const QNetworkRequest &request, const QString &authcfg )
-  : QgsTask( tr( "Fetching %1" ).arg( request.url().toString() ) )
+QgsNetworkContentFetcherTask::QgsNetworkContentFetcherTask( const QNetworkRequest &request, const QString &authcfg, Flags flags )
+  : QgsTask( tr( "Fetching %1" ).arg( request.url().toString() ), flags )
   , mRequest( request )
   , mAuthcfg( authcfg )
 {

diff --git a/src/core/qgsnetworkcontentfetchertask.h b/src/core/qgsnetworkcontentfetchertask.h
@@ -56,15 +56,15 @@ class CORE_EXPORT QgsNetworkContentFetcherTask : public QgsTask
      *
      * Optionally, authentication configuration can be set via the \a authcfg argument.
      */
-    QgsNetworkContentFetcherTask( const QUrl &url, const QString &authcfg = QString() );
+    QgsNetworkContentFetcherTask( const QUrl &url, const QString &authcfg = QString(), QgsTask::Flags flags = QgsTask::CanCancel );
 
     /**
      * Constructor for a QgsNetworkContentFetcherTask which fetches
      * the specified network \a request.
      *
      * Optionally, authentication configuration can be set via the \a authcfg argument.
      */
-    QgsNetworkContentFetcherTask( const QNetworkRequest &request, const QString &authcfg = QString() );
+    QgsNetworkContentFetcherTask( const QNetworkRequest &request, const QString &authcfg = QString(), QgsTask::Flags flags = QgsTask::CanCancel );
 
     ~QgsNetworkContentFetcherTask() override;
 

diff --git a/src/core/qgsnewsfeedparser.cpp b/src/core/qgsnewsfeedparser.cpp
@@ -140,7 +140,8 @@ void QgsNewsFeedParser::fetch()
 
   mFetchStartTime = QDateTime::currentDateTimeUtc().toTime_t();
 
-  QgsNetworkContentFetcherTask *task = new QgsNetworkContentFetcherTask( req, mAuthCfg );
+  // allow canceling the news fetching without prompts -- it's not crucial if this gets finished or not
+  QgsNetworkContentFetcherTask *task = new QgsNetworkContentFetcherTask( req, mAuthCfg, QgsTask::CanCancel | QgsTask::CancelWithoutPrompt );
   task->setDescription( tr( "Fetching News Feed" ) );
   connect( task, &QgsNetworkContentFetcherTask::fetched, this, [this, task]
   {