From 41fa562dce72da0a28069a63fbb1f25c7adbf3b9 Mon Sep 17 00:00:00 2001
From: Klaas Freitag <freitag@owncloud.com>
Date: Fri, 3 Oct 2014 11:35:18 +0200
Subject: [PATCH] blacklisting: disable broken remove stale entries function
 for now.

---
 src/mirall/owncloudpropagator.cpp | 4 ++++
 src/mirall/syncengine.cpp         | 2 +-
 src/mirall/syncjournaldb.cpp      | 4 ++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/mirall/owncloudpropagator.cpp b/src/mirall/owncloudpropagator.cpp
index 44af5239bd..4a94777e5f 100644
--- a/src/mirall/owncloudpropagator.cpp
+++ b/src/mirall/owncloudpropagator.cpp
@@ -101,6 +101,10 @@ void PropagateItemJob::done(SyncFileItem::Status status, const QString &errorStr
         if( _item._blacklistedInDb ) {
             // wipe blacklist entry.
             _propagator->_journal->wipeBlacklistEntry(_item._file);
+            // remove a blacklist entry in case the file was moved.
+            if( _item._originalFile != _item._file ) {
+                _propagator->_journal->wipeBlacklistEntry(_item._originalFile);
+            }
         }
         break;
     case SyncFileItem::Conflict:
diff --git a/src/mirall/syncengine.cpp b/src/mirall/syncengine.cpp
index 93c8e7d3df..f2af8c072b 100644
--- a/src/mirall/syncengine.cpp
+++ b/src/mirall/syncengine.cpp
@@ -706,7 +706,7 @@ void SyncEngine::slotDiscoveryJobFinished(int discoveryResult)
 
     deleteStaleDownloadInfos();
     deleteStaleUploadInfos();
-    deleteStaleBlacklistEntries();
+    // deleteStaleBlacklistEntries();
     _journal->commit("post stale entry removal");
 
     _propagator->start(_syncedItems);
diff --git a/src/mirall/syncjournaldb.cpp b/src/mirall/syncjournaldb.cpp
index c77a223f7f..3c732972eb 100644
--- a/src/mirall/syncjournaldb.cpp
+++ b/src/mirall/syncjournaldb.cpp
@@ -921,6 +921,10 @@ int SyncJournalDb::wipeBlacklist()
 
 void SyncJournalDb::wipeBlacklistEntry( const QString& file )
 {
+    if( file.isEmpty() ) {
+        return;
+    }
+
     QMutexLocker locker(&_mutex);
     if( checkConnect() ) {
         QSqlQuery query(_db);