Removed mergin api passing in active project

Implemented code findings

Author: gabriel-bolbotina

app/activeproject.cpp

@@ -21,7 +21,6 @@
 
 #include "activeproject.h"
 #include "coreutils.h"
-#include "merginapi.h"
 
 #ifdef ANDROID
 #include "position/tracking/androidtrackingbroadcast.h"
@@ -33,15 +32,13 @@ const int ActiveProject::LOADING_FLAG_FILE_EXPIRATION_MS = 5000;
 ActiveProject::ActiveProject( AppSettings &appSettings
                               , ActiveLayer &activeLayer
                               , LocalProjectsManager &localProjectsManager
-                              , MerginApi *merginApi
                               , QObject *parent ) :
 
   QObject( parent )
   , mAppSettings( appSettings )
   , mActiveLayer( activeLayer )
   , mAuthManager( QgsApplication::authManager() )
   , mLocalProjectsManager( localProjectsManager )
-  , mMerginApi( merginApi )
   , mProjectLoadingLog( "" )
 {
   // we used to have our own QgsProject instance, but unfortunately few pieces of qgis_core
@@ -215,9 +212,9 @@ bool ActiveProject::forceLoad( const QString &filePath, bool force )
     emit positionTrackingSupportedChanged();
     emit mapSketchesEnabledChanged();
 
-    if ( mLocalProject.isValid() && mMerginApi )
+    if ( mLocalProject.isValid() )
     {
-      mMerginApi->isProjectSyncNeeded( mLocalProject.fullName(), true );
+      emit projectSyncCheckRequested( mLocalProject.fullName(), true );
     }
   }
 
@@ -679,8 +676,8 @@ bool ActiveProject::photoSketchingEnabled() const
 
 void ActiveProject::checkForProjectUpdate()
 {
-  if ( isProjectLoaded() && mMerginApi )
+  if ( isProjectLoaded() )
   {
-    mMerginApi->isProjectSyncNeeded( projectFullName(), true );
+    emit projectSyncCheckRequested( projectFullName(), true );
   }
 }

app/activeproject.h

@@ -25,8 +25,6 @@
 #include "merginprojectmetadata.h"
 #include "synchronizationoptions.h"
 
-class MerginApi;
-
 /**
  * \brief The ActiveProject class can load a QGIS project and holds its data.
  */
@@ -49,7 +47,6 @@ class ActiveProject: public QObject
       AppSettings &appSettings
       , ActiveLayer &activeLayer
       , LocalProjectsManager &localProjectsManager
-      , MerginApi *merginApi
       , QObject *parent = nullptr );
 
     virtual ~ActiveProject();
@@ -172,6 +169,8 @@ class ActiveProject: public QObject
 
     void syncActiveProject( const LocalProject &project, SyncOptions::RequestOrigin requestOrigin );
 
+    void projectSyncCheckRequested( const QString &projectFullName, bool withAuth );
+
     void mapThemeChanged( const QString &mapTheme );
 
     void positionTrackingSupportedChanged();
@@ -226,7 +225,6 @@ class ActiveProject: public QObject
     LocalProject mLocalProject;
 
     AppSettings &mAppSettings;
-    MerginApi *mMerginApi = nullptr;
     ActiveLayer &mActiveLayer;
     QgsAuthManager *mAuthManager = nullptr;
     LocalProjectsManager &mLocalProjectsManager;

app/main.cpp

@@ -532,7 +532,7 @@ int main( int argc, char *argv[] )
   NotificationModel notificationModel;
 
   ActiveLayer al;
-  ActiveProject activeProject( *as, al, localProjectsManager, ma.get() );
+  ActiveProject activeProject( *as, al, localProjectsManager );
   std::unique_ptr<VariablesManager> vm( new VariablesManager( ma.get() ) );
   vm->registerInputExpressionFunctions();
 
@@ -646,6 +646,8 @@ int main( int argc, char *argv[] )
     merginApi->reloadProjectRole( activeProject.projectFullName() );
   } );
 
+  QObject::connect( &activeProject, &ActiveProject::projectSyncCheckRequested, ma.get(), &MerginApi::isProjectSyncNeeded );
+
   QObject::connect( ma.get(), &MerginApi::authChanged, &lambdaContext, [merginApi = ma.get(), &activeProject]()
   {
     if ( activeProject.isProjectLoaded() )

app/test/testactiveproject.cpp

@@ -38,7 +38,7 @@ void TestActiveProject::testProjectValidations()
 
   AppSettings as;
   ActiveLayer activeLayer;
-  ActiveProject activeProject( as, activeLayer, mApi->localProjectsManager(), mApi );
+  ActiveProject activeProject( as, activeLayer, mApi->localProjectsManager() );
 
   QSignalSpy spyReportIssues( &activeProject, &ActiveProject::reportIssue );
   QSignalSpy spyErrorsFound( &activeProject, &ActiveProject::loadingErrorFound );
@@ -63,7 +63,7 @@ void TestActiveProject::testProjectLoadFailure()
 
   AppSettings as;
   ActiveLayer activeLayer;
-  ActiveProject activeProject( as, activeLayer, mApi->localProjectsManager(), mApi );
+  ActiveProject activeProject( as, activeLayer, mApi->localProjectsManager() );
 
   mApi->localProjectsManager().addLocalProject( projectdir, projectname );
 
@@ -83,7 +83,7 @@ void TestActiveProject::testPositionTrackingFlag()
 
   AppSettings as;
   ActiveLayer activeLayer;
-  ActiveProject activeProject( as, activeLayer, mApi->localProjectsManager(), mApi );
+  ActiveProject activeProject( as, activeLayer, mApi->localProjectsManager() );
 
   // project "planes" - tracking not enabled
   QString projectDir = TestUtils::testDataDir() + "/planes/";
@@ -123,7 +123,7 @@ void TestActiveProject::testRecordingAllowed()
 
   AppSettings as;
   ActiveLayer activeLayer;
-  ActiveProject activeProject( as, activeLayer, mApi->localProjectsManager(), mApi );
+  ActiveProject activeProject( as, activeLayer, mApi->localProjectsManager() );
 
   mApi->localProjectsManager().addLocalProject( projectDir, projectFilename );
   QVERIFY( activeProject.load( projectDir + "/" + projectFilename ) );
@@ -171,7 +171,7 @@ void TestActiveProject::testLoadingFlagFileExpiration()
 {
   AppSettings as;
   ActiveLayer activeLayer;
-  ActiveProject activeProject( as, activeLayer, mApi->localProjectsManager(), mApi );
+  ActiveProject activeProject( as, activeLayer, mApi->localProjectsManager() );
 
   // project "planes" - tracking not enabled
   QString projectDir = TestUtils::testDataDir() + "/planes/";
@@ -197,7 +197,7 @@ void TestActiveProject::testLoadingAuthFileFromConfiguration()
 {
   AppSettings appSettings;
   ActiveLayer activeLayer;
-  ActiveProject activeProject( appSettings, activeLayer, mApi->localProjectsManager(), mApi );
+  ActiveProject activeProject( appSettings, activeLayer, mApi->localProjectsManager() );
   QString projectDir = TestUtils::testDataDir() + QStringLiteral( "/project_auth_file/" );
   QString projectName = QStringLiteral( "auth-test.qgz" );
   QString authFile = QDir( projectDir ).filePath( CoreUtils::AUTH_CONFIG_FILENAME );

app/test/testmerginapi.cpp

@@ -2377,7 +2377,8 @@ void TestMerginApi::testAutosync()
   MapThemesModel mtm;
   AppSettings as;
   ActiveLayer al;
-  ActiveProject activeProject( as, al, mApi->localProjectsManager(), mApi );
+  ActiveProject activeProject( as, al, mApi->localProjectsManager() );
+  QObject::connect( &activeProject, &ActiveProject::projectSyncCheckRequested, mApi, &MerginApi::isProjectSyncNeeded );
 
   mApi->localProjectsManager().addLocalProject( projectDir, projectName );
 

core/merginapi.h

@@ -984,7 +984,6 @@ class MerginApi: public QObject
     MerginServerType::ServerType mServerType = MerginServerType::ServerType::OLD;
     QString mServerDiagnosticLogsUrl = MerginApi::sDefaultReportLogUrl;
 
-
     QOAuth2AuthorizationCodeFlow mOauth2Flow;
 #ifdef MOBILE_OS
     QOAuthUriSchemeReplyHandler *mOauth2ReplyHandler = nullptr; // parented by mOauth2Flow