csync: Do not wipe the db file name when cleaning csync_ctx.

The name of the db is only set in the constructor of the SyncEngine
and never again. If we wipe it, subsequent operations can not open
the database through csync. For example csync_update does that.

This problem was found after the client reported a csync error
after changing the selective sync list.

admin/win/nsi/l10n/Dutch.nsh

@@ -1,5 +1,5 @@
 # Auto-generated - do not modify
-StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Toon opmerkingen bij deze versie"
+StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Toon opmerkingen bij deze uitgave"
 StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Gevonden ${APPLICATION_EXECUTABLE} proces(sen) moet worden gestopt.$\nWilt u dat het installatieprogramma dat voor u doet?"
 StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Stoppen ${APPLICATION_EXECUTABLE} processen."
 StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Het te stoppen proces is niet gevonden!"

csync/src/csync.c

@@ -521,7 +521,6 @@ static void _csync_clean_ctx(CSYNC *ctx)
     c_rbtree_free(ctx->local.tree);
     c_rbtree_free(ctx->remote.tree);
 
-    SAFE_FREE(ctx->statedb.file);
     SAFE_FREE(ctx->remote.root_perms);
 }
 

csync/src/csync_rename.cc

@@ -20,7 +20,6 @@
 
 extern "C" {
 #include "csync_private.h"
-#include "csync_rename.h"
 }
 
 #include <map>
@@ -94,9 +93,5 @@ char* csync_rename_adjust_path_source(CSYNC* ctx, const char* path)
     return c_strdup(path);
 }
 
-bool csync_rename_count(CSYNC *ctx) {
-    csync_rename_s* d = csync_rename_s::get(ctx);
-    return d->folder_renamed_from.size();
-}
 
 }

csync/src/csync_rename.h

@@ -32,8 +32,6 @@ char OCSYNC_EXPORT *csync_rename_adjust_path(CSYNC *ctx, const char *path);
 char OCSYNC_EXPORT *csync_rename_adjust_path_source(CSYNC *ctx, const char *path);
 void OCSYNC_EXPORT csync_rename_destroy(CSYNC *ctx);
 void OCSYNC_EXPORT csync_rename_record(CSYNC *ctx, const char *from, const char *to);
-/*  Return the amount of renamed item recorded */
-bool OCSYNC_EXPORT csync_rename_count(CSYNC *ctx);
 
 #ifdef __cplusplus
 }

doc/architecture.rst

@@ -199,6 +199,12 @@ the database by comparing the files and their modification times. This process
 ensures that both server and client are synchronized using the appropriate NTP
 time before restarting the client following a database removal.
 
+Pressing ``F5`` while in the Account Settings Dialog enables you to "reset" the
+journal. This function can be used to recreate the journal database.
+
+.. note:: We recommend that you use this function only when advised to do so by
+   ownCloud support staff.
+
 Custom WebDAV Properties
 ------------------------
 

src/gui/accountmanager.cpp

@@ -209,13 +209,6 @@ void AccountManager::saveAccountHelper(Account* acc, QSettings& settings, bool s
 
 AccountPtr AccountManager::loadAccountHelper(QSettings& settings)
 {
-    auto urlConfig = settings.value(QLatin1String(urlC));
-    if (!urlConfig.isValid()) {
-        // No URL probably means a corrupted entry in the account settings
-        qDebug() << "No URL for account " << settings.group();
-        return AccountPtr();
-    }
-
     auto acc = createAccount();
 
     QString authType = settings.value(QLatin1String(authTypeC)).toString();
@@ -227,7 +220,7 @@ AccountPtr AccountManager::loadAccountHelper(QSettings& settings)
         acc->setUrl(overrideUrl);
         authType = forceAuth;
     } else {
-        acc->setUrl(urlConfig.toUrl());
+        acc->setUrl(settings.value(QLatin1String(urlC)).toUrl());
     }
     acc->_serverVersion = settings.value(QLatin1String(serverVersionC)).toString();
 

src/gui/application.cpp

@@ -336,13 +336,8 @@ void Application::slotownCloudWizardDone( int res )
         _checkConnectionTimer.start();
         slotCheckConnection();
 
-        // If one account is configured: enable autostart
-        bool shouldSetAutoStart = (accountMan->accounts().size() == 1);
-#ifdef Q_OS_MAC
-        // Don't auto start when not being 'installed'
-        shouldSetAutoStart = shouldSetAutoStart
-                && QCoreApplication::applicationDirPath().startsWith("/Applications/");
-#endif
+        // The very first time an account is configured: enabled autostart
+        // TODO: Doing this every time the account wizard finishes will annoy users.
         Utility::setLaunchOnStartup(_theme->appName(), _theme->appNameGUI(), true);
     }
 }

src/gui/folder.cpp

@@ -188,7 +188,7 @@ QString Folder::shortGuiLocalPath() const
 }
 
 
-bool Folder::ignoreHiddenFiles() const
+bool Folder::ignoreHiddenFiles()
 {
     bool re(_definition.ignoreHiddenFiles);
     return re;

src/gui/folder.h

@@ -167,7 +167,7 @@ public:
       * Ignore syncing of hidden files or not. This is defined in the
       * folder definition
       */
-     bool ignoreHiddenFiles() const;
+     bool ignoreHiddenFiles();
      void setIgnoreHiddenFiles(bool ignore);
 
      // Used by the Socket API

src/gui/folderwatcher_linux.cpp

@@ -23,7 +23,6 @@
 #include <QStringList>
 #include <QObject>
 #include <QVarLengthArray>
-#include <syncengine.h>
 
 namespace OCC {
 
@@ -49,6 +48,31 @@ FolderWatcherPrivate::~FolderWatcherPrivate()
 
 }
 
+// attention: result list passed by reference!
+bool FolderWatcherPrivate::findFoldersBelow( const QDir& dir, QStringList& fullList )
+{
+    bool ok = true;
+    if( !(dir.exists() && dir.isReadable()) ) {
+        qDebug() << "Non existing path coming in: " << dir.absolutePath();
+        ok = false;
+    } else {
+        QStringList nameFilter;
+        nameFilter << QLatin1String("*");
+        QDir::Filters filter = QDir::Dirs | QDir::NoDotAndDotDot | QDir::NoSymLinks | QDir::Hidden;
+        const QStringList pathes = dir.entryList(nameFilter, filter);
+
+        QStringList::const_iterator constIterator;
+        for (constIterator = pathes.constBegin(); constIterator != pathes.constEnd();
+               ++constIterator) {
+            const QString fullPath(dir.path()+QLatin1String("/")+(*constIterator));
+            fullList.append(fullPath);
+            ok = findFoldersBelow(QDir(fullPath), fullList);
+        }
+    }
+
+    return ok;
+}
+
 void FolderWatcherPrivate::inotifyRegisterPath(const QString& path)
 {
     if( !path.isEmpty()) {
@@ -64,46 +88,40 @@ void FolderWatcherPrivate::inotifyRegisterPath(const QString& path)
 
 void FolderWatcherPrivate::slotAddFolderRecursive(const QString &path)
 {
+    int subdirs = 0;
     qDebug() << "(+) Watcher:" << path;
+
+    QDir inPath(path);
+    inotifyRegisterPath(inPath.absolutePath());
+
     const QStringList watchedFolders = _watches.values();
-    int subdirs = addFolderRecursiveHelper(path, watchedFolders.toSet());
-    if (subdirs >0) {
-        qDebug() << "    `-> and" << subdirs << "subdirectories";
+
+    QStringList allSubfolders;
+    if( !findFoldersBelow(QDir(path), allSubfolders)) {
+        qDebug() << "Could not traverse all sub folders";
     }
-}
-
-int FolderWatcherPrivate::addFolderRecursiveHelper(const QString &path, const QSet<QString> &watchedFolders)
-{
-    QDir dir(path);
-    if( !(dir.exists() && dir.isReadable()) ) {
-        qDebug() << "Non existing path coming in: " << dir.absolutePath();
-        return 0;
-    }
-    int subdirs = 1;
-
-    inotifyRegisterPath(dir.absolutePath());
-
-    QDir::Filters filter = QDir::Dirs | QDir::NoDotAndDotDot | QDir::NoSymLinks | QDir::Hidden;
-    const QStringList pathes = dir.entryList(filter);
-    for (auto constIterator = pathes.constBegin(); constIterator != pathes.constEnd(); ++constIterator) {
-        const QString subfolder = path + QLatin1String("/") + (*constIterator);
-        QDir folder(subfolder);
-        if (folder.exists() && !watchedFolders.contains(subfolder)) {
-#ifndef OWNCLOUD_TEST // InotifyWatcherTest is not interested in ignored files and does not link against the folder
-            if( _parent->_folder->syncEngine().excludedFiles().isExcluded(
-                    subfolder, path, _parent->_folder->ignoreHiddenFiles())) {
+    // qDebug() << "currently watching " << watchedFolders;
+    QStringListIterator subfoldersIt(allSubfolders);
+    while (subfoldersIt.hasNext()) {
+        QString subfolder = subfoldersIt.next();
+        // qDebug() << "  (**) subfolder: " << subfolder;
+        QDir folder (subfolder);
+        if (folder.exists() && !watchedFolders.contains(folder.absolutePath())) {
+            subdirs++;
+            if( _parent->pathIsIgnored(subfolder) ) {
                 qDebug() << "* Not adding" << folder.path();
                 continue;
             }
-#endif
-            subdirs += addFolderRecursiveHelper(subfolder, watchedFolders);
+            inotifyRegisterPath(folder.absolutePath());
         } else {
             qDebug() << "    `-> discarded:" << folder.path();
         }
     }
-    return subdirs;
-}
 
+    if (subdirs >0) {
+        qDebug() << "    `-> and" << subdirs << "subdirectories";
+    }
+}
 
 void FolderWatcherPrivate::slotReceivedNotification(int fd)
 {

src/gui/folderwatcher_linux.h

@@ -33,6 +33,7 @@ class FolderWatcherPrivate : public QObject
 {
     Q_OBJECT
 public:
+    FolderWatcherPrivate() { }
     FolderWatcherPrivate(FolderWatcher *p, const QString &path);
     ~FolderWatcherPrivate();
 
@@ -44,9 +45,10 @@ protected slots:
     void slotAddFolderRecursive(const QString &path);
 
 protected:
-    int addFolderRecursiveHelper(const QString &path, const QSet<QString> &watchedFolders);
+    bool findFoldersBelow( const QDir& dir, QStringList& fullList );
     void inotifyRegisterPath(const QString& path);
 
+private:
     FolderWatcher *_parent;
 
     QString _folder;

src/gui/owncloudgui.cpp

@@ -67,7 +67,7 @@ ownCloudGui::ownCloudGui(Application *parent) :
     _tray->setParent(this);
 
     // for the beginning, set the offline icon until the account was verified
-    _tray->setIcon( Theme::instance()->folderOfflineIcon(/*systray?*/ true, /*currently visible?*/ false));
+    _tray->setIcon( Theme::instance()->folderOfflineIcon(true));
 
     connect(_tray.data(), SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
             SLOT(slotTrayClicked(QSystemTrayIcon::ActivationReason)));
@@ -262,7 +262,7 @@ void ownCloudGui::slotComputeOverallSyncStatus()
     }
 
     if (!problemAccounts.empty()) {
-        _tray->setIcon(Theme::instance()->folderOfflineIcon(true, contextMenuVisible()));
+        _tray->setIcon(Theme::instance()->folderOfflineIcon(true));
 #ifdef Q_OS_WIN
         // Windows has a 128-char tray tooltip length limit.
         QStringList accountNames;
@@ -289,11 +289,11 @@ void ownCloudGui::slotComputeOverallSyncStatus()
     }
 
     if (allSignedOut) {
-        _tray->setIcon(Theme::instance()->folderOfflineIcon(true, contextMenuVisible()));
+        _tray->setIcon(Theme::instance()->folderOfflineIcon(true));
         _tray->setToolTip(tr("Please sign in"));
         return;
     } else if (allPaused) {
-        _tray->setIcon(Theme::instance()->syncStateIcon(SyncResult::Paused, true, contextMenuVisible()));
+        _tray->setIcon(Theme::instance()->syncStateIcon(SyncResult::Paused, true));
         _tray->setToolTip(tr("Account synchronization is disabled"));
         return;
     }
@@ -323,12 +323,12 @@ void ownCloudGui::slotComputeOverallSyncStatus()
             trayMessage = tr("No sync folders configured.");
         }
 
-        QIcon statusIcon = Theme::instance()->syncStateIcon( overallResult.status(), true, contextMenuVisible());
+        QIcon statusIcon = Theme::instance()->syncStateIcon( overallResult.status(), true);
         _tray->setIcon( statusIcon );
         _tray->setToolTip(trayMessage);
     } else {
         // undefined because there are no folders.
-        QIcon icon = Theme::instance()->syncStateIcon(SyncResult::Problem, true, contextMenuVisible());
+        QIcon icon = Theme::instance()->syncStateIcon(SyncResult::Problem, true);
         _tray->setIcon( icon );
         _tray->setToolTip(tr("There are no sync folders configured."));
     }
@@ -405,9 +405,6 @@ void ownCloudGui::slotContextMenuAboutToShow()
     // For some reason on OS X _contextMenu->isVisible returns always false
     qDebug() << "";
     _contextMenuVisibleOsx = true;
-
-    // Update icon in sys tray, as it might change depending on the context menu state
-    slotComputeOverallSyncStatus();
 }
 
 void ownCloudGui::slotContextMenuAboutToHide()
@@ -415,9 +412,6 @@ void ownCloudGui::slotContextMenuAboutToHide()
     // For some reason on OS X _contextMenu->isVisible returns always false
     qDebug() << "";
     _contextMenuVisibleOsx = false;
-
-    // Update icon in sys tray, as it might change depending on the context menu state
-    slotComputeOverallSyncStatus();
 }
 
 bool ownCloudGui::contextMenuVisible() const

src/gui/wizard/owncloudadvancedsetuppage.ui

@@ -267,12 +267,6 @@
          <layout class="QHBoxLayout" name="horizontalLayout">
           <item>
            <widget class="QRadioButton" name="rSelectiveSync">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
             <property name="text">
              <string/>
             </property>

src/libsync/discoveryphase.cpp

@@ -14,7 +14,6 @@
 
 #include "discoveryphase.h"
 #include <csync_private.h>
-#include <csync_rename.h>
 #include <qdebug.h>
 
 #include <QUrl>
@@ -52,7 +51,7 @@ static bool findPathInList(const QStringList &list, const QString &path)
     return pathSlash.startsWith(*it);
 }
 
-bool DiscoveryJob::isInSelectiveSyncBlackList(const char *path) const
+bool DiscoveryJob::isInSelectiveSyncBlackList(const QString& path) const
 {
     if (_selectiveSyncBlackList.isEmpty()) {
         // If there is no black list, everything is allowed
@@ -60,25 +59,13 @@ bool DiscoveryJob::isInSelectiveSyncBlackList(const char *path) const
     }
 
     // Block if it is in the black list
-    if (findPathInList(_selectiveSyncBlackList, QString::fromUtf8(path))) {
-        return true;
-    }
+    return findPathInList(_selectiveSyncBlackList, path);
 
-    // Also try to adjust the path if there was renames
-    if (csync_rename_count(_csync_ctx)) {
-        QScopedPointer<char, QScopedPointerPodDeleter> adjusted(
-            csync_rename_adjust_path_source(_csync_ctx, path));
-        if (strcmp(adjusted.data(), path) != 0) {
-            return findPathInList(_selectiveSyncBlackList, QString::fromUtf8(adjusted.data()));
-        }
-    }
-
-    return false;
 }
 
 int DiscoveryJob::isInSelectiveSyncBlackListCallback(void *data, const char *path)
 {
-    return static_cast<DiscoveryJob*>(data)->isInSelectiveSyncBlackList(path);
+    return static_cast<DiscoveryJob*>(data)->isInSelectiveSyncBlackList(QString::fromUtf8(path));
 }
 
 bool DiscoveryJob::checkSelectiveSyncNewFolder(const QString& path)
@@ -205,8 +192,7 @@ int get_errno_from_http_errcode( int err, const QString & reason ) {
         new_errno = EIO;
         break;
     case 503:           /* Service Unavailable */
-        // https://github.com/owncloud/core/pull/26145/files
-        if (reason == "Storage not available" || reason == "Storage is temporarily not available") {
+        if (reason == "Storage not available") {
             new_errno = ERRNO_STORAGE_UNAVAILABLE;
         } else {
             new_errno = ERRNO_SERVICE_UNAVAILABLE;

src/libsync/discoveryphase.h

@@ -174,7 +174,7 @@ class DiscoveryJob : public QObject {
      * return true if the given path should be ignored,
      * false if the path should be synced
      */
-    bool isInSelectiveSyncBlackList(const char* path) const;
+    bool isInSelectiveSyncBlackList(const QString &path) const;
     static int isInSelectiveSyncBlackListCallback(void *, const char *);
     bool checkSelectiveSyncNewFolder(const QString &path);
     static int checkSelectiveSyncNewFolderCallback(void*, const char*);

src/libsync/ownsql.cpp

@@ -230,12 +230,8 @@ bool SqlQuery::isPragma()
 
 bool SqlQuery::exec()
 {
-    if (!_stmt) {
-        return false;
-    }
-
     // Don't do anything for selects, that is how we use the lib :-|
-    if( !isSelect() && !isPragma() ) {
+    if(_stmt && !isSelect() && !isPragma() ) {
         int rc, n = 0;
         do {
             rc = sqlite3_step(_stmt);
@@ -380,10 +376,8 @@ void SqlQuery::finish()
 
 void SqlQuery::reset_and_clear_bindings()
 {
-    if (_stmt) {
-        SQLITE_DO(sqlite3_reset(_stmt));
-        SQLITE_DO(sqlite3_clear_bindings(_stmt));
-    }
+    SQLITE_DO(sqlite3_reset(_stmt));
+    SQLITE_DO(sqlite3_clear_bindings(_stmt));
 }
 
 } // namespace OCC

src/libsync/propagateremotemove.cpp

@@ -13,7 +13,6 @@
  */
 
 #include "propagateremotemove.h"
-#include "propagatorjobs.h"
 #include "owncloudpropagator_p.h"
 #include "account.h"
 #include "syncjournalfilerecord.h"
@@ -176,45 +175,10 @@ void PropagateRemoteMove::finalize()
         done(SyncFileItem::FatalError, tr("Error writing metadata to the database"));
         return;
     }
-
-    if (_item->_isDirectory) {
-        if (!adjustSelectiveSync(_propagator->_journal, _item->_file, _item->_renameTarget)) {
-            done(SyncFileItem::FatalError, tr("Error writing metadata to the database"));
-            return;
-        }
-    }
-
     _propagator->_journal->commit("Remote Rename");
     done(SyncFileItem::Success);
 }
 
-bool PropagateRemoteMove::adjustSelectiveSync(SyncJournalDb *journal, const QString &from_, const QString &to_)
-{
-    bool ok;
-    // We only care about preserving the blacklist.   The white list should anyway be empty.
-    // And the undecided list will be repopulated on the next sync, if there is anything too big.
-    QStringList list = journal->getSelectiveSyncList(SyncJournalDb::SelectiveSyncBlackList, &ok);
-    if (!ok)
-        return false;
-
-    bool changed = false;
-    Q_ASSERT(!from_.endsWith(QLatin1String("/")));
-    Q_ASSERT(!to_.endsWith(QLatin1String("/")));
-    QString from = from_ + QLatin1String("/");
-    QString to = to_ + QLatin1String("/");
-
-    for (auto it = list.begin(); it != list.end(); ++it) {
-        if (it->startsWith(from)) {
-            *it = it->replace(0, from.size(), to);
-            changed = true;
-        }
-    }
-
-    if (changed) {
-        journal->setSelectiveSyncList(SyncJournalDb::SelectiveSyncBlackList, list);
-    }
-    return true;
-}
 
 }
 

src/libsync/propagateremotemove.h

@@ -51,12 +51,6 @@ public:
     void start() Q_DECL_OVERRIDE;
     void abort() Q_DECL_OVERRIDE;
     JobParallelism parallelism() Q_DECL_OVERRIDE { return OCC::PropagatorJob::WaitForFinishedInParentDirectory; }
-
-    /**
-     * Rename the directory in the selective sync list
-     */
-    static bool adjustSelectiveSync(SyncJournalDb *journal, const QString &from, const QString &to);
-
 private slots:
     void slotMoveJobFinished();
     void finalize();

src/libsync/propagatorjobs.cpp

@@ -15,7 +15,7 @@
 
 #include "propagatorjobs.h"
 #include "owncloudpropagator_p.h"
-#include "propagateremotemove.h"
+
 #include "utility.h"
 #include "syncjournaldb.h"
 #include "syncjournalfilerecord.h"
@@ -231,7 +231,6 @@ void PropagateLocalRename::start()
     _propagator->_journal->deleteFileRecord(_item->_originalFile);
 
     // store the rename file name in the item.
-    const auto oldFile = _item->_file;
     _item->_file = _item->_renameTarget;
 
     SyncJournalFileRecord record(*_item, targetFile);
@@ -246,15 +245,10 @@ void PropagateLocalRename::start()
             done(SyncFileItem::FatalError, tr("Error writing metadata to the database"));
             return;
         }
-    } else {
-        if (!PropagateRemoteMove::adjustSelectiveSync(_propagator->_journal, oldFile, _item->_renameTarget)) {
-            done(SyncFileItem::FatalError, tr("Error writing metadata to the database"));
-            return;
-        }
     }
-
     _propagator->_journal->commit("localRename");
 
+
     done(SyncFileItem::Success);
 }
 

src/libsync/syncengine.h

@@ -202,6 +202,7 @@ private:
     SyncJournalDb *_journal;
     QPointer<DiscoveryMainThread> _discoveryMainThread;
     QSharedPointer <OwncloudPropagator> _propagator;
+    QString _lastDeleted; // if the last item was a path and it has been deleted
 
     // After a sync, only the syncdb entries whose filenames appear in this
     // set will be kept. See _temporarilyUnavailablePaths.

src/libsync/syncjournaldb.cpp

@@ -318,9 +318,7 @@ bool SyncJournalDb::checkConnect()
         createQuery.bindValue(2, MIRALL_VERSION_MINOR);
         createQuery.bindValue(3, MIRALL_VERSION_PATCH);
         createQuery.bindValue(4, MIRALL_VERSION_BUILD);
-        if (!createQuery.exec()) {
-            return sqlFail("Update version", createQuery);
-        }
+        createQuery.exec();
 
     } else {
         int major = versionQuery.intValue(0);
@@ -369,84 +367,60 @@ bool SyncJournalDb::checkConnect()
     }
 
     _getFileRecordQuery.reset(new SqlQuery(_db));
-    if (_getFileRecordQuery->prepare(
+    _getFileRecordQuery->prepare(
             "SELECT path, inode, uid, gid, mode, modtime, type, md5, fileid, remotePerm, filesize,"
             "  ignoredChildrenRemote, contentChecksum, contentchecksumtype.name"
             " FROM metadata"
             "  LEFT JOIN checksumtype as contentchecksumtype ON metadata.contentChecksumTypeId == contentchecksumtype.id"
-            " WHERE phash=?1" )) {
-        return sqlFail("prepare _getFileRecordQuery", *_getFileRecordQuery);
-    }
+            " WHERE phash=?1" );
 
     _setFileRecordQuery.reset(new SqlQuery(_db) );
-    if (_setFileRecordQuery->prepare("INSERT OR REPLACE INTO metadata "
+    _setFileRecordQuery->prepare("INSERT OR REPLACE INTO metadata "
                                  "(phash, pathlen, path, inode, uid, gid, mode, modtime, type, md5, fileid, remotePerm, filesize, ignoredChildrenRemote, contentChecksum, contentChecksumTypeId) "
-                                 "VALUES (?1 , ?2, ?3 , ?4 , ?5 , ?6 , ?7,  ?8 , ?9 , ?10, ?11, ?12, ?13, ?14, ?15, ?16);" )) {
-        return sqlFail("prepare _setFileRecordQuery", *_setFileRecordQuery);
-    }
+                                 "VALUES (?1 , ?2, ?3 , ?4 , ?5 , ?6 , ?7,  ?8 , ?9 , ?10, ?11, ?12, ?13, ?14, ?15, ?16);" );
 
     _setFileRecordChecksumQuery.reset(new SqlQuery(_db) );
-    if (_setFileRecordChecksumQuery->prepare(
+    _setFileRecordChecksumQuery->prepare(
             "UPDATE metadata"
             " SET contentChecksum = ?2, contentChecksumTypeId = ?3"
-            " WHERE phash == ?1;")) {
-        return sqlFail("prepare _setFileRecordChecksumQuery", *_setFileRecordChecksumQuery);
-    }
+            " WHERE phash == ?1;");
 
     _setFileRecordLocalMetadataQuery.reset(new SqlQuery(_db));
-    if (_setFileRecordLocalMetadataQuery->prepare(
+    _setFileRecordLocalMetadataQuery->prepare(
             "UPDATE metadata"
             " SET inode=?2, modtime=?3, filesize=?4"
-            " WHERE phash == ?1;")) {
-        return sqlFail("prepare _setFileRecordLocalMetadataQuery", *_setFileRecordLocalMetadataQuery);
-    }
+            " WHERE phash == ?1;");
  
     _getDownloadInfoQuery.reset(new SqlQuery(_db) );
-    if (_getDownloadInfoQuery->prepare( "SELECT tmpfile, etag, errorcount FROM "
-                                    "downloadinfo WHERE path=?1" )) {
-        return sqlFail("prepare _getDownloadInfoQuery", *_getDownloadInfoQuery);
-    }
+    _getDownloadInfoQuery->prepare( "SELECT tmpfile, etag, errorcount FROM "
+                                    "downloadinfo WHERE path=?1" );
 
     _setDownloadInfoQuery.reset(new SqlQuery(_db) );
-    if (_setDownloadInfoQuery->prepare( "INSERT OR REPLACE INTO downloadinfo "
+    _setDownloadInfoQuery->prepare( "INSERT OR REPLACE INTO downloadinfo "
                                     "(path, tmpfile, etag, errorcount) "
-                                    "VALUES ( ?1 , ?2, ?3, ?4 )" )) {
-        return sqlFail("prepare _setDownloadInfoQuery", *_setDownloadInfoQuery);
-    }
+                                    "VALUES ( ?1 , ?2, ?3, ?4 )" );
 
     _deleteDownloadInfoQuery.reset(new SqlQuery(_db) );
-    if (_deleteDownloadInfoQuery->prepare( "DELETE FROM downloadinfo WHERE path=?1" )) {
-        return sqlFail("prepare _deleteDownloadInfoQuery", *_deleteDownloadInfoQuery);
-    }
+    _deleteDownloadInfoQuery->prepare( "DELETE FROM downloadinfo WHERE path=?1" );
 
     _getUploadInfoQuery.reset(new SqlQuery(_db));
-    if (_getUploadInfoQuery->prepare( "SELECT chunk, transferid, errorcount, size, modtime FROM "
-                                  "uploadinfo WHERE path=?1" )) {
-        return sqlFail("prepare _getUploadInfoQuery", *_getUploadInfoQuery);
-    }
+    _getUploadInfoQuery->prepare( "SELECT chunk, transferid, errorcount, size, modtime FROM "
+                                  "uploadinfo WHERE path=?1" );
 
     _setUploadInfoQuery.reset(new SqlQuery(_db));
-    if (_setUploadInfoQuery->prepare( "INSERT OR REPLACE INTO uploadinfo "
+    _setUploadInfoQuery->prepare( "INSERT OR REPLACE INTO uploadinfo "
                                   "(path, chunk, transferid, errorcount, size, modtime) "
-                                  "VALUES ( ?1 , ?2, ?3 , ?4 ,  ?5, ?6 )")) {
-        return sqlFail("prepare _setUploadInfoQuery", *_setUploadInfoQuery);
-    }
+                                  "VALUES ( ?1 , ?2, ?3 , ?4 ,  ?5, ?6 )");
 
     _deleteUploadInfoQuery.reset(new SqlQuery(_db));
-    if (_deleteUploadInfoQuery->prepare("DELETE FROM uploadinfo WHERE path=?1" )) {
-        return sqlFail("prepare _deleteUploadInfoQuery", *_deleteUploadInfoQuery);
-    }
+    _deleteUploadInfoQuery->prepare("DELETE FROM uploadinfo WHERE path=?1" );
 
 
     _deleteFileRecordPhash.reset(new SqlQuery(_db));
-    if (_deleteFileRecordPhash->prepare("DELETE FROM metadata WHERE phash=?1")) {
-        return sqlFail("prepare _deleteFileRecordPhash", *_deleteFileRecordPhash);
-    }
+    _deleteFileRecordPhash->prepare("DELETE FROM metadata WHERE phash=?1");
 
     _deleteFileRecordRecursively.reset(new SqlQuery(_db));
-    if (_deleteFileRecordRecursively->prepare("DELETE FROM metadata WHERE path LIKE(?||'/%')")) {
-        return sqlFail("prepare _deleteFileRecordRecursively", *_deleteFileRecordRecursively);
-    }
+    _deleteFileRecordRecursively->prepare("DELETE FROM metadata WHERE path LIKE(?||'/%')");
 
     QString sql( "SELECT lastTryEtag, lastTryModtime, retrycount, errorstring, lastTryTime, ignoreDuration, renameTarget "
                  "FROM blacklist WHERE path=?1");
@@ -456,50 +430,32 @@ bool SyncJournalDb::checkConnect()
         sql += QLatin1String(" COLLATE NOCASE");
     }
     _getErrorBlacklistQuery.reset(new SqlQuery(_db));
-    if (_getErrorBlacklistQuery->prepare(sql)) {
-        return sqlFail("prepare _getErrorBlacklistQuery", *_getErrorBlacklistQuery);
-    }
+    _getErrorBlacklistQuery->prepare(sql);
 
     _setErrorBlacklistQuery.reset(new SqlQuery(_db));
-    if (_setErrorBlacklistQuery->prepare("INSERT OR REPLACE INTO blacklist "
+    _setErrorBlacklistQuery->prepare("INSERT OR REPLACE INTO blacklist "
                                 "(path, lastTryEtag, lastTryModtime, retrycount, errorstring, lastTryTime, ignoreDuration, renameTarget) "
-                                "VALUES ( ?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8)")) {
-        return sqlFail("prepare _setErrorBlacklistQuery", *_setErrorBlacklistQuery);
-    }
+                                "VALUES ( ?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8)");
 
     _getSelectiveSyncListQuery.reset(new SqlQuery(_db));
-    if (_getSelectiveSyncListQuery->prepare("SELECT path FROM selectivesync WHERE type=?1")) {
-        return sqlFail("prepare _getSelectiveSyncListQuery", *_getSelectiveSyncListQuery);
-    }
+    _getSelectiveSyncListQuery->prepare("SELECT path FROM selectivesync WHERE type=?1");
 
     _getChecksumTypeIdQuery.reset(new SqlQuery(_db));
-    if (_getChecksumTypeIdQuery->prepare("SELECT id FROM checksumtype WHERE name=?1")) {
-        return sqlFail("prepare _getChecksumTypeIdQuery", *_getChecksumTypeIdQuery);
-    }
+    _getChecksumTypeIdQuery->prepare("SELECT id FROM checksumtype WHERE name=?1");
 
     _getChecksumTypeQuery.reset(new SqlQuery(_db));
-    if (_getChecksumTypeQuery->prepare("SELECT name FROM checksumtype WHERE id=?1")) {
-        return sqlFail("prepare _getChecksumTypeQuery", *_getChecksumTypeQuery);
-    }
+    _getChecksumTypeQuery->prepare("SELECT name FROM checksumtype WHERE id=?1");
 
     _insertChecksumTypeQuery.reset(new SqlQuery(_db));
-    if (_insertChecksumTypeQuery->prepare("INSERT OR IGNORE INTO checksumtype (name) VALUES (?1)")) {
-        return sqlFail("prepare _insertChecksumTypeQuery", *_insertChecksumTypeQuery);
-    }
+    _insertChecksumTypeQuery->prepare("INSERT OR IGNORE INTO checksumtype (name) VALUES (?1)");
 
     _getDataFingerprintQuery.reset(new SqlQuery(_db));
-    if (_getDataFingerprintQuery->prepare("SELECT fingerprint FROM datafingerprint")) {
-        return sqlFail("prepare _getDataFingerprintQuery", *_getDataFingerprintQuery);
-    }
+    _getDataFingerprintQuery->prepare("SELECT fingerprint FROM datafingerprint");
 
     _setDataFingerprintQuery1.reset(new SqlQuery(_db));
-    if (_setDataFingerprintQuery1->prepare("DELETE FROM datafingerprint;")) {
-        return sqlFail("prepare _setDataFingerprintQuery1", *_setDataFingerprintQuery1);
-    }
+    _setDataFingerprintQuery1->prepare("DELETE FROM datafingerprint;");
     _setDataFingerprintQuery2.reset(new SqlQuery(_db));
-    if (_setDataFingerprintQuery2->prepare("INSERT INTO datafingerprint (fingerprint) VALUES (?1);")) {
-        return sqlFail("prepare _setDataFingerprintQuery2", *_setDataFingerprintQuery2);
-    }
+    _setDataFingerprintQuery2->prepare("INSERT INTO datafingerprint (fingerprint) VALUES (?1);");
 
     // don't start a new transaction now
     commitInternal(QString("checkConnect End"), false);

src/libsync/theme.cpp

@@ -115,11 +115,11 @@ QIcon Theme::trayFolderIcon( const QString& backend ) const
  * helper to load a icon from either the icon theme the desktop provides or from
  * the apps Qt resources.
  */
-QIcon Theme::themeIcon( const QString& name, bool sysTray, bool sysTrayMenuVisible ) const
+QIcon Theme::themeIcon( const QString& name, bool sysTray ) const
 {
     QString flavor;
     if (sysTray) {
-        flavor = systrayIconFlavor(_mono, sysTrayMenuVisible);
+        flavor = systrayIconFlavor(_mono);
     } else {
         flavor = QLatin1String("colored");
     }
@@ -158,14 +158,6 @@ QIcon Theme::themeIcon( const QString& name, bool sysTray, bool sysTrayMenuVisib
         }
     }
 
-    #ifdef Q_OS_MAC
-    #if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
-    // This defines the icon as a template and enables automatic macOS color handling
-    // See https://bugreports.qt.io/browse/QTBUG-42109
-    cached.setIsMask(_mono && sysTray && !sysTrayMenuVisible);
-    #endif
-    #endif
-
     return cached;
 }
 
@@ -235,18 +227,11 @@ QString Theme::defaultClientFolder() const
     return appName();
 }
 
-QString Theme::systrayIconFlavor(bool mono, bool sysTrayMenuVisible ) const
+QString Theme::systrayIconFlavor(bool mono) const
 {
-    Q_UNUSED(sysTrayMenuVisible)
     QString flavor;
     if (mono) {
         flavor = Utility::hasDarkSystray() ? QLatin1String("white") : QLatin1String("black");
-
-        #ifdef Q_OS_MAC
-        if (sysTrayMenuVisible) {
-            flavor = QLatin1String("white");
-        }
-        #endif
     } else {
         flavor = QLatin1String("colored");
     }
@@ -346,7 +331,7 @@ QVariant Theme::customMedia( CustomMediaType type )
     return re;
 }
 
-QIcon Theme::syncStateIcon( SyncResult::Status status, bool sysTray, bool sysTrayMenuVisible ) const
+QIcon Theme::syncStateIcon( SyncResult::Status status, bool sysTray ) const
 {
     // FIXME: Mind the size!
     QString statusIcon;
@@ -378,7 +363,7 @@ QIcon Theme::syncStateIcon( SyncResult::Status status, bool sysTray, bool sysTra
         statusIcon = QLatin1String("state-error");
     }
 
-    return themeIcon( statusIcon, sysTray, sysTrayMenuVisible );
+    return themeIcon( statusIcon, sysTray );
 }
 
 QIcon Theme::folderDisabledIcon( ) const
@@ -386,9 +371,9 @@ QIcon Theme::folderDisabledIcon( ) const
     return themeIcon( QLatin1String("state-pause") );
 }
 
-QIcon Theme::folderOfflineIcon(bool sysTray, bool sysTrayMenuVisible ) const
+QIcon Theme::folderOfflineIcon(bool systray) const
 {
-    return themeIcon( QLatin1String("state-offline"), sysTray, sysTrayMenuVisible );
+    return themeIcon( QLatin1String("state-offline"), systray );
 }
 
 QColor Theme::wizardHeaderTitleColor() const

src/libsync/theme.h

@@ -97,10 +97,10 @@ public:
     /**
       * get an sync state icon
       */
-    virtual QIcon   syncStateIcon( SyncResult::Status, bool sysTray = false, bool sysTrayMenuVisible = false) const;
+    virtual QIcon   syncStateIcon( SyncResult::Status, bool sysTray = false ) const;
 
     virtual QIcon   folderDisabledIcon() const;
-    virtual QIcon   folderOfflineIcon(bool sysTray = false, bool sysTrayMenuVisible = false) const;
+    virtual QIcon   folderOfflineIcon(bool systray = false) const;
     virtual QIcon   applicationIcon() const = 0;
 #endif
 
@@ -152,7 +152,7 @@ public:
     virtual QString enforcedLocale() const { return QString::null; }
 
     /** colored, white or black */
-    QString systrayIconFlavor(bool mono, bool sysTrayMenuVisible = false) const;
+    QString systrayIconFlavor(bool mono) const;
 
 #ifndef TOKEN_AUTH_ONLY
     /**
@@ -304,7 +304,7 @@ public:
 
 protected:
 #ifndef TOKEN_AUTH_ONLY
-    QIcon themeIcon(const QString& name, bool sysTray = false, bool sysTrayMenuVisible = false) const;
+    QIcon themeIcon(const QString& name, bool sysTray = false) const;
 #endif
     Theme();
 

test/syncenginetestutils.h

@@ -28,7 +28,6 @@ inline QByteArray generateFileId() {
 
 class PathComponents : public QStringList {
 public:
-    PathComponents(const char *path) : PathComponents{QString::fromUtf8(path)} {}
     PathComponents(const QString &path) : QStringList{path.split('/', QString::SkipEmptyParts)} { }
     PathComponents(const QStringList &pathComponents) : QStringList{pathComponents} { }
 
@@ -91,9 +90,8 @@ public:
     void mkdir(const QString &relativePath) override {
         _rootDir.mkpath(relativePath);
     }
-    void rename(const QString &from, const QString &to) override {
-        QVERIFY(_rootDir.exists(from));
-        QVERIFY(_rootDir.rename(from, to));
+    void rename(const QString &, const QString &) override {
+        Q_ASSERT(!"not implemented");
     }
 };
 
@@ -459,36 +457,6 @@ public:
     qint64 readData(char *, qint64) override { return 0; }
 };
 
-class FakeMoveReply : public QNetworkReply
-{
-    Q_OBJECT
-public:
-    FakeMoveReply(FileInfo &remoteRootFileInfo, QNetworkAccessManager::Operation op, const QNetworkRequest &request, QObject *parent)
-    : QNetworkReply{parent} {
-        setRequest(request);
-        setUrl(request.url());
-        setOperation(op);
-        open(QIODevice::ReadOnly);
-
-        Q_ASSERT(request.url().path().startsWith(sRootUrl.path()));
-        QString fileName = request.url().path().mid(sRootUrl.path().length());
-        QString destPath = request.rawHeader("Destination");
-        Q_ASSERT(destPath.startsWith(sRootUrl.path()));
-        QString dest = destPath.mid(sRootUrl.path().length());
-        remoteRootFileInfo.rename(fileName, dest);
-        QMetaObject::invokeMethod(this, "respond", Qt::QueuedConnection);
-    }
-
-    Q_INVOKABLE void respond() {
-        setAttribute(QNetworkRequest::HttpStatusCodeAttribute, 201);
-        emit metaDataChanged();
-        emit finished();
-    }
-
-    void abort() override { }
-    qint64 readData(char *, qint64) override { return 0; }
-};
-
 class FakeGetReply : public QNetworkReply
 {
     Q_OBJECT
@@ -584,8 +552,6 @@ protected:
             return new FakeMkcolReply{_remoteRootFileInfo, op, request, this};
         else if (verb == QLatin1String("DELETE"))
             return new FakeDeleteReply{_remoteRootFileInfo, op, request, this};
-        else if (verb == QLatin1String("MOVE"))
-            return new FakeMoveReply{_remoteRootFileInfo, op, request, this};
         else {
             qDebug() << verb << outgoingData;
             Q_UNREACHABLE();

test/testfolderman.cpp

@@ -15,7 +15,6 @@
 #include "folderman.h"
 #include "account.h"
 #include "accountstate.h"
-#include "configfile.h"
 
 using namespace OCC;
 
@@ -40,7 +39,6 @@ private slots:
     {
 #if QT_VERSION >= QT_VERSION_CHECK(5, 1, 0)
         QTemporaryDir dir;
-        ConfigFile::setConfDir(dir.path()); // we don't want to pollute the user's config file
         QVERIFY(dir.isValid());
         QDir dir2(dir.path());
         QVERIFY(dir2.mkpath("sub/ownCloud1/folder/f"));

test/testinotifywatcher.cpp

@@ -11,23 +11,18 @@
 
 using namespace OCC;
 
-
-struct FriendlyFolderWatcherPrivate : FolderWatcherPrivate
-{
-    using FolderWatcherPrivate::FolderWatcherPrivate;
-    friend class TestInotifyWatcher;
-};
-
-
-class TestInotifyWatcher : public QObject
+class TestInotifyWatcher: public FolderWatcherPrivate
 {
     Q_OBJECT
-private slots:
-    // Test the recursive path listing function lists everything
-    void testAddFolderRecursiveHelper() {
-        QTemporaryDir tmpDir;
 
-        QString _root = tmpDir.path();
+private:
+    QString _root;
+
+private slots:
+    void initTestCase() {
+        qsrand(QTime::currentTime().msec());
+
+        _root = QDir::tempPath() + "/" + "test_" + QString::number(qrand());
         qDebug() << "creating test directory tree in " << _root;
         QDir rootDir(_root);
 
@@ -37,13 +32,13 @@ private slots:
         rootDir.mkpath(_root + "/a1/b3/c3");
         rootDir.mkpath(_root + "/a2/b3/c3");
 
-        FriendlyFolderWatcherPrivate watcher(0, _root);
-        QVERIFY(watcher._fd >= 0);
-        QCoreApplication::processEvents(); // Let the slotAddFolderRecursive slot run;
-        QStringList dirs = watcher._watches.values();
+    }
 
-        QVERIFY( dirs.indexOf(_root)>-1);
+    // Test the recursive path listing function findFoldersBelow
+    void testDirsBelowPath() {
+        QStringList dirs;
 
+        bool ok = findFoldersBelow(QDir(_root), dirs);
         QVERIFY( dirs.indexOf(_root + "/a1")>-1);
         QVERIFY( dirs.indexOf(_root + "/a1/b1")>-1);
         QVERIFY( dirs.indexOf(_root + "/a1/b1/c1")>-1);
@@ -58,13 +53,20 @@ private slots:
         QVERIFY( dirs.indexOf(_root + "/a1/b3")>-1);
         QVERIFY( dirs.indexOf(_root + "/a1/b3/c3")>-1);
 
-        QVERIFY( dirs.contains(_root + "/a2"));
-        QVERIFY( dirs.contains(_root + "/a2/b3"));
-        QVERIFY( dirs.contains(_root + "/a2/b3/c3"));
+        QVERIFY( dirs.indexOf(_root + "/a2"));
+        QVERIFY( dirs.indexOf(_root + "/a2/b3"));
+        QVERIFY( dirs.indexOf(_root + "/a2/b3/c3"));
 
-        QCOMPARE(dirs.count(), 12);
+        QVERIFY2(dirs.count() == 11, "Directory count wrong.");
+
+        QVERIFY2(ok, "findFoldersBelow failed.");
     }
 
+    void cleanupTestCase() {
+        if( _root.startsWith(QDir::tempPath() )) {
+           system( QString("rm -rf %1").arg(_root).toLocal8Bit() );
+        }
+    }
 };
 
 QTEST_APPLESS_MAIN(TestInotifyWatcher)

test/testsyncengine.cpp

@@ -7,7 +7,6 @@
 
 #include <QtTest>
 #include "syncenginetestutils.h"
-#include <syncengine.h>
 
 using namespace OCC;
 
@@ -138,8 +137,8 @@ private slots:
         fakeFolder.syncOnce();
         QCOMPARE(fakeFolder.currentLocalState(), fakeFolder.currentRemoteState());
         auto oldState = fakeFolder.currentLocalState();
-        QVERIFY(oldState.find("folder/folderB/folderA/file.txt"));
-        QVERIFY(!oldState.find("folder/folderA/file.txt"));
+        QVERIFY(oldState.find(PathComponents("folder/folderB/folderA/file.txt")));
+        QVERIFY(!oldState.find(PathComponents("folder/folderA/file.txt")));
 
         // This sync should not remove the file
         fakeFolder.syncOnce();
@@ -147,72 +146,6 @@ private slots:
         QCOMPARE(fakeFolder.currentLocalState(), oldState);
 
     }
-
-    void testSelectiveSyncModevFolder() {
-        // issue #5224
-        FakeFolder fakeFolder{FileInfo{ QString(), {
-            FileInfo { QStringLiteral("parentFolder"), {
-                FileInfo{ QStringLiteral("subFolderA"), { { QStringLiteral("fileA.txt"), 400 } } },
-                FileInfo{ QStringLiteral("subFolderB"), { { QStringLiteral("fileB.txt"), 400 } } }
-            }
-        }}}};
-
-        QCOMPARE(fakeFolder.currentLocalState(), fakeFolder.currentRemoteState());
-        auto expectedServerState = fakeFolder.currentRemoteState();
-
-        // Remove subFolderA with selectiveSync:
-        fakeFolder.syncEngine().journal()->setSelectiveSyncList(SyncJournalDb::SelectiveSyncBlackList,
-                                                                {"parentFolder/subFolderA/"});
-        fakeFolder.syncEngine().journal()->avoidReadFromDbOnNextSync("parentFolder/subFolderA/");
-
-        fakeFolder.syncOnce();
-
-        {
-            // Nothing changed on the server
-            QCOMPARE(fakeFolder.currentRemoteState(), expectedServerState);
-            // The local state should not have subFolderA
-            auto remoteState = fakeFolder.currentRemoteState();
-            remoteState.remove("parentFolder/subFolderA");
-            QCOMPARE(fakeFolder.currentLocalState(), remoteState);
-        }
-
-        // Rename parentFolder on the server
-        fakeFolder.remoteModifier().rename("parentFolder", "parentFolderRenamed");
-        expectedServerState = fakeFolder.currentRemoteState();
-        fakeFolder.syncOnce();
-
-        {
-            QCOMPARE(fakeFolder.currentRemoteState(), expectedServerState);
-            auto remoteState = fakeFolder.currentRemoteState();
-            // The subFolderA should still be there on the server.
-            QVERIFY(remoteState.find("parentFolderRenamed/subFolderA/fileA.txt"));
-            // But not on the client because of the selective sync
-            remoteState.remove("parentFolderRenamed/subFolderA");
-            QCOMPARE(fakeFolder.currentLocalState(), remoteState);
-        }
-
-        // Rename it again, locally this time.
-        fakeFolder.localModifier().rename("parentFolderRenamed", "parentThirdName");
-        fakeFolder.syncOnce();
-
-        {
-            auto remoteState = fakeFolder.currentRemoteState();
-            // The subFolderA should still be there on the server.
-            QVERIFY(remoteState.find("parentThirdName/subFolderA/fileA.txt"));
-            // But not on the client because of the selective sync
-            remoteState.remove("parentThirdName/subFolderA");
-            QCOMPARE(fakeFolder.currentLocalState(), remoteState);
-
-            expectedServerState = fakeFolder.currentRemoteState();
-            QSignalSpy completeSpy(&fakeFolder.syncEngine(), SIGNAL(itemCompleted(const SyncFileItem &, const PropagatorJob &)));
-            fakeFolder.syncOnce(); // This sync should do nothing
-            QCOMPARE(completeSpy.count(), 0);
-
-            QCOMPARE(fakeFolder.currentRemoteState(), expectedServerState);
-            QCOMPARE(fakeFolder.currentLocalState(), remoteState);
-        }
-    }
-
 };
 
 QTEST_GUILESS_MAIN(TestSyncEngine)