Ignore content of .qfieldsync folder when seeking project file

opengisch · Jul 20, 2024 · 4397dbb · 4397dbb · qfield-fairy · Jul 20, 2024
1 parent 1fa0323
commit 4397dbb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/platform/android/src/ch/opengis/qfield/QFieldUtils.java b/platform/android/src/ch/opengis/qfield/QFieldUtils.java
@@ -73,7 +73,9 @@ public static String getArchiveProjectName(InputStream in) {
             ZipEntry entry;
             while ((entry = zin.getNextEntry()) != null) {
                 String entryName = entry.getName().toLowerCase();
-                if (entryName.endsWith(".qgs") || entryName.endsWith(".qgz")) {
+                if ((entryName.endsWith(".qgs") ||
+                     entryName.endsWith(".qgz")) &&
+                    !entryName.contains(".qfieldsync")) {
                     projectName = entry.getName();
                     break;
                 }

diff --git a/src/core/appinterface.cpp b/src/core/appinterface.cpp
@@ -125,6 +125,7 @@ bool AppInterface::hasProjectOnLaunch() const
 
 bool AppInterface::loadFile( const QString &path, const QString &name )
 {
+  qInfo() << QStringLiteral( "AppInterface loading file: %1" ).arg( path );
   if ( QFileInfo::exists( path ) )
   {
     return mApp->loadProjectFile( path, name );