Address review comments, don't store username if anonymize_saved_proj…

…ects is true
qgis · Jan 21, 2020 · b14997d · b14997d
1 parent 8f1a5f7
commit b14997d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/resources/qgis_global_settings.ini b/resources/qgis_global_settings.ini
@@ -111,6 +111,10 @@ gps\stop_bits=OneStop
 # will not be automatically populated when a new project is created.
 projects\anonymize_new_projects=false
 
+# Whether or not to anonymize projects when saving
+# If set to 1, then username information will not be stored in saved projects
+projects\anonymize_saved_projects=false
+
 # News feed settings
 # Set to true to disable the QGIS news feed on the welcome page
 NewsFeed\http00008000\disabled=false

diff --git a/src/core/qgsproject.cpp b/src/core/qgsproject.cpp
@@ -912,7 +912,7 @@ static void _getTitle( const QDomDocument &doc, QString &title )
 
 }
 
-static void getProjectMetadata( const QDomDocument &doc, QString &lastUser, QString &lastUserFull )
+static void readProjectFileMetadata( const QDomDocument &doc, QString &lastUser, QString &lastUserFull )
 {
   QDomNodeList nl = doc.elementsByTagName( QStringLiteral( "qgis" ) );
 
@@ -925,8 +925,8 @@ static void getProjectMetadata( const QDomDocument &doc, QString &lastUser, QStr
   QDomNode qgisNode = nl.item( 0 ); // there should only be one, so zeroth element OK
 
   QDomElement qgisElement = qgisNode.toElement(); // qgis node should be element
-  lastUser = qgisElement.attribute( QStringLiteral( "save-user" ), QString() );
+  lastUser = qgisElement.attribute( QStringLiteral( "saveUser" ), QString() );
-  lastUserFull = qgisElement.attribute( QStringLiteral( "save-user-full" ), QString() );
+  lastUserFull = qgisElement.attribute( QStringLiteral( "saveUserFull" ), QString() );
 }
 
 
@@ -1265,7 +1265,7 @@ bool QgsProject::readProjectFile( const QString &filename, QgsProject::ReadFlags
   QString oldTitle;
   _getTitle( *doc, oldTitle );
 
-  getProjectMetadata( *doc, mSaveUser, mSaveUserFull );
+  readProjectFileMetadata( *doc, mSaveUser, mSaveUserFull );
 
   QDomNodeList homePathNl = doc->elementsByTagName( QStringLiteral( "homePath" ) );
   if ( homePathNl.count() > 0 )
@@ -1986,10 +1986,15 @@ bool QgsProject::writeProjectFile( const QString &filename )
   QDomElement qgisNode = doc->createElement( QStringLiteral( "qgis" ) );
   qgisNode.setAttribute( QStringLiteral( "projectname" ), title() );
   qgisNode.setAttribute( QStringLiteral( "version" ), QStringLiteral( "%1" ).arg( Qgis::version() ) );
-  QString newSaveUser = QgsApplication::userLoginName();
+
-  QString newSaveUserFull = QgsApplication::userFullName();
+  QgsSettings settings;
-  qgisNode.setAttribute( QStringLiteral( "save-user" ), newSaveUser );
+  if ( !settings.value( QStringLiteral( "projects/anonymize_saved_projects" ), false, QgsSettings::Core ).toBool() )
-  qgisNode.setAttribute( QStringLiteral( "save-user-full" ), newSaveUserFull );
+  {
+    QString newSaveUser = QgsApplication::userLoginName();
+    QString newSaveUserFull = QgsApplication::userFullName();
+    qgisNode.setAttribute( QStringLiteral( "saveUser" ), newSaveUser );
+    qgisNode.setAttribute( QStringLiteral( "saveUserFull" ), newSaveUserFull );
+  }
   doc->appendChild( qgisNode );
 
   QDomElement homePathNode = doc->createElement( QStringLiteral( "homePath" ) );