Separate sync specific jobs from data transfer jobs

2016-12-21 11:57:20 +01:00
@@ -58,9 +58,6 @@ if( UNIX AND NOT APPLE )
 endif()
 ####

-# Enable Q_ASSERT etc. in all builds
-add_definitions( -DQT_FORCE_ASSERTS )
-
 include(GNUInstallDirs)
 include(DefineInstallationPaths)
 include(GenerateExportHeader)
@@ -72,7 +69,7 @@ get_git_head_revision(GIT_REFSPEC GIT_SHA1)
 # if we cannot get it from git, directly try .tag (packages)
 # this will work if the tar balls have been properly created
 # via git-archive.
-if ("${GIT_SHA1}" STREQUAL "GITDIR-NOTFOUND")
+if (${GIT_SHA1} STREQUAL "GITDIR-NOTFOUND")
    file(READ ${CMAKE_SOURCE_DIR}/.tag sha1_candidate)
    string(REPLACE "\n" "" sha1_candidate ${sha1_candidate})
    if (NOT ${sha1_candidate} STREQUAL "$Format:%H$")
@@ -1,45 +1,6 @@
 ChangeLog
 =========

-version 2.3.0 (2017-0x-xx)
-* WiP!
-* WiP Switch Windows and OS X build to 5.6.2
-* WiP Performance improvements for exclude detection
-* Switch to new ownCloud server WebDAV endpoint
-* Chunking NG: New file upload chunking algorithmn for ownCloud server 9.2
-* Allow to sync a folder to multiple different servers (Filename change from .csync_journal.db to _sync_$HASH.db)
-* Conflicts: Use the local mtime for the conflict file name (#5273)
-* "Sync now" menu item
-* SSL Client certificate support improved (Show UI, Store keys in keychain)
-* Propagator: Upload more small files in parallel
-* Sync Engine: Read data-fingerprint property to detect backups (#2325)
-* GUI: Show link to ceate an app password/token for syncing
-* Share dialog: Add 'Mail link' button
-* Caja file manager plugin
-* Make "backup detected" message to not trigger in wrong cases
-* SyncEngine: Fix renaming of folder when file are changed (#5192)
-* Fix reconnect bug if status.php intermittently returns wrong data (#5188)
-* Improve sync scheduling (#5317)
-* Overlay icons: Improvements in correctnes
-* Tray menu: Only update on demand to fix Linux desktop integration glitches
-* Progress: Better time/bandwidth estimations
-* Network: Follow certain HTTP redirects (#2791)
-* Network: Remove all cookies (including load balancers etc) when logging out
-* Discovery thread: Low priority
-* owncloudsync.log: Write during propagation
-* Better error message for files with trailing spaces on Windows
-* Excludes: Consider files in hidden folders excluded (#5163)
-* Allow sync directory to be a symlinked directory
-* Add manifest file on Windows to make the application UAC aware
-* macOS: Improve monochrome tray icons
-* Don't blacklist 507 Insufficent Storage #5346 (#5424)
-* Shibboleth bugfixes
-* Fixes with regards to low disk space
-* A ton of other bugfixes
-* Refactorings
-* Improved documentation
-* Crash fixes
-
 version 2.2.4 (release 2016-09-27)
 * Dolphin Plugin: Use the Application name for the socket path (#5172)
 * SyncEngine: Fix renaming of folder when file are changed (#5195)
@@ -5,7 +5,7 @@ set( MIRALL_VERSION_YEAR  2016 )
 set( MIRALL_SOVERSION 0 )

 if ( NOT DEFINED MIRALL_VERSION_SUFFIX )
-    set( MIRALL_VERSION_SUFFIX "pre1") #e.g. beta1, beta2, rc1
+    set( MIRALL_VERSION_SUFFIX "git") #e.g. beta1, beta2, rc1
 endif( NOT DEFINED MIRALL_VERSION_SUFFIX )

 if( NOT DEFINED MIRALL_VERSION_BUILD )
@@ -418,8 +418,10 @@ Section "${APPLICATION_NAME}" SEC_APPLICATION
   File "${QT_DLL_PATH}\Qt5Core.dll"
   File "${QT_DLL_PATH}\Qt5Gui.dll"
   File "${QT_DLL_PATH}\Qt5Network.dll"
+   File "${QT_DLL_PATH}\Qt5OpenGL.dll"
   File "${QT_DLL_PATH}\Qt5PrintSupport.dll"
   File "${QT_DLL_PATH}\Qt5Qml.dll"
+   File "${QT_DLL_PATH}\Qt5Quick.dll"
   File "${QT_DLL_PATH}\Qt5Sql.dll"
   File "${QT_DLL_PATH}\Qt5WebKit.dll"
   File "${QT_DLL_PATH}\Qt5WebKitWidgets.dll"
@@ -433,9 +435,9 @@ Section "${APPLICATION_NAME}" SEC_APPLICATION

   ;Qt deps
   File "${MING_BIN}\libpng16-16.dll"
-   File "${MING_BIN}\icudata56.dll"
-   File "${MING_BIN}\icui18n56.dll"
-   File "${MING_BIN}\icuuc56.dll"
+   File "${MING_BIN}\icudata53.dll"
+   File "${MING_BIN}\icui18n53.dll"
+   File "${MING_BIN}\icuuc53.dll"
   File "${MING_BIN}\libEGL.dll"
   File "${MING_BIN}\libGLESv2.dll"
   File "${MING_BIN}\libjpeg-8.dll"
@@ -444,14 +446,11 @@ Section "${APPLICATION_NAME}" SEC_APPLICATION
   File "${MING_BIN}\libcrypto-10.dll"
   File "${MING_BIN}\libssl-10.dll"
   File "${MING_BIN}\libstdc++-6.dll"
-   File "${MING_BIN}\libwebp-5.dll"
+   File "${MING_BIN}\libwebp-4.dll"
   File "${MING_BIN}\libxslt-1.dll"
   File "${MING_BIN}\libxml2-2.dll"
   File "${MING_BIN}\zlib1.dll"
-   File "${MING_BIN}\libharfbuzz-0.dll"
-   File "${MING_BIN}\libfreetype-6.dll"
-   File "${MING_BIN}\libglib-2.0-0.dll"
-   File "${MING_BIN}\libintl-8.dll"
+   File "${MING_BIN}\libsqlite3-0.dll"

   ;QtKeyChain stuff
   File "${MING_BIN}\libqt5keychain.dll"
@@ -44,6 +44,11 @@
 extern "C" {
 #endif

+struct csync_client_certs_s {
+  char *certificatePath;
+  char *certificatePasswd;
+};  
+  
 enum csync_status_codes_e {
  CSYNC_STATUS_OK         = 0,

@@ -103,6 +103,9 @@ struct csync_s {

  } callbacks;
  c_strlist_t *excludes;
+
+  // needed for SSL client certificate support
+  struct csync_client_certs_s *clientCerts;
  
  struct {
    char *file;
@@ -77,7 +77,7 @@ a synchronization process.

 Before the 1.3.0 release of the Desktop Client, the synchronization process
 might create false conflict files if time deviates. Original and changed files
-conflict only in their timestamp, but not in their content. This behavior was
+conflict only in their timestamp, but not in their content. This behaviour was
 changed to employ a binary check if files differ.

 Like files, directories also hold a unique ID that changes whenever one of the
@@ -3,7 +3,7 @@ The Automatic Updater
 =====================

 The Automatic Updater ensures that you always have the 
-latest features and bug fixes for your ownCloud synchronization client.
+latest features and bugfixes for your ownCloud synchronization client.

 The Automatic Updater updates only on Mac OS X and Windows computers; Linux 
 users only need to use their normal package managers. However, on Linux systems 
@@ -49,6 +49,7 @@ the Linux operating system do not perform any updates on their own. The client
 will inform you (``Settings -> General -> Updates``) when an update is 
 available.

+
 Preventing Automatic Updates
 ----------------------------

@@ -109,8 +110,24 @@ To prevent automatic updates and disallow manual overrides:
 Preventing Automatic Updates in Mac OS X Environments
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

-You can disable the automatic update mechanism, in the Mac OS X operating system,
-by copying the file
+You can disable the automatic update mechanism in Mac OS X operating systems
+using the system-wide ``.plist`` file.  To access this file:
+
+1. Go to this directory::
+
+ 	/Library/Preferences/
+
+2. Locate and open the following file::
+
+ 	com.owncloud.desktopclient.plist
+
+3. Add a new root level item of type ``bool``.
+
+4. Name the item ``skipUpdateCheck``.
+
+5. Set the item to ``true``.
+
+Alternatively, you can copy the file
 ``owncloud.app/Contents/Resources/deny_autoupdate_com.owncloud.desktopclient.plist``
 to ``/Library/Preferences/com.owncloud.desktopclient.plist``.

@@ -54,7 +54,7 @@ distribution. Make sure the repositories for source packages are enabled.
 Mac OS X
 --------

-In addition to needing XCode (along with the command line tools), developing in
+In additon to needing XCode (along with the command line tools), developing in
 the Mac OS X environment requires extra dependencies.  You can install these
 dependencies through MacPorts_ or Homebrew_.  These dependencies are required
 only on the build machine, because non-standard libs are deployed in the app
@@ -77,29 +77,25 @@ To set up your build environment for development using HomeBrew_:

    brew tap owncloud/owncloud

-5. Install a Qt5 version with qtwebkit support::
-
-    brew install qt5 --with-qtwebkit
-
-6. Install any missing dependencies::
+5. Install any missing dependencies::

    brew install $(brew deps owncloud-client)

-7. Add Qt from brew to the path::
+3. Add Qt from brew to the path::

    export PATH=/usr/local/Cellar/qt5/5.x.y/bin:$PATH

-   Where ``x.y`` is the current version of Qt 5 that brew has installed
+   Where ``x.z`` is the current version of Qt 5 that brew has installed
   on your machine.
-8. Install qtkeychain from here:  git clone https://github.com/frankosterfeld/qtkeychain.git
+4. Install qtkeychain from here:  git clone https://github.com/frankosterfeld/qtkeychain.git
   make sure you make the same install prefix as later while building the client e.g.  -            
   ``DCMAKE_INSTALL_PREFIX=/Path/to/client-install``

-9. For compilation of the client, follow the :ref:`generic-build-instructions`.
+5. For compilation of the client, follow the :ref:`generic-build-instructions`.

-10. Install the Packages_ package creation tool.
+6. Install the Packages_ package creation tool.

-11. In the build directory, run ``admin/osx/create_mac.sh <build_dir>
+7. In the build directory, run ``admin/osx/create_mac.sh <build_dir>
   <install_dir>``. If you have a developer signing certificate, you can specify
   its Common Name as a third parameter (use quotes) to have the package
   signed automatically.
@@ -16,20 +16,15 @@ format. You can overwrite changes using the ownCloud configuration dialog.
 .. note:: Use caution when making changes to the ownCloud Client configuration
   file.  Incorrect settings can produce unintended results.

-You can change the following configuration settings in the ``[ownCloud]`` section:
+You can change the following configuration settings (must be under the ``[ownCloud]`` section)

 - ``remotePollInterval`` (default: ``30000``) -- Specifies the poll time for the remote repository in milliseconds.

- ``forceSyncInterval`` (default: ``7200000``) -- The duration of no activity after which a synchronization run shall be triggered automatically.
-
- ``notificationRefreshInterval`` (default: ``300000``)  -- Specifies the default interval of checking for new server notifications in milliseconds.
-
-You can change the following configuration settings in the ``[General]`` section:
+- ``maxLogLines`` (default:  ``20000``) -- Specifies the maximum number of log lines displayed in the log window.

 - ``chunkSize`` (default:  ``5242880``) -- Specifies the chunk size of uploaded files in bytes.

 - ``promptDeleteAllFiles`` (default:  ``true``) -- If a UI prompt should ask for confirmation if it was detected that all files and folders were deleted.

- ``maxLogLines`` (default:  ``20000``) -- Specifies the maximum number of log lines displayed in the log window.
+- ``notificationRefreshInterval`` (default``300,000``)  -- Specifies the default interval of checking for new server notifications in milliseconds.

- ``timeout`` (default: ``300``) -- The timeout for network connections in seconds.
@@ -1,20 +1,17 @@
 FAQ
 ===

+**Issue:**
+
 Some files are continuously uploaded to the server, even when they are not modified.
------------------------------------------------------------------------------------
+
+**Resolution:**

 It is possible that another program is changing the modification date of the file.
+
 If the file is uses the ``.eml`` extension, Windows automatically and
 continually changes all files, unless you remove
 ``\HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\PropertySystem\PropertyHandlers``
 from the windows registry.
+
 See http://petersteier.wordpress.com/2011/10/22/windows-indexer-changes-modification-dates-of-eml-files/ for more information.
-
-Syncing breaks when attempting to sync deeper than 50 sub-directories, but the sync client does not report an error (RC=0)
--------------------------------------------------------------------------------------------------------------------------
-
-The sync client has been intentionally limited to sync no deeper than
-fifty sub-directories, to help prevent memory problems. 
-Unfortunately, it, *currently*, does not report an error when this occurs. 
-However, a UI notification is planned for a future release of ownCloud.
@@ -65,7 +65,7 @@ If no client is configured, or if you choose to use a different user to synchron
 you can specify the user
 password setting with the usual URL pattern.  For example::

-  $ owncloudcmd /home/user/my_sync_folder https://carla:secret@server/owncloud/remote.php/webdav/
+  $ owncloudcmd / https://carla:secret@server/owncloud/remote.php/webdav/

 To synchronize the ownCloud directory ``Music`` to the local directory
 ``media/music``, through a proxy listening on port ``8080``, and on a gateway
@@ -138,7 +138,7 @@ Network

 .. index:: proxy settings, SOCKS, bandwith, throttling, limiting

-This tab consolidates ``Proxy Settings`` and ``Bandwith Limiting``:
+This tab consollidates ``Proxy Settings`` and ``Bandwith Limiting``:

 .. image:: images/settings_network.png
   :scale: 50 %
@@ -152,7 +152,7 @@ Proxy Settings
  On Linux, this will only pick up the value of the variable ``http_proxy``.
 * ``Specify proxy manually as``: Allows to specify custom proxy settings.
  If you require to go through a HTTP(S) proxy server such as Squid or Microsoft
-  Forefront TMG, pick ``HTTP(S)``. ``SOCKSv5`` on the other hand is particularly
+  Forefront TMG, pick ``HTTP(S)``. ``SOCKSv5`` on the other hand is particulary
  useful in special company LAN setups, or in combination with the OpenSSH
  dynamic application level forwarding feature (see ``ssh -D``).
 * ``Host``: Enter the host name or IP address of your proxy server, followed
@@ -592,57 +592,6 @@ X-GNOME-Autostart-Delay=3
 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
 # Translations
 Comment[oc]=@APPLICATION_NAME@ sincronizacion del client
 GenericName[oc]=Dorsièr de Sincronizacion
@@ -778,10 +727,7 @@ Comment[th_TH]=@APPLICATION_NAME@ ไคลเอนต์ประสานข
 GenericName[th_TH]=ประสานข้อมูลโฟลเดอร์
 Name[th_TH]= @APPLICATION_NAME@ ไคลเอนต์ประสานข้อมูลเดสก์ท็อป
 Icon[th_TH]=@APPLICATION_EXECUTABLE@
-Comment[es_MX]=Cliente de escritorio para  sincronziación de @APPLICATION_NAME@
 GenericName[es_MX]=Sincronización de Carpetas
-Name[es_MX]=Cliente de escritorio para  sincronziación de @APPLICATION_NAME@
-Icon[es_MX]=@APPLICATION_EXECUTABLE@
 Comment[nb_NO]=@APPLICATION_NAME@ skrivebordssynkroniseringsklient
 GenericName[nb_NO]=Mappesynkronisering
 Name[nb_NO]=@APPLICATION_NAME@ skrivebordssynkroniseringsklient 
@@ -16,13 +16,12 @@ set(OC_OEM_SHARE_ICNS "${CMAKE_BINARY_DIR}/src/gui/ownCloud.icns")
 # those user-defined settings to build the plist.
 add_custom_target( mac_overlayplugin ALL
    xcodebuild -project ${CMAKE_SOURCE_DIR}/shell_integration/MacOSX/OwnCloudFinderSync/OwnCloudFinderSync.xcodeproj
-        -target FinderSyncExt -configuration Release "SYMROOT=${CMAKE_CURRENT_BINARY_DIR}"
-        "OC_OEM_SHARE_ICNS=${OC_OEM_SHARE_ICNS}"
-        "OC_APPLICATION_NAME=${APPLICATION_NAME}"
-        "OC_APPLICATION_REV_DOMAIN=${APPLICATION_REV_DOMAIN}"
-        "OC_SOCKETAPI_TEAM_IDENTIFIER_PREFIX=${SOCKETAPI_TEAM_IDENTIFIER_PREFIX}"
-    COMMENT building Mac Overlay icons
-    VERBATIM)
+        -target FinderSyncExt -configuration Release SYMROOT=${CMAKE_CURRENT_BINARY_DIR}
+        OC_OEM_SHARE_ICNS=${OC_OEM_SHARE_ICNS}
+        OC_APPLICATION_NAME="${APPLICATION_NAME}"
+        OC_APPLICATION_REV_DOMAIN=${APPLICATION_REV_DOMAIN}
+        OC_SOCKETAPI_TEAM_IDENTIFIER_PREFIX=${SOCKETAPI_TEAM_IDENTIFIER_PREFIX}
+    COMMENT building Mac Overlay icons)
 add_dependencies(mac_overlayplugin ${APPLICATION_EXECUTABLE}) # for the ownCloud.icns to be generated


@@ -155,13 +155,9 @@
 {
 	_shareMenuTitle = nil;
 	
-	[_registeredDirectories removeAllObjects];
-	// For some reason the FIFinderSync cache doesn't seem to be cleared for the root item when
-	// we reset the directoryURLs (seen on macOS 10.12 at least).
-	// First setting it to the FS root and then setting it to nil seems to work around the issue.
-	[FIFinderSyncController defaultController].directoryURLs = [NSSet setWithObject:[NSURL fileURLWithPath:@"/"]];
 	// This will tell Finder that this extension isn't attached to any directory
 	// until we can reconnect to the sync client.
+	[_registeredDirectories removeAllObjects];
 	[FIFinderSyncController defaultController].directoryURLs = nil;
 }

@@ -24,7 +24,6 @@
 #include <KIOCore/kfileitem.h>
 #include <KIOCore/KFileItemListProperties>
 #include <QtWidgets/QAction>
-#include <QtCore/QDir>
 #include <QtCore/QTimer>
 #include "ownclouddolphinpluginhelper.h"

@@ -44,8 +43,7 @@ public:
        auto url = urls.first();
        if (!url.isLocalFile())
            return {};
-        QDir localPath(url.toLocalFile());
-        auto localFile = localPath.canonicalPath();
+        auto localFile = url.toLocalFile();

        const auto paths = helper->paths();
        if (!std::any_of(paths.begin(), paths.end(), [&](const QString &s) {
@@ -21,7 +21,6 @@
 #include <KPluginFactory>
 #include <QtNetwork/QLocalSocket>
 #include <KIOCore/kfileitem.h>
-#include <QDir>
 #include <QTimer>
 #include "ownclouddolphinpluginhelper.h"

@@ -47,8 +46,7 @@ public:
            return QStringList();
        if (!url.isLocalFile())
            return QStringList();
-        QDir localPath(url.toLocalFile());
-        const QByteArray localFile = localPath.canonicalPath().toUtf8();
+        const QByteArray localFile = url.toLocalFile().toUtf8();

        helper->sendCommand(QByteArray("RETRIEVE_FILE_STATUS:" + localFile + "\n"));

@@ -36,54 +36,54 @@ using namespace std;

 OCClientInterface::ContextMenuInfo OCClientInterface::FetchInfo()
 {
-    auto pipename = CommunicationSocket::DefaultPipePath();
+	auto pipename = CommunicationSocket::DefaultPipePath();

-    CommunicationSocket socket;
-    if (!WaitNamedPipe(pipename.data(), PIPE_TIMEOUT)) {
-        return {};
-    }
-    if (!socket.Connect(pipename)) {
-        return {};
-    }
-    socket.SendMsg(L"SHARE_MENU_TITLE\n");
+	CommunicationSocket socket;
+	if (!WaitNamedPipe(pipename.data(), PIPE_TIMEOUT)) {
+		return {};
+	}
+	if (!socket.Connect(pipename)) {
+		return {};
+	}
+	socket.SendMsg(L"SHARE_MENU_TITLE\n");

-    ContextMenuInfo info;
-    std::wstring response;
-    int sleptCount = 0;
-    while (sleptCount < 5) {
-        if (socket.ReadLine(&response)) {
-            if (StringUtil::begins_with(response, wstring(L"REGISTER_PATH:"))) {
-                wstring responsePath = response.substr(14); // length of REGISTER_PATH
-                info.watchedDirectories.push_back(responsePath);
-            }
-            else if (StringUtil::begins_with(response, wstring(L"SHARE_MENU_TITLE:"))) {
-                info.shareMenuTitle = response.substr(17); // length of SHARE_MENU_TITLE:
-                break; // Stop once we received the last sent request
-            }
-        }
-        else {
-            Sleep(50);
-            ++sleptCount;
-        }
-    }
-    return info;
+	ContextMenuInfo info;
+	std::wstring response;
+	int sleptCount = 0;
+	while (sleptCount < 5) {
+		if (socket.ReadLine(&response)) {
+			if (StringUtil::begins_with(response, wstring(L"REGISTER_PATH:"))) {
+				wstring responsePath = response.substr(14); // length of REGISTER_PATH
+				info.watchedDirectories.push_back(responsePath);
+			}
+			else if (StringUtil::begins_with(response, wstring(L"SHARE_MENU_TITLE:"))) {
+				info.shareMenuTitle = response.substr(17); // length of SHARE_MENU_TITLE:
+				break; // Stop once we received the last sent request
+			}
+		}
+		else {
+			Sleep(50);
+			++sleptCount;
+		}
+	}
+	return info;
 }

 void OCClientInterface::ShareObject(const std::wstring &path)
 {
-    auto pipename = CommunicationSocket::DefaultPipePath();
+	auto pipename = CommunicationSocket::DefaultPipePath();

-    CommunicationSocket socket;
-    if (!WaitNamedPipe(pipename.data(), PIPE_TIMEOUT)) {
-        return;
-    }
-    if (!socket.Connect(pipename)) {
-        return;
-    }
+	CommunicationSocket socket;
+	if (!WaitNamedPipe(pipename.data(), PIPE_TIMEOUT)) {
+		return;
+	}
+	if (!socket.Connect(pipename)) {
+		return;
+	}

-    wchar_t msg[SOCK_BUFFER] = { 0 };
-    if (SUCCEEDED(StringCchPrintf(msg, SOCK_BUFFER, L"SHARE:%s\n", path.c_str())))
-    {
-        socket.SendMsg(msg);
-    }
+	wchar_t msg[SOCK_BUFFER] = { 0 };
+	if (SUCCEEDED(StringCchPrintf(msg, SOCK_BUFFER, L"SHARE:%s\n", path.c_str())))
+	{
+		socket.SendMsg(msg);
+	}
 }
@@ -43,12 +43,12 @@ class CommunicationSocket;
 class OCClientInterface
 {
 public:
-    struct ContextMenuInfo {
-        std::vector<std::wstring> watchedDirectories;
-        std::wstring shareMenuTitle;
-    };
-    static ContextMenuInfo FetchInfo();
-    static void ShareObject(const std::wstring &path);
+	struct ContextMenuInfo {
+		std::vector<std::wstring> watchedDirectories;
+		std::wstring shareMenuTitle;
+	};
+	static ContextMenuInfo FetchInfo();
+	static void ShareObject(const std::wstring &path);
 };

 #endif //ABSTRACTSOCKETHANDLER_H
@@ -30,27 +30,27 @@ extern long g_cDllRef;


 OCContextMenu::OCContextMenu(void) 
-    : m_cRef(1)
-    , m_pszMenuText(L"&Share")
-    , m_pszVerb("ocshare")
-    , m_pwszVerb(L"ocshare")
-    , m_pszVerbCanonicalName("OCShareViaOC")
-    , m_pwszVerbCanonicalName(L"OCShareViaOC")
-    , m_pszVerbHelpText("Share via ownCloud")
-    , m_pwszVerbHelpText(L"Share via ownCloud")
+	: m_cRef(1)
+	, m_pszMenuText(L"&Share")
+	, m_pszVerb("ocshare")
+	, m_pwszVerb(L"ocshare")
+	, m_pszVerbCanonicalName("OCShareViaOC")
+	, m_pwszVerbCanonicalName(L"OCShareViaOC")
+	, m_pszVerbHelpText("Share via ownCloud")
+	, m_pwszVerbHelpText(L"Share via ownCloud")
 {
-    InterlockedIncrement(&g_cDllRef);
+	InterlockedIncrement(&g_cDllRef);
 }

 OCContextMenu::~OCContextMenu(void)
 {
-    InterlockedDecrement(&g_cDllRef);
+	InterlockedDecrement(&g_cDllRef);
 }


 void OCContextMenu::OnVerbDisplayFileName(HWND hWnd)
 {
-    OCClientInterface::ShareObject(std::wstring(m_szSelectedFile));
+	OCClientInterface::ShareObject(std::wstring(m_szSelectedFile));
 }


@@ -59,30 +59,30 @@ void OCContextMenu::OnVerbDisplayFileName(HWND hWnd)
 // Query to the interface the component supported.
 IFACEMETHODIMP OCContextMenu::QueryInterface(REFIID riid, void **ppv)
 {
-    static const QITAB qit[] =
-    {
-        QITABENT(OCContextMenu, IContextMenu),
-        QITABENT(OCContextMenu, IShellExtInit),
-        { 0 },
-    };
-    return QISearch(this, qit, riid, ppv);
+	static const QITAB qit[] =
+	{
+		QITABENT(OCContextMenu, IContextMenu),
+		QITABENT(OCContextMenu, IShellExtInit),
+		{ 0 },
+	};
+	return QISearch(this, qit, riid, ppv);
 }

 // Increase the reference count for an interface on an object.
 IFACEMETHODIMP_(ULONG) OCContextMenu::AddRef()
 {
-    return InterlockedIncrement(&m_cRef);
+	return InterlockedIncrement(&m_cRef);
 }

 // Decrease the reference count for an interface on an object.
 IFACEMETHODIMP_(ULONG) OCContextMenu::Release()
 {
-    ULONG cRef = InterlockedDecrement(&m_cRef);
-    if (0 == cRef) {
-        delete this;
-    }
+	ULONG cRef = InterlockedDecrement(&m_cRef);
+	if (0 == cRef) {
+		delete this;
+	}

-    return cRef;
+	return cRef;
 }

 #pragma endregion
@@ -92,40 +92,40 @@ IFACEMETHODIMP_(ULONG) OCContextMenu::Release()

 // Initialize the context menu handler.
 IFACEMETHODIMP OCContextMenu::Initialize(
-    LPCITEMIDLIST pidlFolder, LPDATAOBJECT pDataObj, HKEY hKeyProgID)
+	LPCITEMIDLIST pidlFolder, LPDATAOBJECT pDataObj, HKEY hKeyProgID)
 {
-    if (!pDataObj) {
-        return E_INVALIDARG;
-    }
+	if (!pDataObj) {
+		return E_INVALIDARG;
+	}

-    HRESULT hr = E_FAIL;
+	HRESULT hr = E_FAIL;

-    FORMATETC fe = { CF_HDROP, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL };
-    STGMEDIUM stm;
+	FORMATETC fe = { CF_HDROP, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL };
+	STGMEDIUM stm;

-    if (SUCCEEDED(pDataObj->GetData(&fe, &stm))) {
-        // Get an HDROP handle.
-        HDROP hDrop = static_cast<HDROP>(GlobalLock(stm.hGlobal));
-        if (hDrop) {
-            // Ignore multi-selections
-            UINT nFiles = DragQueryFile(hDrop, 0xFFFFFFFF, NULL, 0);
-            if (nFiles == 1) {
-                // Get the path of the file.
-                if (0 != DragQueryFile(hDrop, 0, m_szSelectedFile,  ARRAYSIZE(m_szSelectedFile)))
-                {
-                    hr = S_OK;
-                }
-            }
+	if (SUCCEEDED(pDataObj->GetData(&fe, &stm))) {
+		// Get an HDROP handle.
+		HDROP hDrop = static_cast<HDROP>(GlobalLock(stm.hGlobal));
+		if (hDrop) {
+			// Ignore multi-selections
+			UINT nFiles = DragQueryFile(hDrop, 0xFFFFFFFF, NULL, 0);
+			if (nFiles == 1) {
+				// Get the path of the file.
+				if (0 != DragQueryFile(hDrop, 0, m_szSelectedFile,	ARRAYSIZE(m_szSelectedFile)))
+				{
+					hr = S_OK;
+				}
+			}

-            GlobalUnlock(stm.hGlobal);
-        }
+			GlobalUnlock(stm.hGlobal);
+		}

-        ReleaseStgMedium(&stm);
-    }
+		ReleaseStgMedium(&stm);
+	}

-    // If any value other than S_OK is returned from the method, the context 
-    // menu item is not displayed.
-    return hr;
+	// If any value other than S_OK is returned from the method, the context 
+	// menu item is not displayed.
+	return hr;
 }

 #pragma endregion
@@ -135,136 +135,135 @@ IFACEMETHODIMP OCContextMenu::Initialize(

 void InsertSeperator(HMENU hMenu, UINT indexMenu)
 {
-    // Add a separator.
-    MENUITEMINFO sep = { sizeof(sep) };
-    sep.fMask = MIIM_TYPE;
-    sep.fType = MFT_SEPARATOR;
-    InsertMenuItem(hMenu, indexMenu, TRUE, &sep);
+	// Add a separator.
+	MENUITEMINFO sep = { sizeof(sep) };
+	sep.fMask = MIIM_TYPE;
+	sep.fType = MFT_SEPARATOR;
+	InsertMenuItem(hMenu, indexMenu, TRUE, &sep);
 }

 IFACEMETHODIMP OCContextMenu::QueryContextMenu(HMENU hMenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags)
 {
-    // If uFlags include CMF_DEFAULTONLY then we should not do anything.
-    if (CMF_DEFAULTONLY & uFlags)
-    {
-        return MAKE_HRESULT(SEVERITY_SUCCESS, 0, USHORT(0));
-    }
+	// If uFlags include CMF_DEFAULTONLY then we should not do anything.
+	if (CMF_DEFAULTONLY & uFlags)
+	{
+		return MAKE_HRESULT(SEVERITY_SUCCESS, 0, USHORT(0));
+	}

-    OCClientInterface::ContextMenuInfo info = OCClientInterface::FetchInfo();
-    bool skip = true;
-    size_t selectedFileLength = wcslen(m_szSelectedFile);
-    for (const std::wstring path : info.watchedDirectories) {
-        if (StringUtil::isDescendantOf(m_szSelectedFile, selectedFileLength, path)) {
-            skip = false;
-            break;
-        }
-    }
+	OCClientInterface::ContextMenuInfo info = OCClientInterface::FetchInfo();
+	bool skip = true;
+	for (const std::wstring path : info.watchedDirectories) {
+		if (StringUtil::begins_with(std::wstring(m_szSelectedFile), path)) {
+			skip = false;
+			break;
+		}
+	}

-    if (skip) {
-        return MAKE_HRESULT(SEVERITY_SUCCESS, 0, USHORT(0));
-    }
+	if (skip) {
+		return MAKE_HRESULT(SEVERITY_SUCCESS, 0, USHORT(0));
+	}

-    InsertSeperator(hMenu, indexMenu);
-    indexMenu++;
+	InsertSeperator(hMenu, indexMenu);
+	indexMenu++;

-    assert(!info.shareMenuTitle.empty());
-    MENUITEMINFO mii = { sizeof(mii) };
-    mii.fMask = MIIM_STRING | MIIM_FTYPE | MIIM_ID | MIIM_STATE;
-    mii.wID = idCmdFirst + IDM_SHARE;
-    mii.fType = MFT_STRING;
-    mii.dwTypeData = &info.shareMenuTitle[0];
-    mii.fState = MFS_ENABLED;
-    if (!InsertMenuItem(hMenu, indexMenu, TRUE, &mii))
-    {
-        return HRESULT_FROM_WIN32(GetLastError());
-    }
+	assert(!info.shareMenuTitle.empty());
+	MENUITEMINFO mii = { sizeof(mii) };
+	mii.fMask = MIIM_STRING | MIIM_FTYPE | MIIM_ID | MIIM_STATE;
+	mii.wID = idCmdFirst + IDM_SHARE;
+	mii.fType = MFT_STRING;
+	mii.dwTypeData = &info.shareMenuTitle[0];
+	mii.fState = MFS_ENABLED;
+	if (!InsertMenuItem(hMenu, indexMenu, TRUE, &mii))
+	{
+		return HRESULT_FROM_WIN32(GetLastError());
+	}

-    indexMenu++;
-    InsertSeperator(hMenu, indexMenu);
+	indexMenu++;
+	InsertSeperator(hMenu, indexMenu);


-    // Return an HRESULT value with the severity set to SEVERITY_SUCCESS. 
-    // Set the code value to the offset of the largest command identifier 
-    // that was assigned, plus one (1).
-    return MAKE_HRESULT(SEVERITY_SUCCESS, 0, USHORT(IDM_SHARE + 1));
+	// Return an HRESULT value with the severity set to SEVERITY_SUCCESS. 
+	// Set the code value to the offset of the largest command identifier 
+	// that was assigned, plus one (1).
+	return MAKE_HRESULT(SEVERITY_SUCCESS, 0, USHORT(IDM_SHARE + 1));
 }

 IFACEMETHODIMP OCContextMenu::InvokeCommand(LPCMINVOKECOMMANDINFO pici)
 {

-    // For the Unicode case, if the high-order word is not zero, the 
-    // command's verb string is in lpcmi->lpVerbW. 
-    if (HIWORD(((CMINVOKECOMMANDINFOEX*)pici)->lpVerbW))
-    {
-        // Is the verb supported by this context menu extension?
-        if (StrCmpIW(((CMINVOKECOMMANDINFOEX*)pici)->lpVerbW, m_pwszVerb) == 0)
-        {
-            OnVerbDisplayFileName(pici->hwnd);
-        }
-        else
-        {
-            // If the verb is not recognized by the context menu handler, it 
-            // must return E_FAIL to allow it to be passed on to the other 
-            // context menu handlers that might implement that verb.
-            return E_FAIL;
-        }
-    }
+	// For the Unicode case, if the high-order word is not zero, the 
+	// command's verb string is in lpcmi->lpVerbW. 
+	if (HIWORD(((CMINVOKECOMMANDINFOEX*)pici)->lpVerbW))
+	{
+		// Is the verb supported by this context menu extension?
+		if (StrCmpIW(((CMINVOKECOMMANDINFOEX*)pici)->lpVerbW, m_pwszVerb) == 0)
+		{
+			OnVerbDisplayFileName(pici->hwnd);
+		}
+		else
+		{
+			// If the verb is not recognized by the context menu handler, it 
+			// must return E_FAIL to allow it to be passed on to the other 
+			// context menu handlers that might implement that verb.
+			return E_FAIL;
+		}
+	}

-    // If the command cannot be identified through the verb string, then 
-    // check the identifier offset.
-    else
-    {
-        // Is the command identifier offset supported by this context menu 
-        // extension?
-        if (LOWORD(pici->lpVerb) == IDM_SHARE)
-        {
-            OnVerbDisplayFileName(pici->hwnd);
-        }
-        else
-        {
-            // If the verb is not recognized by the context menu handler, it 
-            // must return E_FAIL to allow it to be passed on to the other 
-            // context menu handlers that might implement that verb.
-            return E_FAIL;
-        }
-    }
+	// If the command cannot be identified through the verb string, then 
+	// check the identifier offset.
+	else
+	{
+		// Is the command identifier offset supported by this context menu 
+		// extension?
+		if (LOWORD(pici->lpVerb) == IDM_SHARE)
+		{
+			OnVerbDisplayFileName(pici->hwnd);
+		}
+		else
+		{
+			// If the verb is not recognized by the context menu handler, it 
+			// must return E_FAIL to allow it to be passed on to the other 
+			// context menu handlers that might implement that verb.
+			return E_FAIL;
+		}
+	}

-    return S_OK;
+	return S_OK;
 }

 IFACEMETHODIMP OCContextMenu::GetCommandString(UINT_PTR idCommand,
-    UINT uFlags, UINT *pwReserved, LPSTR pszName, UINT cchMax)
+	UINT uFlags, UINT *pwReserved, LPSTR pszName, UINT cchMax)
 {
-    HRESULT hr = E_INVALIDARG;
+	HRESULT hr = E_INVALIDARG;

-    if (idCommand == IDM_SHARE)
-    {
-        switch (uFlags)
-        {
-        case GCS_HELPTEXTW:
-            // Only useful for pre-Vista versions of Windows that have a 
-            // Status bar.
-            hr = StringCchCopy(reinterpret_cast<PWSTR>(pszName), cchMax,
-                m_pwszVerbHelpText);
-            break;
+	if (idCommand == IDM_SHARE)
+	{
+		switch (uFlags)
+		{
+		case GCS_HELPTEXTW:
+			// Only useful for pre-Vista versions of Windows that have a 
+			// Status bar.
+			hr = StringCchCopy(reinterpret_cast<PWSTR>(pszName), cchMax,
+				m_pwszVerbHelpText);
+			break;

-        case GCS_VERBW:
-            // GCS_VERBW is an optional feature that enables a caller to 
-            // discover the canonical name for the verb passed in through 
-            // idCommand.
-            hr = StringCchCopy(reinterpret_cast<PWSTR>(pszName), cchMax,
-                m_pwszVerbCanonicalName);
-            break;
+		case GCS_VERBW:
+			// GCS_VERBW is an optional feature that enables a caller to 
+			// discover the canonical name for the verb passed in through 
+			// idCommand.
+			hr = StringCchCopy(reinterpret_cast<PWSTR>(pszName), cchMax,
+				m_pwszVerbCanonicalName);
+			break;

-        default:
-            hr = S_OK;
-        }
-    }
+		default:
+			hr = S_OK;
+		}
+	}

-    // If the command (idCommand) is not supported by this context menu 
-    // extension handler, return E_INVALIDARG.
+	// If the command (idCommand) is not supported by this context menu 
+	// extension handler, return E_INVALIDARG.

-    return hr;
+	return hr;
 }

 #pragma endregion
@@ -26,12 +26,12 @@ extern long g_cDllRef;

 OCContextMenuFactory::OCContextMenuFactory() : m_cRef(1)
 {
-    InterlockedIncrement(&g_cDllRef);
+	InterlockedIncrement(&g_cDllRef);
 }

 OCContextMenuFactory::~OCContextMenuFactory()
 {
-    InterlockedDecrement(&g_cDllRef);
+	InterlockedDecrement(&g_cDllRef);
 }


@@ -39,22 +39,22 @@ OCContextMenuFactory::~OCContextMenuFactory()

 IFACEMETHODIMP OCContextMenuFactory::QueryInterface(REFIID riid, void **ppv)
 {
-    static const QITAB qit[] =  { QITABENT(OCContextMenuFactory, IClassFactory), { 0 }, };
-    return QISearch(this, qit, riid, ppv);
+	static const QITAB qit[] =	{ QITABENT(OCContextMenuFactory, IClassFactory), { 0 },	};
+	return QISearch(this, qit, riid, ppv);
 }

 IFACEMETHODIMP_(ULONG) OCContextMenuFactory::AddRef()
 {
-    return InterlockedIncrement(&m_cRef);
+	return InterlockedIncrement(&m_cRef);
 }

 IFACEMETHODIMP_(ULONG) OCContextMenuFactory::Release()
 {
-    ULONG cRef = InterlockedDecrement(&m_cRef);
-    if (0 == cRef) {
-        delete this;
-    }
-    return cRef;
+	ULONG cRef = InterlockedDecrement(&m_cRef);
+	if (0 == cRef) {
+		delete this;
+	}
+	return cRef;
 }


@@ -62,30 +62,30 @@ IFACEMETHODIMP_(ULONG) OCContextMenuFactory::Release()

 IFACEMETHODIMP OCContextMenuFactory::CreateInstance(IUnknown *pUnkOuter, REFIID riid, void **ppv)
 {
-    HRESULT hr = CLASS_E_NOAGGREGATION;
+	HRESULT hr = CLASS_E_NOAGGREGATION;

-    // pUnkOuter is used for aggregation. We do not support it in the sample.
-    if (pUnkOuter == NULL) {
-        hr = E_OUTOFMEMORY;
+	// pUnkOuter is used for aggregation. We do not support it in the sample.
+	if (pUnkOuter == NULL) {
+		hr = E_OUTOFMEMORY;

-        // Create the COM component.
-        OCContextMenu *pExt = new (std::nothrow) OCContextMenu();
-        if (pExt) {
-            // Query the specified interface.
-            hr = pExt->QueryInterface(riid, ppv);
-            pExt->Release();
-        }
-    }
+		// Create the COM component.
+		OCContextMenu *pExt = new (std::nothrow) OCContextMenu();
+		if (pExt) {
+			// Query the specified interface.
+			hr = pExt->QueryInterface(riid, ppv);
+			pExt->Release();
+		}
+	}

-    return hr;
+	return hr;
 }

 IFACEMETHODIMP OCContextMenuFactory::LockServer(BOOL fLock)
 {
-    if (fLock)  {
-        InterlockedIncrement(&g_cDllRef);
-    } else {
-        InterlockedDecrement(&g_cDllRef);
-    }
-    return S_OK;
+	if (fLock)	{
+		InterlockedIncrement(&g_cDllRef);
+	} else {
+		InterlockedDecrement(&g_cDllRef);
+	}
+	return S_OK;
 }
@@ -23,20 +23,20 @@
 class OCContextMenuFactory : public IClassFactory
 {
 public:
-    // IUnknown
-    IFACEMETHODIMP QueryInterface(REFIID riid, void **ppv);
-    IFACEMETHODIMP_(ULONG) AddRef();
-    IFACEMETHODIMP_(ULONG) Release();
+	// IUnknown
+	IFACEMETHODIMP QueryInterface(REFIID riid, void **ppv);
+	IFACEMETHODIMP_(ULONG) AddRef();
+	IFACEMETHODIMP_(ULONG) Release();

-    // IClassFactory
-    IFACEMETHODIMP CreateInstance(IUnknown *pUnkOuter, REFIID riid, void **ppv);
-    IFACEMETHODIMP LockServer(BOOL fLock);
+	// IClassFactory
+	IFACEMETHODIMP CreateInstance(IUnknown *pUnkOuter, REFIID riid, void **ppv);
+	IFACEMETHODIMP LockServer(BOOL fLock);

-    OCContextMenuFactory();
+	OCContextMenuFactory();

 private:
-    ~OCContextMenuFactory();
-    long m_cRef;
+	~OCContextMenuFactory();
+	long m_cRef;
 };

 #endif //OCCONTEXTMENUFACTORY_H
@@ -23,196 +23,196 @@ namespace {

 HRESULT SetHKCRRegistryKeyAndValue(PCWSTR pszSubKey, PCWSTR pszValueName, PCWSTR pszData)
 {
-    HRESULT hr;
-    HKEY hKey = NULL;
+	HRESULT hr;
+	HKEY hKey = NULL;

-    // Creates the specified registry key. If the key already exists, the 
-    // function opens it. 
-    hr = HRESULT_FROM_WIN32(RegCreateKeyEx(HKEY_CLASSES_ROOT, pszSubKey, 0,
-        NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, NULL));
+	// Creates the specified registry key. If the key already exists, the 
+	// function opens it. 
+	hr = HRESULT_FROM_WIN32(RegCreateKeyEx(HKEY_CLASSES_ROOT, pszSubKey, 0,
+		NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, NULL));

-    if (SUCCEEDED(hr))
-    {
-        if (pszData != NULL)
-        {
-            // Set the specified value of the key.
-            DWORD cbData = lstrlen(pszData) * sizeof(*pszData);
-            hr = HRESULT_FROM_WIN32(RegSetValueEx(hKey, pszValueName, 0,
-                REG_SZ, reinterpret_cast<const BYTE *>(pszData), cbData));
-        }
+	if (SUCCEEDED(hr))
+	{
+		if (pszData != NULL)
+		{
+			// Set the specified value of the key.
+			DWORD cbData = lstrlen(pszData) * sizeof(*pszData);
+			hr = HRESULT_FROM_WIN32(RegSetValueEx(hKey, pszValueName, 0,
+				REG_SZ, reinterpret_cast<const BYTE *>(pszData), cbData));
+		}

-        RegCloseKey(hKey);
-    }
+		RegCloseKey(hKey);
+	}

-    return hr;
+	return hr;
 }

 HRESULT GetHKCRRegistryKeyAndValue(PCWSTR pszSubKey, PCWSTR pszValueName, PWSTR pszData, DWORD cbData)
 {
-    HRESULT hr;
-    HKEY hKey = NULL;
+	HRESULT hr;
+	HKEY hKey = NULL;

-    // Try to open the specified registry key. 
-    hr = HRESULT_FROM_WIN32(RegOpenKeyEx(HKEY_CLASSES_ROOT, pszSubKey, 0,
-        KEY_READ, &hKey));
+	// Try to open the specified registry key. 
+	hr = HRESULT_FROM_WIN32(RegOpenKeyEx(HKEY_CLASSES_ROOT, pszSubKey, 0,
+		KEY_READ, &hKey));

-    if (SUCCEEDED(hr))
-    {
-        // Get the data for the specified value name.
-        hr = HRESULT_FROM_WIN32(RegQueryValueEx(hKey, pszValueName, NULL,
-            NULL, reinterpret_cast<LPBYTE>(pszData), &cbData));
+	if (SUCCEEDED(hr))
+	{
+		// Get the data for the specified value name.
+		hr = HRESULT_FROM_WIN32(RegQueryValueEx(hKey, pszValueName, NULL,
+			NULL, reinterpret_cast<LPBYTE>(pszData), &cbData));

-        RegCloseKey(hKey);
-    }
+		RegCloseKey(hKey);
+	}

-    return hr;
+	return hr;
 }

 }

 HRESULT OCContextMenuRegHandler::RegisterInprocServer(PCWSTR pszModule, const CLSID& clsid, PCWSTR pszFriendlyName, PCWSTR pszThreadModel)
 {
-    if (pszModule == NULL || pszThreadModel == NULL)
-    {
-        return E_INVALIDARG;
-    }
+	if (pszModule == NULL || pszThreadModel == NULL)
+	{
+		return E_INVALIDARG;
+	}

-    HRESULT hr;
+	HRESULT hr;

-    wchar_t szCLSID[MAX_PATH];
-    StringFromGUID2(clsid, szCLSID, ARRAYSIZE(szCLSID));
+	wchar_t szCLSID[MAX_PATH];
+	StringFromGUID2(clsid, szCLSID, ARRAYSIZE(szCLSID));

-    wchar_t szSubkey[MAX_PATH];
+	wchar_t szSubkey[MAX_PATH];

-    // Create the HKCR\CLSID\{<CLSID>} key.
-    hr = StringCchPrintf(szSubkey, ARRAYSIZE(szSubkey), L"CLSID\\%s", szCLSID);
-    if (SUCCEEDED(hr))
-    {
-        hr = SetHKCRRegistryKeyAndValue(szSubkey, NULL, pszFriendlyName);
+	// Create the HKCR\CLSID\{<CLSID>} key.
+	hr = StringCchPrintf(szSubkey, ARRAYSIZE(szSubkey), L"CLSID\\%s", szCLSID);
+	if (SUCCEEDED(hr))
+	{
+		hr = SetHKCRRegistryKeyAndValue(szSubkey, NULL, pszFriendlyName);

-        // Create the HKCR\CLSID\{<CLSID>}\InprocServer32 key.
-        if (SUCCEEDED(hr))
-        {
-            hr = StringCchPrintf(szSubkey, ARRAYSIZE(szSubkey),
-                L"CLSID\\%s\\InprocServer32", szCLSID);
-            if (SUCCEEDED(hr))
-            {
-                // Set the default value of the InprocServer32 key to the 
-                // path of the COM module.
-                hr = SetHKCRRegistryKeyAndValue(szSubkey, NULL, pszModule);
-                if (SUCCEEDED(hr))
-                {
-                    // Set the threading model of the component.
-                    hr = SetHKCRRegistryKeyAndValue(szSubkey,
-                        L"ThreadingModel", pszThreadModel);
-                }
-            }
-        }
-    }
+		// Create the HKCR\CLSID\{<CLSID>}\InprocServer32 key.
+		if (SUCCEEDED(hr))
+		{
+			hr = StringCchPrintf(szSubkey, ARRAYSIZE(szSubkey),
+				L"CLSID\\%s\\InprocServer32", szCLSID);
+			if (SUCCEEDED(hr))
+			{
+				// Set the default value of the InprocServer32 key to the 
+				// path of the COM module.
+				hr = SetHKCRRegistryKeyAndValue(szSubkey, NULL, pszModule);
+				if (SUCCEEDED(hr))
+				{
+					// Set the threading model of the component.
+					hr = SetHKCRRegistryKeyAndValue(szSubkey,
+						L"ThreadingModel", pszThreadModel);
+				}
+			}
+		}
+	}

-    return hr;
+	return hr;
 }

 HRESULT OCContextMenuRegHandler::UnregisterInprocServer(const CLSID& clsid)
 {
-    HRESULT hr = S_OK;
+	HRESULT hr = S_OK;

-    wchar_t szCLSID[MAX_PATH];
-    StringFromGUID2(clsid, szCLSID, ARRAYSIZE(szCLSID));
+	wchar_t szCLSID[MAX_PATH];
+	StringFromGUID2(clsid, szCLSID, ARRAYSIZE(szCLSID));

-    wchar_t szSubkey[MAX_PATH];
+	wchar_t szSubkey[MAX_PATH];

-    // Delete the HKCR\CLSID\{<CLSID>} key.
-    hr = StringCchPrintf(szSubkey, ARRAYSIZE(szSubkey), L"CLSID\\%s", szCLSID);
-    if (SUCCEEDED(hr))
-    {
-        hr = HRESULT_FROM_WIN32(RegDelnode(HKEY_CLASSES_ROOT, szSubkey));
-    }
+	// Delete the HKCR\CLSID\{<CLSID>} key.
+	hr = StringCchPrintf(szSubkey, ARRAYSIZE(szSubkey), L"CLSID\\%s", szCLSID);
+	if (SUCCEEDED(hr))
+	{
+		hr = HRESULT_FROM_WIN32(RegDelnode(HKEY_CLASSES_ROOT, szSubkey));
+	}

-    return hr;
+	return hr;
 }


 HRESULT OCContextMenuRegHandler::RegisterShellExtContextMenuHandler(
-    PCWSTR pszFileType, const CLSID& clsid, PCWSTR pszFriendlyName)
+	PCWSTR pszFileType, const CLSID& clsid, PCWSTR pszFriendlyName)
 {
-    if (pszFileType == NULL)
-    {
-        return E_INVALIDARG;
-    }
+	if (pszFileType == NULL)
+	{
+		return E_INVALIDARG;
+	}

-    HRESULT hr;
+	HRESULT hr;

-    wchar_t szCLSID[MAX_PATH];
-    StringFromGUID2(clsid, szCLSID, ARRAYSIZE(szCLSID));
+	wchar_t szCLSID[MAX_PATH];
+	StringFromGUID2(clsid, szCLSID, ARRAYSIZE(szCLSID));

-    wchar_t szSubkey[MAX_PATH];
+	wchar_t szSubkey[MAX_PATH];

-    // If pszFileType starts with '.', try to read the default value of the 
-    // HKCR\<File Type> key which contains the ProgID to which the file type 
-    // is linked.
-    if (*pszFileType == L'.')
-    {
-        wchar_t szDefaultVal[260];
-        hr = GetHKCRRegistryKeyAndValue(pszFileType, NULL, szDefaultVal,
-            sizeof(szDefaultVal));
+	// If pszFileType starts with '.', try to read the default value of the 
+	// HKCR\<File Type> key which contains the ProgID to which the file type 
+	// is linked.
+	if (*pszFileType == L'.')
+	{
+		wchar_t szDefaultVal[260];
+		hr = GetHKCRRegistryKeyAndValue(pszFileType, NULL, szDefaultVal,
+			sizeof(szDefaultVal));

-        // If the key exists and its default value is not empty, use the 
-        // ProgID as the file type.
-        if (SUCCEEDED(hr) && szDefaultVal[0] != L'\0')
-        {
-            pszFileType = szDefaultVal;
-        }
-    }
+		// If the key exists and its default value is not empty, use the 
+		// ProgID as the file type.
+		if (SUCCEEDED(hr) && szDefaultVal[0] != L'\0')
+		{
+			pszFileType = szDefaultVal;
+		}
+	}

-    // Create the key HKCR\<File Type>\shellex\ContextMenuHandlers\{friendlyName>}
-    hr = StringCchPrintf(szSubkey, ARRAYSIZE(szSubkey),
-        L"%s\\shellex\\ContextMenuHandlers\\%s", pszFileType, pszFriendlyName);
-    if (SUCCEEDED(hr))
-    {
-        // Set the default value of the key.
-        hr = SetHKCRRegistryKeyAndValue(szSubkey, NULL, szCLSID);
-    }
+	// Create the key HKCR\<File Type>\shellex\ContextMenuHandlers\{friendlyName>}
+	hr = StringCchPrintf(szSubkey, ARRAYSIZE(szSubkey),
+		L"%s\\shellex\\ContextMenuHandlers\\%s", pszFileType, pszFriendlyName);
+	if (SUCCEEDED(hr))
+	{
+		// Set the default value of the key.
+		hr = SetHKCRRegistryKeyAndValue(szSubkey, NULL, szCLSID);
+	}

-    return hr;
+	return hr;
 }

 HRESULT OCContextMenuRegHandler::UnregisterShellExtContextMenuHandler(
-    PCWSTR pszFileType, PCWSTR pszFriendlyName)
+	PCWSTR pszFileType, PCWSTR pszFriendlyName)
 {
-    if (pszFileType == NULL)
-    {
-        return E_INVALIDARG;
-    }
+	if (pszFileType == NULL)
+	{
+		return E_INVALIDARG;
+	}

-    HRESULT hr;
-    
-    wchar_t szSubkey[MAX_PATH];
+	HRESULT hr;
+	
+	wchar_t szSubkey[MAX_PATH];

-    // If pszFileType starts with '.', try to read the default value of the 
-    // HKCR\<File Type> key which contains the ProgID to which the file type 
-    // is linked.
-    if (*pszFileType == L'.')
-    {
-        wchar_t szDefaultVal[260];
-        hr = GetHKCRRegistryKeyAndValue(pszFileType, NULL, szDefaultVal,
-            sizeof(szDefaultVal));
+	// If pszFileType starts with '.', try to read the default value of the 
+	// HKCR\<File Type> key which contains the ProgID to which the file type 
+	// is linked.
+	if (*pszFileType == L'.')
+	{
+		wchar_t szDefaultVal[260];
+		hr = GetHKCRRegistryKeyAndValue(pszFileType, NULL, szDefaultVal,
+			sizeof(szDefaultVal));

-        // If the key exists and its default value is not empty, use the 
-        // ProgID as the file type.
-        if (SUCCEEDED(hr) && szDefaultVal[0] != L'\0')
-        {
-            pszFileType = szDefaultVal;
-        }
-    }
+		// If the key exists and its default value is not empty, use the 
+		// ProgID as the file type.
+		if (SUCCEEDED(hr) && szDefaultVal[0] != L'\0')
+		{
+			pszFileType = szDefaultVal;
+		}
+	}

-    // Remove the HKCR\<File Type>\shellex\ContextMenuHandlers\{friendlyName} key.
-    hr = StringCchPrintf(szSubkey, ARRAYSIZE(szSubkey),
-        L"%s\\shellex\\ContextMenuHandlers\\%s", pszFileType, pszFriendlyName);
-    if (SUCCEEDED(hr))
-    {
-        hr = HRESULT_FROM_WIN32(RegDelnode(HKEY_CLASSES_ROOT, szSubkey));
-    }
+	// Remove the HKCR\<File Type>\shellex\ContextMenuHandlers\{friendlyName} key.
+	hr = StringCchPrintf(szSubkey, ARRAYSIZE(szSubkey),
+		L"%s\\shellex\\ContextMenuHandlers\\%s", pszFileType, pszFriendlyName);
+	if (SUCCEEDED(hr))
+	{
+		hr = HRESULT_FROM_WIN32(RegDelnode(HKEY_CLASSES_ROOT, szSubkey));
+	}

-    return hr;
+	return hr;
 }
@@ -23,16 +23,16 @@
 class __declspec(dllexport) OCContextMenuRegHandler
 {
 public:
-    static HRESULT MakeRegistryEntries(const CLSID& clsid, PCWSTR fileType);
-    static HRESULT RegisterCOMObject(PCWSTR modulePath, PCWSTR friendlyName, const CLSID& clsid);
-    static HRESULT RemoveRegistryEntries(PCWSTR friendlyName);
-    static HRESULT UnregisterCOMObject(const CLSID& clsid);
+	static HRESULT MakeRegistryEntries(const CLSID& clsid, PCWSTR fileType);
+	static HRESULT RegisterCOMObject(PCWSTR modulePath, PCWSTR friendlyName, const CLSID& clsid);
+	static HRESULT RemoveRegistryEntries(PCWSTR friendlyName);
+	static HRESULT UnregisterCOMObject(const CLSID& clsid);

-    static HRESULT RegisterInprocServer(PCWSTR pszModule, const CLSID& clsid, PCWSTR pszFriendlyName, PCWSTR pszThreadModel);
-    static HRESULT UnregisterInprocServer(const CLSID& clsid);
+	static HRESULT RegisterInprocServer(PCWSTR pszModule, const CLSID& clsid, PCWSTR pszFriendlyName, PCWSTR pszThreadModel);
+	static HRESULT UnregisterInprocServer(const CLSID& clsid);

-    static HRESULT RegisterShellExtContextMenuHandler(PCWSTR pszFileType, const CLSID& clsid, PCWSTR pszFriendlyName);
-    static HRESULT UnregisterShellExtContextMenuHandler(PCWSTR pszFileType, PCWSTR pszFriendlyName);
+	static HRESULT RegisterShellExtContextMenuHandler(PCWSTR pszFileType, const CLSID& clsid, PCWSTR pszFriendlyName);
+	static HRESULT UnregisterShellExtContextMenuHandler(PCWSTR pszFileType, PCWSTR pszFriendlyName);
 };

 #endif //OCCONTEXTMENUREGHANDLER_H
@@ -23,142 +23,142 @@ long dllReferenceCount = 0;

 BOOL APIENTRY DllMain(HMODULE hModule, DWORD dwReason, LPVOID lpReserved)
 {
-    switch (dwReason)
-    {
-        case DLL_PROCESS_ATTACH:
-            instanceHandle = hModule;
-            DisableThreadLibraryCalls(hModule);
-            break;
-        case DLL_THREAD_ATTACH:
-        case DLL_THREAD_DETACH:
-        case DLL_PROCESS_DETACH:
-            break;
-    }
+	switch (dwReason)
+	{
+		case DLL_PROCESS_ATTACH:
+			instanceHandle = hModule;
+			DisableThreadLibraryCalls(hModule);
+			break;
+		case DLL_THREAD_ATTACH:
+		case DLL_THREAD_DETACH:
+		case DLL_PROCESS_DETACH:
+			break;
+	}

-    return TRUE;
+	return TRUE;
 }

 HRESULT CreateFactory(REFIID riid, void **ppv, int state)
 {
-    HRESULT hResult = E_OUTOFMEMORY;
+	HRESULT hResult = E_OUTOFMEMORY;

-    OCOverlayFactory* ocOverlayFactory = new OCOverlayFactory(state);
+	OCOverlayFactory* ocOverlayFactory = new OCOverlayFactory(state);

-    if (ocOverlayFactory) {
-        hResult = ocOverlayFactory->QueryInterface(riid, ppv);
-        ocOverlayFactory->Release();
-    }
-    return hResult;
+	if (ocOverlayFactory) {
+		hResult = ocOverlayFactory->QueryInterface(riid, ppv);
+		ocOverlayFactory->Release();
+	}
+	return hResult;
 }

 STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv)
 {
    HRESULT hResult = CLASS_E_CLASSNOTAVAILABLE;
-    GUID guid;
+	GUID guid;
 
-    hResult = CLSIDFromString(OVERLAY_GUID_ERROR, (LPCLSID)&guid);
-    if (!SUCCEEDED(hResult)) { return hResult; }
-    if (IsEqualCLSID(guid, rclsid)) { return CreateFactory(riid, ppv, State_Error); }
+	hResult = CLSIDFromString(OVERLAY_GUID_ERROR, (LPCLSID)&guid);
+	if (!SUCCEEDED(hResult)) { return hResult; }
+	if (IsEqualCLSID(guid, rclsid)) { return CreateFactory(riid, ppv, State_Error); }

-    hResult = CLSIDFromString(OVERLAY_GUID_OK, (LPCLSID)&guid);
-    if (!SUCCEEDED(hResult)) { return hResult; }
-    if (IsEqualCLSID(guid, rclsid)) { return CreateFactory(riid, ppv, State_OK); }
+	hResult = CLSIDFromString(OVERLAY_GUID_OK, (LPCLSID)&guid);
+	if (!SUCCEEDED(hResult)) { return hResult; }
+	if (IsEqualCLSID(guid, rclsid)) { return CreateFactory(riid, ppv, State_OK); }

-    hResult = CLSIDFromString(OVERLAY_GUID_OK_SHARED, (LPCLSID)&guid);
-    if (!SUCCEEDED(hResult)) { return hResult; }
-    if (IsEqualCLSID(guid, rclsid)) { return CreateFactory(riid, ppv, State_OKShared); }
+	hResult = CLSIDFromString(OVERLAY_GUID_OK_SHARED, (LPCLSID)&guid);
+	if (!SUCCEEDED(hResult)) { return hResult; }
+	if (IsEqualCLSID(guid, rclsid)) { return CreateFactory(riid, ppv, State_OKShared); }

-    hResult = CLSIDFromString(OVERLAY_GUID_SYNC, (LPCLSID)&guid);
-    if (!SUCCEEDED(hResult)) { return hResult; }
-    if (IsEqualCLSID(guid, rclsid)) { return CreateFactory(riid, ppv, State_Sync); }
+	hResult = CLSIDFromString(OVERLAY_GUID_SYNC, (LPCLSID)&guid);
+	if (!SUCCEEDED(hResult)) { return hResult; }
+	if (IsEqualCLSID(guid, rclsid)) { return CreateFactory(riid, ppv, State_Sync); }

-    hResult = CLSIDFromString(OVERLAY_GUID_WARNING, (LPCLSID)&guid);
-    if (!SUCCEEDED(hResult)) { return hResult; }
-    if (IsEqualCLSID(guid, rclsid)) { return CreateFactory(riid, ppv, State_Warning); }
+	hResult = CLSIDFromString(OVERLAY_GUID_WARNING, (LPCLSID)&guid);
+	if (!SUCCEEDED(hResult)) { return hResult; }
+	if (IsEqualCLSID(guid, rclsid)) { return CreateFactory(riid, ppv, State_Warning); }

-    return CLASS_E_CLASSNOTAVAILABLE;
+	return CLASS_E_CLASSNOTAVAILABLE;
 }

 STDAPI DllCanUnloadNow(void)
 {
    return dllReferenceCount > 0 ? S_FALSE : S_OK;
-    
-    return S_FALSE;
+	
+	return S_FALSE;
 }

 HRESULT RegisterCLSID(LPCOLESTR guidStr, PCWSTR overlayStr, PCWSTR szModule)
 {
-    HRESULT hResult = S_OK;
+	HRESULT hResult = S_OK;

-    GUID guid;
-    hResult = CLSIDFromString(guidStr, (LPCLSID)&guid);
+	GUID guid;
+	hResult = CLSIDFromString(guidStr, (LPCLSID)&guid);

-    if (hResult != S_OK) {
-        return hResult;
-    }
+	if (hResult != S_OK) {
+		return hResult;
+	}

-    hResult = OCOverlayRegistrationHandler::RegisterCOMObject(szModule, OVERLAY_GENERIC_NAME, guid);
+	hResult = OCOverlayRegistrationHandler::RegisterCOMObject(szModule, OVERLAY_GENERIC_NAME, guid);

-    if (!SUCCEEDED(hResult)) {
-        return hResult;
-    }
+	if (!SUCCEEDED(hResult)) {
+		return hResult;
+	}

-    hResult = OCOverlayRegistrationHandler::MakeRegistryEntries(guid, overlayStr);
+	hResult = OCOverlayRegistrationHandler::MakeRegistryEntries(guid, overlayStr);

-    return hResult;
+	return hResult;
 }

 HRESULT UnregisterCLSID(LPCOLESTR guidStr, PCWSTR overlayStr)
 {
-    HRESULT hResult = S_OK;
-    GUID guid;
+	HRESULT hResult = S_OK;
+	GUID guid;

-    hResult = CLSIDFromString(guidStr, (LPCLSID)&guid);
+	hResult = CLSIDFromString(guidStr, (LPCLSID)&guid);

-    if (hResult != S_OK) {
-        return hResult;
-    }
+	if (hResult != S_OK) {
+		return hResult;
+	}

-    hResult = OCOverlayRegistrationHandler::UnregisterCOMObject(guid);
+	hResult = OCOverlayRegistrationHandler::UnregisterCOMObject(guid);

-    if (!SUCCEEDED(hResult)) {
-        return hResult;
-    }
+	if (!SUCCEEDED(hResult)) {
+		return hResult;
+	}

-    hResult = OCOverlayRegistrationHandler::RemoveRegistryEntries(overlayStr);
+	hResult = OCOverlayRegistrationHandler::RemoveRegistryEntries(overlayStr);

-    return hResult;
+	return hResult;
 }

 HRESULT _stdcall DllRegisterServer(void)
 {
-    HRESULT hResult = S_OK;
+	HRESULT hResult = S_OK;

-    wchar_t szModule[MAX_PATH];
+	wchar_t szModule[MAX_PATH];

-    if (GetModuleFileName(instanceHandle, szModule, ARRAYSIZE(szModule)) == 0) {
-        hResult = HRESULT_FROM_WIN32(GetLastError());
-        return hResult;
-    }
+	if (GetModuleFileName(instanceHandle, szModule, ARRAYSIZE(szModule)) == 0) {
+		hResult = HRESULT_FROM_WIN32(GetLastError());
+		return hResult;
+	}

-    // Unregister any obsolete CLSID when we register here
-    // Those CLSID were removed in 2.1, but we need to make sure to prevent any previous version
-    // of the extension on the system from loading at the same time as a new version to avoid crashing explorer.
-    UnregisterCLSID(OVERLAY_GUID_ERROR_SHARED, OVERLAY_NAME_ERROR_SHARED);
-    UnregisterCLSID(OVERLAY_GUID_SYNC_SHARED, OVERLAY_NAME_SYNC_SHARED);
-    UnregisterCLSID(OVERLAY_GUID_WARNING_SHARED, OVERLAY_NAME_WARNING_SHARED);
+	// Unregister any obsolete CLSID when we register here
+	// Those CLSID were removed in 2.1, but we need to make sure to prevent any previous version
+	// of the extension on the system from loading at the same time as a new version to avoid crashing explorer.
+	UnregisterCLSID(OVERLAY_GUID_ERROR_SHARED, OVERLAY_NAME_ERROR_SHARED);
+	UnregisterCLSID(OVERLAY_GUID_SYNC_SHARED, OVERLAY_NAME_SYNC_SHARED);
+	UnregisterCLSID(OVERLAY_GUID_WARNING_SHARED, OVERLAY_NAME_WARNING_SHARED);

-    hResult = RegisterCLSID(OVERLAY_GUID_ERROR, OVERLAY_NAME_ERROR, szModule);
-    if (!SUCCEEDED(hResult)) { return hResult; }
-    hResult = RegisterCLSID(OVERLAY_GUID_OK, OVERLAY_NAME_OK, szModule);
-    if (!SUCCEEDED(hResult)) { return hResult; }
-    hResult = RegisterCLSID(OVERLAY_GUID_OK_SHARED, OVERLAY_NAME_OK_SHARED, szModule);
-    if (!SUCCEEDED(hResult)) { return hResult; }
-    hResult = RegisterCLSID(OVERLAY_GUID_SYNC, OVERLAY_NAME_SYNC, szModule);
-    if (!SUCCEEDED(hResult)) { return hResult; }
-    hResult = RegisterCLSID(OVERLAY_GUID_WARNING, OVERLAY_NAME_WARNING, szModule);
+	hResult = RegisterCLSID(OVERLAY_GUID_ERROR, OVERLAY_NAME_ERROR, szModule);
+	if (!SUCCEEDED(hResult)) { return hResult; }
+	hResult = RegisterCLSID(OVERLAY_GUID_OK, OVERLAY_NAME_OK, szModule);
+	if (!SUCCEEDED(hResult)) { return hResult; }
+	hResult = RegisterCLSID(OVERLAY_GUID_OK_SHARED, OVERLAY_NAME_OK_SHARED, szModule);
+	if (!SUCCEEDED(hResult)) { return hResult; }
+	hResult = RegisterCLSID(OVERLAY_GUID_SYNC, OVERLAY_NAME_SYNC, szModule);
+	if (!SUCCEEDED(hResult)) { return hResult; }
+	hResult = RegisterCLSID(OVERLAY_GUID_WARNING, OVERLAY_NAME_WARNING, szModule);

-    return hResult;
+	return hResult;
 }

 STDAPI DllUnregisterServer(void)
@@ -167,21 +167,21 @@ STDAPI DllUnregisterServer(void)

    wchar_t szModule[MAX_PATH];
    
-    if (GetModuleFileNameW(instanceHandle, szModule, ARRAYSIZE(szModule)) == 0)
+	if (GetModuleFileNameW(instanceHandle, szModule, ARRAYSIZE(szModule)) == 0)
    {
        hResult = HRESULT_FROM_WIN32(GetLastError());
        return hResult;
    }

-    hResult = UnregisterCLSID(OVERLAY_GUID_ERROR, OVERLAY_NAME_ERROR);
-    if (!SUCCEEDED(hResult)) { return hResult; }
-    hResult = UnregisterCLSID(OVERLAY_GUID_OK, OVERLAY_NAME_OK);
-    if (!SUCCEEDED(hResult)) { return hResult; }
-    hResult = UnregisterCLSID(OVERLAY_GUID_OK_SHARED, OVERLAY_NAME_OK_SHARED);
-    if (!SUCCEEDED(hResult)) { return hResult; }
-    hResult = UnregisterCLSID(OVERLAY_GUID_SYNC, OVERLAY_NAME_SYNC);
-    if (!SUCCEEDED(hResult)) { return hResult; }
-    hResult = UnregisterCLSID(OVERLAY_GUID_WARNING, OVERLAY_NAME_WARNING);
+	hResult = UnregisterCLSID(OVERLAY_GUID_ERROR, OVERLAY_NAME_ERROR);
+	if (!SUCCEEDED(hResult)) { return hResult; }
+	hResult = UnregisterCLSID(OVERLAY_GUID_OK, OVERLAY_NAME_OK);
+	if (!SUCCEEDED(hResult)) { return hResult; }
+	hResult = UnregisterCLSID(OVERLAY_GUID_OK_SHARED, OVERLAY_NAME_OK_SHARED);
+	if (!SUCCEEDED(hResult)) { return hResult; }
+	hResult = UnregisterCLSID(OVERLAY_GUID_SYNC, OVERLAY_NAME_SYNC);
+	if (!SUCCEEDED(hResult)) { return hResult; }
+	hResult = UnregisterCLSID(OVERLAY_GUID_WARNING, OVERLAY_NAME_WARNING);

    return hResult;
 }
@@ -0,0 +1,131 @@
+/**
+* Copyright (c) 2015 Daniel Molkentin <danimo@owncloud.com>. All rights reserved.
+*
+* This library is free software; you can redistribute it and/or modify it under
+* the terms of the GNU Lesser General Public License as published by the Free
+* Software Foundation; either version 2.1 of the License, or (at your option)
+* any later version.
+*
+* This library is distributed in the hope that it will be useful, but WITHOUT
+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+* details.
+*/
+
+#include "OCContextMenu.h"
+#include "stdafx.h"
+
+#define IDM_SHARE 0
+
+OCContextMenu::OCContextMenu()
+	: m_pwszVerb(0)
+	, m_referenceCount(0)
+{
+}
+
+
+OCContextMenu::~OCContextMenu()
+{
+}
+
+IFACEMETHODIMP_(ULONG) OCContextMenu::AddRef()
+{
+	return InterlockedIncrement(&m_referenceCount);
+}
+
+IFACEMETHODIMP_(ULONG) OCContextMenu::Release()
+{
+	ULONG cRef = InterlockedDecrement(&m_referenceCount);
+	if (0 == cRef)
+	{
+		delete this;
+	}
+
+	return cRef;
+}
+
+IFACEMETHODIMP OCContextMenu::QueryInterface(REFIID riid, void **ppv)
+{
+	HRESULT hr = S_OK;
+
+	if (IsEqualIID(IID_IUnknown, riid) || IsEqualIID(IID_IContextMenu, riid))
+	{
+		*ppv = static_cast<IContextMenu *>(this);
+	}
+	else
+	{
+		hr = E_NOINTERFACE;
+		*ppv = NULL;
+	}
+
+	if (*ppv)
+	{
+		AddRef();
+	}
+
+	return hr;
+}
+
+IFACEMETHODIMP OCContextMenu::GetCommandString(UINT_PTR idCmd, UINT uFlags, UINT *pwReserved, LPSTR pszName, UINT cchMax)
+{
+	HRESULT hr = E_INVALIDARG;
+
+	if (idCmd == IDM_SHARE)
+	{
+		switch (uFlags)
+		{
+		case GCS_HELPTEXTW:
+			hr = StringCchCopyW(reinterpret_cast<PWSTR>(pszName), cchMax, L"Shares file or directory with ownCloud");
+			break;
+
+		case GCS_VERBW:
+			// GCS_VERBW is an optional feature that enables a caller
+			// to discover the canonical name for the verb that is passed in
+			// through idCommand.
+			hr = StringCchCopyW(reinterpret_cast<PWSTR>(pszName), cchMax, L"ownCloudShare");
+			break;
+		}
+	}
+	return hr;
+}
+
+IFACEMETHODIMP OCContextMenu::InvokeCommand(LPCMINVOKECOMMANDINFO pici)
+{
+	if (pici->cbSize == sizeof(CMINVOKECOMMANDINFOEX) &&
+		(pici->fMask & CMIC_MASK_UNICODE))
+	{
+		return E_FAIL;
+	}
+	return MAKE_HRESULT(SEVERITY_SUCCESS, 0, USHORT(0));
+	if (HIWORD(((CMINVOKECOMMANDINFOEX *)pici)->lpVerbW))
+	{
+		if (StrCmpIW(((CMINVOKECOMMANDINFOEX *)pici)->lpVerbW, m_pwszVerb))
+		{
+			return E_FAIL;
+		}
+	}
+
+	if (LOWORD(pici->lpVerb) != IDM_SHARE) {
+		return E_FAIL;
+	}
+
+	MessageBox(pici->hwnd,
+		L"ownCloud was here",
+		L"ownCloud was here",
+		MB_OK | MB_ICONINFORMATION);
+
+}
+
+IFACEMETHODIMP OCContextMenu::QueryContextMenu(HMENU hMenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags)
+{
+	HRESULT hr;
+
+	if (!(CMF_DEFAULTONLY & uFlags))
+	{
+		InsertMenu(hMenu, indexMenu, MF_STRING | MF_BYPOSITION,	idCmdFirst + IDM_SHARE,	L"&Share with ownCloud");
+	}
+	hr = StringCbCopyW(m_pwszVerb, sizeof(m_pwszVerb), L"ownCloudShare");
+
+	return MAKE_HRESULT(SEVERITY_SUCCESS, 0, USHORT(IDM_SHARE + 1));
+}
+
@@ -0,0 +1,43 @@
+/**
+* Copyright (c) 2015 Daniel Molkentin <danimo@owncloud.com>. All rights reserved.
+*
+* This library is free software; you can redistribute it and/or modify it under
+* the terms of the GNU Lesser General Public License as published by the Free
+* Software Foundation; either version 2.1 of the License, or (at your option)
+* any later version.
+*
+* This library is distributed in the hope that it will be useful, but WITHOUT
+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+* details.
+*/
+
+#ifndef OCCONTEXTMENU_H
+#define OCCONTEXTMENU_H
+
+#pragma once
+
+#include "ShObjIdl.h"
+#include "memory"
+
+class OCContextMenu :public IContextMenu
+{
+public:
+	OCContextMenu();
+	~OCContextMenu();
+
+	IFACEMETHODIMP QueryInterface(REFIID riid, void **ppv);
+	IFACEMETHODIMP_(ULONG) AddRef();
+	IFACEMETHODIMP_(ULONG) Release();
+
+
+	IFACEMETHODIMP GetCommandString(UINT_PTR idCmd, UINT uFlags, UINT *pwReserved, LPSTR pszName, UINT cchMax);
+	IFACEMETHODIMP InvokeCommand(LPCMINVOKECOMMANDINFO pici);
+	IFACEMETHODIMP QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags);
+private:
+	TCHAR* m_pwszVerb;
+	long m_referenceCount;
+
+};
+
+#endif //OCCONTEXTMENU_H
@@ -45,19 +45,19 @@ unique_ptr<RemotePathChecker> s_instance;

 RemotePathChecker *getGlobalChecker()
 {
-    // On Vista we'll run into issue #2680 if we try to create the thread+pipe connection
-    // on any DllGetClassObject of our registered classes.
-    // Work around the issue by creating the static RemotePathChecker only once actually needed.
-    static once_flag s_onceFlag;
-    call_once(s_onceFlag, [] { s_instance.reset(new RemotePathChecker); });
+	// On Vista we'll run into issue #2680 if we try to create the thread+pipe connection
+	// on any DllGetClassObject of our registered classes.
+	// Work around the issue by creating the static RemotePathChecker only once actually needed.
+	static once_flag s_onceFlag;
+	call_once(s_onceFlag, [] { s_instance.reset(new RemotePathChecker); });

-    return s_instance.get();
+	return s_instance.get();
 }

 }
 OCOverlay::OCOverlay(int state) 
-    : _referenceCount(1)
-    , _state(state)
+	: _referenceCount(1)
+	, _state(state)
 {
 }

@@ -89,7 +89,7 @@ IFACEMETHODIMP OCOverlay::QueryInterface(REFIID riid, void **ppv)
    {
        AddRef();
    }
-
+	
    return hr;
 }

@@ -106,65 +106,80 @@ IFACEMETHODIMP_(ULONG) OCOverlay::Release()

 IFACEMETHODIMP OCOverlay::GetPriority(int *pPriority)
 {
-    // this defines which handler has prededence, so
-    // we order this in terms of likelyhood
-    switch (_state) {
-    case State_OK:
-        *pPriority = 0; break;
-    case State_OKShared:
-        *pPriority = 1; break;
-    case State_Warning:
-        *pPriority = 2; break;
-    case State_Sync:
-        *pPriority = 3; break;
-    case State_Error:
-        *pPriority = 4; break;
-    default:
-        *pPriority = 5; break;
-    }
+	// this defines which handler has prededence, so
+	// we order this in terms of likelyhood
+	switch (_state) {
+	case State_OK:
+		*pPriority = 0; break;
+	case State_OKShared:
+		*pPriority = 1; break;
+	case State_Warning:
+		*pPriority = 2; break;
+	case State_Sync:
+		*pPriority = 3; break;
+	case State_Error:
+		*pPriority = 4; break;
+	default:
+		*pPriority = 5; break;
+	}

-    return S_OK;
+	return S_OK;
 }

-IFACEMETHODIMP OCOverlay::IsMemberOf(PCWSTR pwszPath, DWORD dwAttrib)
+ IFACEMETHODIMP OCOverlay::IsMemberOf(PCWSTR pwszPath, DWORD dwAttrib)
 {
-    RemotePathChecker* checker = getGlobalChecker();
-    std::shared_ptr<const std::vector<std::wstring>> watchedDirectories = checker->WatchedDirectories();
+	RemotePathChecker* checker = getGlobalChecker();
+	auto watchedDirectories = checker->WatchedDirectories();

-    if (watchedDirectories->empty()) {
-        return MAKE_HRESULT(S_FALSE, 0, 0);
-    }
+	wstring wpath(pwszPath);
+	wpath.append(L"\\");
+	vector<wstring>::iterator it;
+	bool watched = false;
+	for (it = watchedDirectories.begin(); it != watchedDirectories.end(); ++it) {
+		if (StringUtil::begins_with(wpath, *it)) {
+			watched = true;
+		}
+	}

-    bool watched = false;
-    size_t pathLength = wcslen(pwszPath);
-    for (auto it = watchedDirectories->begin(); it != watchedDirectories->end(); ++it) {
-        if (StringUtil::isDescendantOf(pwszPath, pathLength, *it)) {
-            watched = true;
-        }
-    }
+	if (!watched) {
+		return MAKE_HRESULT(S_FALSE, 0, 0);
+	}

-    if (!watched) {
-        return MAKE_HRESULT(S_FALSE, 0, 0);
-    }
-
-    int state = 0;
-    if (!checker->IsMonitoredPath(pwszPath, &state)) {
-        return MAKE_HRESULT(S_FALSE, 0, 0);
-    }
-    return MAKE_HRESULT(state == _state ? S_OK : S_FALSE, 0, 0);
+	int state = 0;
+	if (!checker->IsMonitoredPath(pwszPath, &state)) {
+		return MAKE_HRESULT(S_FALSE, 0, 0);
+	}
+	return MAKE_HRESULT(state == _state ? S_OK : S_FALSE, 0, 0);
 }

 IFACEMETHODIMP OCOverlay::GetOverlayInfo(PWSTR pwszIconFile, int cchMax, int *pIndex, DWORD *pdwFlags)
 {
-    *pIndex = 0;
-    *pdwFlags = ISIOI_ICONFILE | ISIOI_ICONINDEX;
-    *pIndex = _state;
+	*pIndex = 0;
+	*pdwFlags = ISIOI_ICONFILE | ISIOI_ICONINDEX;
+	*pIndex = _state;

-    if (GetModuleFileName(instanceHandle, pwszIconFile, cchMax) == 0) {
-        HRESULT hResult = HRESULT_FROM_WIN32(GetLastError());
-        wcerr << L"IsOK? " << (hResult == S_OK) << L" with path " << pwszIconFile << L", index " << *pIndex << endl;
-        return hResult;
-    }
+	if (GetModuleFileName(instanceHandle, pwszIconFile, cchMax) == 0) {	
+		HRESULT hResult = HRESULT_FROM_WIN32(GetLastError());
+		wcerr << L"IsOK? " << (hResult == S_OK) << L" with path " << pwszIconFile << L", index " << *pIndex << endl;
+		return hResult;
+	}

-    return S_OK;
+	return S_OK;
 }
+
+
+bool OCOverlay::_IsOverlaysEnabled()
+{
+	//int enable;
+	bool success = false;
+	
+	//if(RegistryUtil::ReadRegistry(REGISTRY_ROOT_KEY, REGISTRY_ENABLE_OVERLAY, &enable))
+	//{
+	//	if(enable) {
+	//		success = true;
+	//	}
+	//}
+
+	return success;
+}
+
@@ -21,21 +21,22 @@ class OCOverlay : public IShellIconOverlayIdentifier

 {
 public:
-    OCOverlay(int state);
+	OCOverlay(int state);

-    IFACEMETHODIMP_(ULONG) AddRef();
-    IFACEMETHODIMP GetOverlayInfo(PWSTR pwszIconFile, int cchMax, int *pIndex, DWORD *pdwFlags);
-    IFACEMETHODIMP GetPriority(int *pPriority);
-    IFACEMETHODIMP IsMemberOf(PCWSTR pwszPath, DWORD dwAttrib);
-    IFACEMETHODIMP QueryInterface(REFIID riid, void **ppv);
+	IFACEMETHODIMP_(ULONG) AddRef();
+	IFACEMETHODIMP GetOverlayInfo(PWSTR pwszIconFile, int cchMax, int *pIndex, DWORD *pdwFlags);
+	IFACEMETHODIMP GetPriority(int *pPriority);
+	IFACEMETHODIMP IsMemberOf(PCWSTR pwszPath, DWORD dwAttrib);
+	IFACEMETHODIMP QueryInterface(REFIID riid, void **ppv);
    IFACEMETHODIMP_(ULONG) Release();

 protected:
    ~OCOverlay();

 private:
+	bool _IsOverlaysEnabled();
    long _referenceCount;
-    int _state;
+	int _state;
 };

 #endif
@@ -20,7 +20,7 @@
 extern long dllReferenceCount;

 OCOverlayFactory::OCOverlayFactory(int state)
-    : _referenceCount(1), _state(state)
+	: _referenceCount(1), _state(state)
 {
    InterlockedIncrement(&dllReferenceCount);
 }
@@ -32,7 +32,7 @@ OCOverlayFactory::~OCOverlayFactory()

 IFACEMETHODIMP OCOverlayFactory::QueryInterface(REFIID riid, void **ppv)
 {
-    HRESULT hResult = S_OK;
+	HRESULT hResult = S_OK;

    if (IsEqualIID(IID_IUnknown, riid) || 
        IsEqualIID(IID_IClassFactory, riid))
@@ -66,20 +66,20 @@ IFACEMETHODIMP_(ULONG) OCOverlayFactory::Release()
 }

 IFACEMETHODIMP OCOverlayFactory::CreateInstance(
-    IUnknown *pUnkOuter, REFIID riid, void **ppv)
+	IUnknown *pUnkOuter, REFIID riid, void **ppv)
 {
-    HRESULT hResult = CLASS_E_NOAGGREGATION;
+	HRESULT hResult = CLASS_E_NOAGGREGATION;

    if (pUnkOuter != NULL) { return hResult; }

-    hResult = E_OUTOFMEMORY;
+	hResult = E_OUTOFMEMORY;
    OCOverlay *lrOverlay = new (std::nothrow) OCOverlay(_state);
-    if (!lrOverlay) { return hResult; }
+	if (!lrOverlay) { return hResult; }

    hResult = lrOverlay->QueryInterface(riid, ppv);
-    lrOverlay->Release();
+	lrOverlay->Release();

-    return hResult;
+	return hResult;
 }

 IFACEMETHODIMP OCOverlayFactory::LockServer(BOOL fLock)
@@ -18,20 +18,20 @@
 #pragma once

 enum State {
-    State_Error = 0,
-    State_OK, State_OKShared,
-    State_Sync, 
-    State_Warning
+	State_Error = 0,
+	State_OK, State_OKShared,
+	State_Sync, 
+	State_Warning
 };

 class OCOverlayFactory : public IClassFactory
 {
 public:
-    OCOverlayFactory(int state);
+	OCOverlayFactory(int state);

-    IFACEMETHODIMP_(ULONG) AddRef();
+	IFACEMETHODIMP_(ULONG) AddRef();
    IFACEMETHODIMP CreateInstance(IUnknown *pUnkOuter, REFIID riid, void **ppv);
-    IFACEMETHODIMP LockServer(BOOL fLock);
+	IFACEMETHODIMP LockServer(BOOL fLock);
    IFACEMETHODIMP QueryInterface(REFIID riid, void **ppv);
    IFACEMETHODIMP_(ULONG) Release();

@@ -40,7 +40,7 @@ protected:

 private:
    long _referenceCount;
-    int _state;
+	int _state;
 };

 #endif
@@ -23,52 +23,52 @@ using namespace std;

 HRESULT OCOverlayRegistrationHandler::MakeRegistryEntries(const CLSID& clsid, PCWSTR friendlyName)
 {
-    HRESULT hResult;
-    HKEY shellOverlayKey = NULL;
-    // the key may not exist yet
-    hResult = HRESULT_FROM_WIN32(RegCreateKeyEx(HKEY_LOCAL_MACHINE, REGISTRY_OVERLAY_KEY, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &shellOverlayKey, NULL));
-    if (!SUCCEEDED(hResult)) {
-        hResult = RegCreateKey(HKEY_LOCAL_MACHINE, REGISTRY_OVERLAY_KEY, &shellOverlayKey);
-        if(!SUCCEEDED(hResult)) {
-            return hResult;
-        }
-    }
+	HRESULT hResult;
+	HKEY shellOverlayKey = NULL;
+	// the key may not exist yet
+	hResult = HRESULT_FROM_WIN32(RegCreateKeyEx(HKEY_LOCAL_MACHINE, REGISTRY_OVERLAY_KEY, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &shellOverlayKey, NULL));
+	if (!SUCCEEDED(hResult)) {
+		hResult = RegCreateKey(HKEY_LOCAL_MACHINE, REGISTRY_OVERLAY_KEY, &shellOverlayKey);
+		if(!SUCCEEDED(hResult))	{
+			return hResult;
+		}
+	}

-    HKEY syncExOverlayKey = NULL;
-    hResult = HRESULT_FROM_WIN32(RegCreateKeyEx(shellOverlayKey, friendlyName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &syncExOverlayKey, NULL));
+	HKEY syncExOverlayKey = NULL;
+	hResult = HRESULT_FROM_WIN32(RegCreateKeyEx(shellOverlayKey, friendlyName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &syncExOverlayKey, NULL));

-    if (!SUCCEEDED(hResult)) {
-        return hResult;
-    }
+	if (!SUCCEEDED(hResult)) {
+		return hResult;
+	}

-    wchar_t stringCLSID[MAX_PATH];
+	wchar_t stringCLSID[MAX_PATH];
    StringFromGUID2(clsid, stringCLSID, ARRAYSIZE(stringCLSID));
-    LPCTSTR value = stringCLSID;
-    hResult = RegSetValueEx(syncExOverlayKey, NULL, 0, REG_SZ, (LPBYTE)value, (DWORD)((wcslen(value)+1) * sizeof(TCHAR)));
-    if (!SUCCEEDED(hResult)) {
-        return hResult;
-    }
+	LPCTSTR value = stringCLSID;
+	hResult = RegSetValueEx(syncExOverlayKey, NULL, 0, REG_SZ, (LPBYTE)value, (DWORD)((wcslen(value)+1) * sizeof(TCHAR)));
+	if (!SUCCEEDED(hResult)) {
+		return hResult;
+	}

-    return hResult;
+	return hResult;
 }

 HRESULT OCOverlayRegistrationHandler::RemoveRegistryEntries(PCWSTR friendlyName)
 {
-    HRESULT hResult;
-    HKEY shellOverlayKey = NULL;
-    hResult = HRESULT_FROM_WIN32(RegOpenKeyEx(HKEY_LOCAL_MACHINE, REGISTRY_OVERLAY_KEY, 0, KEY_WRITE, &shellOverlayKey));
+	HRESULT hResult;
+	HKEY shellOverlayKey = NULL;
+	hResult = HRESULT_FROM_WIN32(RegOpenKeyEx(HKEY_LOCAL_MACHINE, REGISTRY_OVERLAY_KEY, 0, KEY_WRITE, &shellOverlayKey));

-    if (!SUCCEEDED(hResult)) {
-        return hResult;
-    }
+	if (!SUCCEEDED(hResult)) {
+		return hResult;
+	}

-    HKEY syncExOverlayKey = NULL;
-    hResult = HRESULT_FROM_WIN32(RegDeleteKey(shellOverlayKey, friendlyName));
-    if (!SUCCEEDED(hResult)) {
-        return hResult;
-    }
+	HKEY syncExOverlayKey = NULL;
+	hResult = HRESULT_FROM_WIN32(RegDeleteKey(shellOverlayKey, friendlyName));
+	if (!SUCCEEDED(hResult)) {
+		return hResult;
+	}

-    return hResult;
+	return hResult;
 }

 HRESULT OCOverlayRegistrationHandler::RegisterCOMObject(PCWSTR modulePath, PCWSTR friendlyName, const CLSID& clsid)
@@ -79,45 +79,45 @@ HRESULT OCOverlayRegistrationHandler::RegisterCOMObject(PCWSTR modulePath, PCWST

    wchar_t stringCLSID[MAX_PATH];
    StringFromGUID2(clsid, stringCLSID, ARRAYSIZE(stringCLSID));
-    HRESULT hResult;
-    HKEY hKey = NULL;
+	HRESULT hResult;
+	HKEY hKey = NULL;

-    hResult = HRESULT_FROM_WIN32(RegOpenKeyEx(HKEY_CLASSES_ROOT, REGISTRY_CLSID, 0, KEY_WRITE, &hKey));
-    if (!SUCCEEDED(hResult)) {
-        return hResult;
-    }
+	hResult = HRESULT_FROM_WIN32(RegOpenKeyEx(HKEY_CLASSES_ROOT, REGISTRY_CLSID, 0, KEY_WRITE, &hKey));
+	if (!SUCCEEDED(hResult)) {
+		return hResult;
+	}

-    HKEY clsidKey = NULL;
-    hResult = HRESULT_FROM_WIN32(RegCreateKeyEx(hKey, stringCLSID, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &clsidKey, NULL));
-    if(!SUCCEEDED(hResult)) {
-        return hResult;
-    }
+	HKEY clsidKey = NULL;
+	hResult = HRESULT_FROM_WIN32(RegCreateKeyEx(hKey, stringCLSID, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &clsidKey, NULL));
+	if(!SUCCEEDED(hResult))	{
+		return hResult;
+	}

-    hResult = HRESULT_FROM_WIN32(RegSetValue(clsidKey, NULL, REG_SZ, friendlyName, (DWORD) wcslen(friendlyName)));
+	hResult = HRESULT_FROM_WIN32(RegSetValue(clsidKey, NULL, REG_SZ, friendlyName, (DWORD) wcslen(friendlyName)));

-    HKEY inprocessKey = NULL;
-    hResult = HRESULT_FROM_WIN32(RegCreateKeyEx(clsidKey, REGISTRY_IN_PROCESS, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &inprocessKey, NULL));
-    if(!SUCCEEDED(hResult)) {
-        return hResult;
-    }
+	HKEY inprocessKey = NULL;
+	hResult = HRESULT_FROM_WIN32(RegCreateKeyEx(clsidKey, REGISTRY_IN_PROCESS, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &inprocessKey, NULL));
+	if(!SUCCEEDED(hResult))	{
+		return hResult;
+	}

-    hResult = HRESULT_FROM_WIN32(RegSetValue(inprocessKey, NULL, REG_SZ, modulePath, (DWORD) wcslen(modulePath)));
+	hResult = HRESULT_FROM_WIN32(RegSetValue(inprocessKey, NULL, REG_SZ, modulePath, (DWORD) wcslen(modulePath)));

-    if(!SUCCEEDED(hResult)) {
-        return hResult;
-    }
+	if(!SUCCEEDED(hResult)) {
+		return hResult;
+	}

    hResult = HRESULT_FROM_WIN32(RegSetValueEx(inprocessKey, REGISTRY_THREADING, 0, REG_SZ, (LPBYTE)REGISTRY_APARTMENT, (DWORD)((wcslen(REGISTRY_APARTMENT)+1) * sizeof(TCHAR))));
-    if(!SUCCEEDED(hResult)) {
-        return hResult;
-    }
+	if(!SUCCEEDED(hResult)) {
+		return hResult;
+	}

-    hResult = HRESULT_FROM_WIN32(RegSetValueEx(inprocessKey, REGISTRY_VERSION, 0, REG_SZ, (LPBYTE)REGISTRY_VERSION_NUMBER, (DWORD)(wcslen(REGISTRY_VERSION_NUMBER)+1) * sizeof(TCHAR)));
-    if(!SUCCEEDED(hResult)) {
-        return hResult;
-    }
+	hResult = HRESULT_FROM_WIN32(RegSetValueEx(inprocessKey, REGISTRY_VERSION, 0, REG_SZ, (LPBYTE)REGISTRY_VERSION_NUMBER, (DWORD)(wcslen(REGISTRY_VERSION_NUMBER)+1) * sizeof(TCHAR)));
+	if(!SUCCEEDED(hResult))	{
+		return hResult;
+	}

-    return S_OK;
+	return S_OK;
 }

 HRESULT OCOverlayRegistrationHandler::UnregisterCOMObject(const CLSID& clsid)
@@ -125,28 +125,28 @@ HRESULT OCOverlayRegistrationHandler::UnregisterCOMObject(const CLSID& clsid)
    wchar_t stringCLSID[MAX_PATH];

    StringFromGUID2(clsid, stringCLSID, ARRAYSIZE(stringCLSID));
-    HRESULT hResult;
-    HKEY hKey = NULL;
-    hResult = HRESULT_FROM_WIN32(RegOpenKeyEx(HKEY_CLASSES_ROOT, REGISTRY_CLSID, 0, DELETE, &hKey));
-    if (!SUCCEEDED(hResult)) {
-        return hResult;
-    }
+	HRESULT hResult;
+	HKEY hKey = NULL;
+	hResult = HRESULT_FROM_WIN32(RegOpenKeyEx(HKEY_CLASSES_ROOT, REGISTRY_CLSID, 0, DELETE, &hKey));
+	if (!SUCCEEDED(hResult)) {
+		return hResult;
+	}

-    HKEY clsidKey = NULL;
-    hResult = HRESULT_FROM_WIN32(RegOpenKeyEx(hKey, stringCLSID, 0, DELETE, &clsidKey));
-    if(!SUCCEEDED(hResult)) {
-        return hResult;
-    }
+	HKEY clsidKey = NULL;
+	hResult = HRESULT_FROM_WIN32(RegOpenKeyEx(hKey, stringCLSID, 0, DELETE, &clsidKey));
+	if(!SUCCEEDED(hResult)) {
+		return hResult;
+	}

-    hResult = HRESULT_FROM_WIN32(RegDeleteKey(clsidKey, REGISTRY_IN_PROCESS));
-    if(!SUCCEEDED(hResult)) {
-        return hResult;
-    }
+	hResult = HRESULT_FROM_WIN32(RegDeleteKey(clsidKey, REGISTRY_IN_PROCESS));
+	if(!SUCCEEDED(hResult)) {
+		return hResult;
+	}

-    hResult = HRESULT_FROM_WIN32(RegDeleteKey(hKey, stringCLSID));
-    if(!SUCCEEDED(hResult)) {
-        return hResult;
-    }
+	hResult = HRESULT_FROM_WIN32(RegDeleteKey(hKey, stringCLSID));
+	if(!SUCCEEDED(hResult)) {
+		return hResult;
+	}

-    return S_OK;
+	return S_OK;
 }
@@ -19,11 +19,11 @@

 class __declspec(dllexport) OCOverlayRegistrationHandler 
 {
-    public:
-        static HRESULT MakeRegistryEntries(const CLSID& clsid, PCWSTR fileType);
-        static HRESULT RegisterCOMObject(PCWSTR modulePath, PCWSTR friendlyName, const CLSID& clsid);
-        static HRESULT RemoveRegistryEntries(PCWSTR friendlyName);
-        static HRESULT UnregisterCOMObject(const CLSID& clsid);
+	public:
+		static HRESULT MakeRegistryEntries(const CLSID& clsid, PCWSTR fileType);
+		static HRESULT RegisterCOMObject(PCWSTR modulePath, PCWSTR friendlyName, const CLSID& clsid);
+		static HRESULT RemoveRegistryEntries(PCWSTR friendlyName);
+		static HRESULT UnregisterCOMObject(const CLSID& clsid);
 };

 #endif
@@ -13,38 +13,38 @@
 */


-#define OVERLAY_GUID_ERROR          L"{0960F090-F328-48A3-B746-276B1E3C3722}"
-#define OVERLAY_GUID_ERROR_SHARED   L"{0960F091-F328-48A3-B746-276B1E3C3722}"
-#define OVERLAY_GUID_OK             L"{0960F092-F328-48A3-B746-276B1E3C3722}"
-#define OVERLAY_GUID_OK_SHARED      L"{0960F093-F328-48A3-B746-276B1E3C3722}"
-#define OVERLAY_GUID_SYNC           L"{0960F094-F328-48A3-B746-276B1E3C3722}"
-#define OVERLAY_GUID_SYNC_SHARED    L"{0960F095-F328-48A3-B746-276B1E3C3722}"
-#define OVERLAY_GUID_WARNING        L"{0960F096-F328-48A3-B746-276B1E3C3722}"
+#define OVERLAY_GUID_ERROR			L"{0960F090-F328-48A3-B746-276B1E3C3722}"
+#define OVERLAY_GUID_ERROR_SHARED	L"{0960F091-F328-48A3-B746-276B1E3C3722}"
+#define OVERLAY_GUID_OK				L"{0960F092-F328-48A3-B746-276B1E3C3722}"
+#define OVERLAY_GUID_OK_SHARED		L"{0960F093-F328-48A3-B746-276B1E3C3722}"
+#define OVERLAY_GUID_SYNC			L"{0960F094-F328-48A3-B746-276B1E3C3722}"
+#define OVERLAY_GUID_SYNC_SHARED	L"{0960F095-F328-48A3-B746-276B1E3C3722}"
+#define OVERLAY_GUID_WARNING		L"{0960F096-F328-48A3-B746-276B1E3C3722}"
 #define OVERLAY_GUID_WARNING_SHARED L"{0960F097-F328-48A3-B746-276B1E3C3722}"

 #define OVERLAY_GENERIC_NAME        L"OC Overlay Handler"

 // two spaces to put us ahead of the competition :/
-#define OVERLAY_NAME_ERROR          L"  OCError"
-#define OVERLAY_NAME_ERROR_SHARED   L"  OCErrorShared"
-#define OVERLAY_NAME_OK             L"  OCOK"
-#define OVERLAY_NAME_OK_SHARED      L"  OCOKShared"
-#define OVERLAY_NAME_SYNC           L"  OCSync"
-#define OVERLAY_NAME_SYNC_SHARED    L"  OCSyncShared"
-#define OVERLAY_NAME_WARNING        L"  OCWarning"
-#define OVERLAY_NAME_WARNING_SHARED L"  OCWarningShared"
+#define OVERLAY_NAME_ERROR			L"  OCError"
+#define OVERLAY_NAME_ERROR_SHARED	L"  OCErrorShared"
+#define OVERLAY_NAME_OK				L"  OCOK"
+#define OVERLAY_NAME_OK_SHARED		L"  OCOKShared"
+#define OVERLAY_NAME_SYNC			L"  OCSync"
+#define OVERLAY_NAME_SYNC_SHARED	L"  OCSyncShared"
+#define OVERLAY_NAME_WARNING		L"  OCWarning"
+#define OVERLAY_NAME_WARNING_SHARED	L"  OCWarningShared"

-#define REGISTRY_OVERLAY_KEY        L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\ShellIconOverlayIdentifiers"
-#define REGISTRY_CLSID              L"CLSID"
-#define REGISTRY_IN_PROCESS         L"InprocServer32"
-#define REGISTRY_THREADING          L"ThreadingModel"
-#define REGISTRY_APARTMENT          L"Apartment"
-#define REGISTRY_VERSION            L"Version"
-#define REGISTRY_VERSION_NUMBER     L"1.0"
+#define REGISTRY_OVERLAY_KEY		L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\ShellIconOverlayIdentifiers"
+#define REGISTRY_CLSID				L"CLSID"
+#define REGISTRY_IN_PROCESS			L"InprocServer32"
+#define REGISTRY_THREADING			L"ThreadingModel"
+#define REGISTRY_APARTMENT			L"Apartment"
+#define REGISTRY_VERSION			L"Version"
+#define REGISTRY_VERSION_NUMBER		L"1.0"

 //Registry values for running
-#define REGISTRY_ENABLE_OVERLAY     L"EnableOverlay"
+#define REGISTRY_ENABLE_OVERLAY		L"EnableOverlay"

-#define GET_FILE_OVERLAY_ID     L"getFileIconId"
+#define GET_FILE_OVERLAY_ID		L"getFileIconId"

-#define PORT                34001
+#define PORT				34001
@@ -31,23 +31,23 @@ using namespace std;
 namespace {

 std::wstring getUserName() {
-    DWORD  len = DEFAULT_BUFLEN;
-    TCHAR  buf[DEFAULT_BUFLEN];
-    if (GetUserName(buf, &len)) {
-        return std::wstring(&buf[0], len);
-    } else {
-        return std::wstring();
-    }
+	DWORD  len = DEFAULT_BUFLEN;
+	TCHAR  buf[DEFAULT_BUFLEN];
+	if (GetUserName(buf, &len)) {
+		return std::wstring(&buf[0], len);
+	} else {
+		return std::wstring();
+	}
 }

 }

 std::wstring CommunicationSocket::DefaultPipePath()
 {
-    auto pipename = std::wstring(L"\\\\.\\pipe\\");
-    pipename += L"ownCloud-";
-    pipename += getUserName();
-    return pipename;
+	auto pipename = std::wstring(L"\\\\.\\pipe\\");
+	pipename += L"ownCloud-";
+	pipename += getUserName();
+	return pipename;
 }

 CommunicationSocket::CommunicationSocket()
@@ -57,23 +57,23 @@ CommunicationSocket::CommunicationSocket()

 CommunicationSocket::~CommunicationSocket()
 {
-    Close();
+	Close();
 }

 bool CommunicationSocket::Close()
 {
-    if (_pipe == INVALID_HANDLE_VALUE) {
-        return false;
-    }
-    CloseHandle(_pipe);
-    _pipe = INVALID_HANDLE_VALUE;
-    return true;
+	if (_pipe == INVALID_HANDLE_VALUE) {
+		return false;
+	}
+	CloseHandle(_pipe);
+	_pipe = INVALID_HANDLE_VALUE;
+	return true;
 }


 bool CommunicationSocket::Connect(const std::wstring &pipename)
 {
-    _pipe = CreateFile(pipename.data(), GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL);
+	_pipe = CreateFile(pipename.data(), GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL);

    if (_pipe == INVALID_HANDLE_VALUE) {
        return false;
@@ -84,7 +84,7 @@ bool CommunicationSocket::Connect(const std::wstring &pipename)

 bool CommunicationSocket::SendMsg(const wchar_t* message) const
 {
-    auto utf8_msg = StringUtil::toUtf8(message);
+	auto utf8_msg = StringUtil::toUtf8(message);

    DWORD numBytesWritten = 0;
    auto result = WriteFile( _pipe, utf8_msg.c_str(), DWORD(utf8_msg.size()), &numBytesWritten, NULL);
@@ -92,7 +92,7 @@ bool CommunicationSocket::SendMsg(const wchar_t* message) const
    if (result) {
        return true;
    } else {
-        const_cast<CommunicationSocket*>(this)->Close();
+		const_cast<CommunicationSocket*>(this)->Close();

        return false;
    }
@@ -100,9 +100,9 @@ bool CommunicationSocket::SendMsg(const wchar_t* message) const

 bool CommunicationSocket::ReadLine(wstring* response)
 {
-    if (!response) {
-        return false;
-    }
+	if (!response) {
+		return false;
+	}

    response->clear();

@@ -110,7 +110,7 @@ bool CommunicationSocket::ReadLine(wstring* response)
        return false;
    }

-    while (true) {
+	while (true) {
        int lbPos = 0;
        auto it = std::find(_buffer.begin() + lbPos, _buffer.end(), '\n');
        if (it != _buffer.end()) {
@@ -121,24 +121,24 @@ bool CommunicationSocket::ReadLine(wstring* response)

        std::array<char, 128> resp_utf8;
        DWORD numBytesRead = 0;
-        DWORD totalBytesAvailable = 0;
+		DWORD totalBytesAvailable = 0;

-        if (!PeekNamedPipe(_pipe, NULL, 0, 0, &totalBytesAvailable, 0)) {
-            Close();
-            return false;
-        }
-        if (totalBytesAvailable == 0) {
-            return false;
-        }
+		if (!PeekNamedPipe(_pipe, NULL, 0, 0, &totalBytesAvailable, 0)) {
+			Close();
+			return false;
+		}
+		if (totalBytesAvailable == 0) {
+			return false;
+		}

-        if (!ReadFile(_pipe, resp_utf8.data(), DWORD(resp_utf8.size()), &numBytesRead, NULL)) {
+		if (!ReadFile(_pipe, resp_utf8.data(), DWORD(resp_utf8.size()), &numBytesRead, NULL)) {
            Close();
            return false;
        }
        if (numBytesRead <= 0) {
            return false;
        }
-        _buffer.insert(_buffer.end(), resp_utf8.begin(), resp_utf8.begin()+numBytesRead);
+		_buffer.insert(_buffer.end(), resp_utf8.begin(), resp_utf8.begin()+numBytesRead);
        continue;
-    }
+	}
 }
@@ -26,22 +26,22 @@
 class __declspec(dllexport) CommunicationSocket
 {
 public:
-    static std::wstring DefaultPipePath();
+	static std::wstring DefaultPipePath();

-    CommunicationSocket();
-    ~CommunicationSocket();
+	CommunicationSocket();
+	~CommunicationSocket();

-    bool Connect(const std::wstring& pipename);
-    bool Close();
+	bool Connect(const std::wstring& pipename);
+	bool Close();

-    bool SendMsg(const wchar_t*) const;
-    bool ReadLine(std::wstring*);
+	bool SendMsg(const wchar_t*) const;
+	bool ReadLine(std::wstring*);

    HANDLE Event() { return _pipe; }

-private:    
-    HANDLE _pipe;
-    std::vector<char> _buffer;
+private:	
+	HANDLE _pipe;
+	std::vector<char> _buffer;
    bool _connected;
 };

@@ -22,65 +22,65 @@ using namespace std;

 bool FileUtil::IsChildFile(const wchar_t* rootFolder, vector<wstring>* files)
 {
-    for(vector<wstring>::iterator it = files->begin(); it != files->end(); it++)
-    {
-        wstring file = *it;
+	for(vector<wstring>::iterator it = files->begin(); it != files->end(); it++)
+	{
+		wstring file = *it;

-        size_t found = file.find(rootFolder);
+		size_t found = file.find(rootFolder);

-        if(found != string::npos)
-        {
-            return true;    
-        }
-    }
+		if(found != string::npos)
+		{
+			return true;	
+		}
+	}

-    return false;
+	return false;
 }

 bool FileUtil::IsChildFile(const wchar_t* rootFolder, const wchar_t* file)
 {
-    wstring* f = new wstring(file);
+	wstring* f = new wstring(file);

-    size_t found = f->find(rootFolder);
+	size_t found = f->find(rootFolder);

-    if(found != string::npos)
-    {
-        return true;    
-    }
-    
-    return false;
+	if(found != string::npos)
+	{
+		return true;	
+	}
+	
+	return false;
 }

 bool FileUtil::IsChildFileOfRoot(std::vector<std::wstring>* files) 
 {
-    wstring* rootFolder = new wstring();
-    bool needed = false;
+	wstring* rootFolder = new wstring();
+	bool needed = false;

-    if(RegistryUtil::ReadRegistry(REGISTRY_ROOT_KEY, REGISTRY_FILTER_FOLDER, rootFolder))
-    {
-        if(IsChildFile(rootFolder->c_str(), files))
-        {
-            needed = true;
-        }
-    }
+	if(RegistryUtil::ReadRegistry(REGISTRY_ROOT_KEY, REGISTRY_FILTER_FOLDER, rootFolder))
+	{
+		if(IsChildFile(rootFolder->c_str(), files))
+		{
+			needed = true;
+		}
+	}

-    delete rootFolder;
-    return needed;
+	delete rootFolder;
+	return needed;
 }

 bool FileUtil::IsChildFileOfRoot(const wchar_t* filePath)
 {
-    wstring* rootFolder = new wstring();
-    bool needed = false;
-    
-    if(RegistryUtil::ReadRegistry(REGISTRY_ROOT_KEY, REGISTRY_FILTER_FOLDER, rootFolder))
-    {
-        if(FileUtil::IsChildFile(rootFolder->c_str(), filePath))
-        {
-            needed = true;
-        }
-    }
+	wstring* rootFolder = new wstring();
+	bool needed = false;
+	
+	if(RegistryUtil::ReadRegistry(REGISTRY_ROOT_KEY, REGISTRY_FILTER_FOLDER, rootFolder))
+	{
+		if(FileUtil::IsChildFile(rootFolder->c_str(), filePath))
+		{
+			needed = true;
+		}
+	}

-    delete rootFolder;
-    return needed;
+	delete rootFolder;
+	return needed;
 }
@@ -25,16 +25,16 @@
 class __declspec(dllexport) FileUtil
 {
 public:
-    FileUtil();
+	FileUtil();

-    ~FileUtil();
+	~FileUtil();

-    static bool IsChildFile(const wchar_t*, std::vector<std::wstring>*);
-    static bool IsChildFile(const wchar_t*, const wchar_t*);
-    static bool IsChildFileOfRoot(std::vector<std::wstring>*);
-    static bool IsChildFileOfRoot(const wchar_t*);
+	static bool IsChildFile(const wchar_t*, std::vector<std::wstring>*);
+	static bool IsChildFile(const wchar_t*, const wchar_t*);
+	static bool IsChildFileOfRoot(std::vector<std::wstring>*);
+	static bool IsChildFileOfRoot(const wchar_t*);

-private:    
+private:	
 };

 #endif
@@ -25,8 +25,8 @@ using namespace std;

 OCMessage::OCMessage(void)
 {
-    _command = new wstring();
-    _value = new wstring();
+	_command = new wstring();
+	_value = new wstring();
 }

 OCMessage::~OCMessage(void)
@@ -35,40 +35,40 @@ OCMessage::~OCMessage(void)

 bool OCMessage::InitFromMessage(const wstring* message)
 {
-    if(message->length() == 0)
-    {
-        return false;
-    }
-    
-    if(!ParserUtil::GetItem(COMMAND, message, _command))
-    {
-        return false;
-    }
+	if(message->length() == 0)
+	{
+		return false;
+	}
+	
+	if(!ParserUtil::GetItem(COMMAND, message, _command))
+	{
+		return false;
+	}

-    if(!ParserUtil::GetItem(VALUE, message, _value))
-    {
-        return false;
-    }
+	if(!ParserUtil::GetItem(VALUE, message, _value))
+	{
+		return false;
+	}

-    return true;
+	return true;
 }
-    
+	
 std::wstring* OCMessage::GetCommand()
 {
-    return _command;
+	return _command;
 }

 std::wstring* OCMessage::GetValue()
 {
-    return _value;
+	return _value;
 }

 void OCMessage::SetCommand(std::wstring* command)
 {
-    _command = command;
+	_command = command;
 }

 void OCMessage::SetValue(std::wstring* value)
 {
-    _value = value;
+	_value = value;
 }
@@ -23,20 +23,20 @@ class __declspec(dllexport) OCMessage
 {
 public:
    OCMessage(void);
-    ~OCMessage(void);
+	~OCMessage(void);

-    bool InitFromMessage(const std::wstring*);
+	bool InitFromMessage(const std::wstring*);

-    std::wstring* GetCommand();
-    std::wstring* GetValue();
+	std::wstring* GetCommand();
+	std::wstring* GetValue();

-    void SetCommand(std::wstring*);
-    void SetValue(std::wstring*);
+	void SetCommand(std::wstring*);
+	void SetValue(std::wstring*);

 private:

    std::wstring* _command;
-    std::wstring* _value;
+	std::wstring* _value;
 };

 #endif
@@ -21,369 +21,369 @@ using namespace std;

 bool ParserUtil::GetItem(const wchar_t* item, const wstring* message, wstring* result)
 {
-    size_t start = message->find(item, 0);
+	size_t start = message->find(item, 0);

-    if(start == string::npos)
-    {
-        return false;
-    }
+	if(start == string::npos)
+	{
+		return false;
+	}

-    size_t end = message->find(COLON, start);
+	size_t end = message->find(COLON, start);

-    if(end == string::npos)
-    {
-        return false;
-    }
+	if(end == string::npos)
+	{
+		return false;
+	}

-    //Move to next character after :
-    end += 1;
+	//Move to next character after :
+	end += 1;

-    wchar_t c = message->at(end);
+	wchar_t c = message->at(end);

-    //Move to the next character, which is the start of the value
-    end += 1;
-    
-    if(c == '[')
-    {
-        return GetList(end - 1, message, result);
-    }
-    else
-    {
-        return GetValue(end, message, result);
-    }
+	//Move to the next character, which is the start of the value
+	end += 1;
+	
+	if(c == '[')
+	{
+		return GetList(end - 1, message, result);
+	}
+	else
+	{
+		return GetValue(end, message, result);
+	}
 }

 bool ParserUtil::GetList(size_t start, const wstring* message, wstring* result)
 {
-    size_t end = start + 1;
+	size_t end = start + 1;

-    int openBraceCount = 1;
+	int openBraceCount = 1;

-    while(openBraceCount > 0)
-    {
-        size_t closeBraceLocation = message->find(CLOSE_BRACE, end);
-        size_t openBraceLocation = message->find(OPEN_BRACE, end);
+	while(openBraceCount > 0)
+	{
+		size_t closeBraceLocation = message->find(CLOSE_BRACE, end);
+		size_t openBraceLocation = message->find(OPEN_BRACE, end);

-        if(closeBraceLocation < openBraceLocation)
-        {
-            openBraceCount--;
-            end = closeBraceLocation + 1;
-        }
-        else if(openBraceLocation < closeBraceLocation)
-        {
-            openBraceCount++;
-            end = openBraceLocation + 1;
-        }
+		if(closeBraceLocation < openBraceLocation)
+		{
+			openBraceCount--;
+			end = closeBraceLocation + 1;
+		}
+		else if(openBraceLocation < closeBraceLocation)
+		{
+			openBraceCount++;
+			end = openBraceLocation + 1;
+		}

-    }
-    
-    size_t length = end - start;
+	}
+	
+	size_t length = end - start;

-    return GetString(start, end, message, result);
+	return GetString(start, end, message, result);
 }

 size_t ParserUtil::GetNextStringItemInList(const wstring* message, size_t start, wstring* result)
 {
-    size_t end = string::npos;
-    size_t commaLocation = message->find(COMMA, start);
+	size_t end = string::npos;
+	size_t commaLocation = message->find(COMMA, start);

-    if(commaLocation == string::npos)
-    {
-        end = message->find(CLOSE_BRACE, start);
-        if(end == string::npos)
-        {
-            end = message->length();
-        }
-        else
-        {
-            end = end - 1;
-        }
-    }
-    else
-    {
-        end = commaLocation - 1;
-    }
+	if(commaLocation == string::npos)
+	{
+		end = message->find(CLOSE_BRACE, start);
+		if(end == string::npos)
+		{
+			end = message->length();
+		}
+		else
+		{
+			end = end - 1;
+		}
+	}
+	else
+	{
+		end = commaLocation - 1;
+	}

-    if(!GetString(start + 2, end, message, result))
-    {
-        return string::npos;
-    }
+	if(!GetString(start + 2, end, message, result))
+	{
+		return string::npos;
+	}

-    return end + 2;
+	return end + 2;
 }

 size_t ParserUtil::GetNextOCItemInList(const wstring* message, size_t start, wstring* result)
 {
-    size_t end = message->find(OPEN_CURLY_BRACE, start) + 1;
+	size_t end = message->find(OPEN_CURLY_BRACE, start) + 1;

-    int openBraceCount = 1;
+	int openBraceCount = 1;

-    while(openBraceCount > 0)
-    {
-        size_t closeBraceLocation = message->find(CLOSE_CURLY_BRACE, end);
-        size_t openBraceLocation = message->find(OPEN_CURLY_BRACE, end);
+	while(openBraceCount > 0)
+	{
+		size_t closeBraceLocation = message->find(CLOSE_CURLY_BRACE, end);
+		size_t openBraceLocation = message->find(OPEN_CURLY_BRACE, end);

-        if(closeBraceLocation < openBraceLocation)
-        {
-            openBraceCount--;
-            end = closeBraceLocation + 1;
-        }
-        else if(openBraceLocation < closeBraceLocation)
-        {
-            openBraceCount++;
-            end = openBraceLocation + 1;
-        }
-    }
+		if(closeBraceLocation < openBraceLocation)
+		{
+			openBraceCount--;
+			end = closeBraceLocation + 1;
+		}
+		else if(openBraceLocation < closeBraceLocation)
+		{
+			openBraceCount++;
+			end = openBraceLocation + 1;
+		}
+	}

-    size_t length = end - start;
+	size_t length = end - start;

-    if(!GetString(start, end, message, result))
-    {
-        return string::npos;
-    }
+	if(!GetString(start, end, message, result))
+	{
+		return string::npos;
+	}

-    return end;
+	return end;
 }

 bool ParserUtil::GetValue(size_t start, const wstring* message, wstring* result)
 {
-    if(message->at(start - 1) == '\"')
-    {
-        size_t end = message->find(QUOTE, start);
-        return GetString(start, end, message, result);
-    }
-    else
-    {
-        start = start - 1;
+	if(message->at(start - 1) == '\"')
+	{
+		size_t end = message->find(QUOTE, start);
+		return GetString(start, end, message, result);
+	}
+	else
+	{
+		start = start - 1;

-        size_t end = message->find(COMMA, start);
-        
-        result->append(message->substr(start, end-start));
-    }
+		size_t end = message->find(COMMA, start);
+		
+		result->append(message->substr(start, end-start));
+	}

-    return true;
+	return true;
 }

 bool ParserUtil::GetString(size_t start, size_t end, const wstring* message, wstring* result)
 {
-    if(end == string::npos)
-    {
-        return false;
-    }
+	if(end == string::npos)
+	{
+		return false;
+	}

-    size_t length = end - start;
+	size_t length = end - start;

-    if(length > 0)
-    {
-        result->append(message->substr(start, length));
-    }
-    else
-    {
-        result->append(L"");
-    }
+	if(length > 0)
+	{
+		result->append(message->substr(start, length));
+	}
+	else
+	{
+		result->append(L"");
+	}

-    
-    return true;
+	
+	return true;
 }

 bool ParserUtil::IsList(wstring* message)
 {
-    wchar_t c = message->at(0);
-    
-    if(c == '[')
-    {
-        return true;
-    }
+	wchar_t c = message->at(0);
+	
+	if(c == '[')
+	{
+		return true;
+	}

-    return false;
+	return false;
 }

 bool ParserUtil::ParseJsonList(wstring* message, vector<wstring*>* items)
 {

-    size_t currentLocation = message->find(OPEN_BRACE, 0);
+	size_t currentLocation = message->find(OPEN_BRACE, 0);

-    while(currentLocation < message->size())
-    {
-        wstring* item = new wstring();
+	while(currentLocation < message->size())
+	{
+		wstring* item = new wstring();

-        currentLocation = ParserUtil::GetNextStringItemInList(message, currentLocation, item);
+		currentLocation = ParserUtil::GetNextStringItemInList(message, currentLocation, item);

-        if(currentLocation == string::npos)
-        {
-            return false;
-        }
+		if(currentLocation == string::npos)
+		{
+			return false;
+		}

-        items->push_back(item);
-    }
+		items->push_back(item);
+	}

-    return true;
+	return true;
 }

 bool ParserUtil::ParseOCList(wstring* message, vector<wstring*>* items)
 {

-    size_t currentLocation = message->find(OPEN_CURLY_BRACE, 0);
+	size_t currentLocation = message->find(OPEN_CURLY_BRACE, 0);

-    while(currentLocation < message->size())
-    {
-        wstring* item = new wstring();
+	while(currentLocation < message->size())
+	{
+		wstring* item = new wstring();

-        currentLocation = ParserUtil::GetNextOCItemInList(message, currentLocation, item);
+		currentLocation = ParserUtil::GetNextOCItemInList(message, currentLocation, item);

-        if(currentLocation == string::npos)
-        {
-            return false;
-        }
+		if(currentLocation == string::npos)
+		{
+			return false;
+		}

-        items->push_back(item);
-    }
+		items->push_back(item);
+	}

-    return true;
+	return true;
 }

 bool ParserUtil::ParseOCMessageList(wstring* message, vector<OCMessage*>* messages)
 {
-    vector<wstring*>* items = new vector<wstring*>();
+	vector<wstring*>* items = new vector<wstring*>();

-    if(!ParseOCList(message, items))
-    {
-        return false;
-    }
+	if(!ParseOCList(message, items))
+	{
+		return false;
+	}

-    for(vector<wstring*>::iterator it = items->begin(); it != items->end(); it++)
-    {
-        wstring* temp = *it;
+	for(vector<wstring*>::iterator it = items->begin(); it != items->end(); it++)
+	{
+		wstring* temp = *it;

-        OCMessage* message = new OCMessage();
-        message->InitFromMessage(temp);
+		OCMessage* message = new OCMessage();
+		message->InitFromMessage(temp);

-        messages->push_back(message);
-    }
+		messages->push_back(message);
+	}

-    return true;
+	return true;
 }

 bool ParserUtil::SerializeList(std::vector<std::wstring>* list, std::wstring* result, bool escapeQuotes)
 {
-    if(result == 0)
-    {
-        return false;
-    }
+	if(result == 0)
+	{
+		return false;
+	}

-    result->append(OPEN_BRACE);
+	result->append(OPEN_BRACE);

-    for(vector<wstring>::iterator it = list->begin(); it != list->end(); it++)
-    {
-        wstring value = *it;
+	for(vector<wstring>::iterator it = list->begin(); it != list->end(); it++)
+	{
+		wstring value = *it;

-        if(escapeQuotes)
-        {
-            result->append(BACK_SLASH);
-        }
+		if(escapeQuotes)
+		{
+			result->append(BACK_SLASH);
+		}

-        result->append(QUOTE);
-        result->append(value.c_str());
+		result->append(QUOTE);
+		result->append(value.c_str());

-        if(escapeQuotes)
-        {
-            result->append(BACK_SLASH);
-        }
+		if(escapeQuotes)
+		{
+			result->append(BACK_SLASH);
+		}

-        result->append(QUOTE);
-        result->append(COMMA);
-    }
+		result->append(QUOTE);
+		result->append(COMMA);
+	}

-    //Erase last comma
-    result->erase(result->size() - 1, 1);
+	//Erase last comma
+	result->erase(result->size() - 1, 1);

-    result->append(CLOSE_BRACE);
+	result->append(CLOSE_BRACE);

-    return true;
+	return true;
 }

 bool ParserUtil::SerializeMessage(std::map<std::wstring*, std::wstring*>* arguments, std::wstring* result, bool escapeQuotes)
 {
-    if(result == 0)
-    {
-        return false;
-    }
+	if(result == 0)
+	{
+		return false;
+	}

-    result->append(OPEN_CURLY_BRACE);
+	result->append(OPEN_CURLY_BRACE);

-    for(map<wstring*, wstring*>::iterator it = arguments->begin(); it != arguments->end(); it++)
-    {
-        wstring key = *it->first;
-        wstring value = *it->second;
+	for(map<wstring*, wstring*>::iterator it = arguments->begin(); it != arguments->end(); it++)
+	{
+		wstring key = *it->first;
+		wstring value = *it->second;

-        if(escapeQuotes)
-        {
-            result->append(BACK_SLASH);
-        }
+		if(escapeQuotes)
+		{
+			result->append(BACK_SLASH);
+		}

-        result->append(QUOTE);
-        result->append(key.c_str());
+		result->append(QUOTE);
+		result->append(key.c_str());

-        if(escapeQuotes)
-        {
-            result->append(BACK_SLASH);
-        }
+		if(escapeQuotes)
+		{
+			result->append(BACK_SLASH);
+		}

-        result->append(QUOTE);
-        result->append(COLON);
-        result->append(value.c_str());
-        result->append(COMMA);
-    }
+		result->append(QUOTE);
+		result->append(COLON);
+		result->append(value.c_str());
+		result->append(COMMA);
+	}

-    //Erase last comma
-    result->erase(result->size() - 1, 1);
+	//Erase last comma
+	result->erase(result->size() - 1, 1);

-    result->append(CLOSE_CURLY_BRACE);
+	result->append(CLOSE_CURLY_BRACE);

-    return true;
+	return true;
 }

 bool ParserUtil::SerializeMessage(OCMessage* OCMessage, std::wstring* result)
 {
-    if(result == 0)
-    {
-        return false;
-    }
+	if(result == 0)
+	{
+		return false;
+	}

-    result->append(OPEN_CURLY_BRACE);
+	result->append(OPEN_CURLY_BRACE);

-    result->append(QUOTE);
-    result->append(COMMAND);
-    result->append(QUOTE);
+	result->append(QUOTE);
+	result->append(COMMAND);
+	result->append(QUOTE);

-    result->append(COLON);
+	result->append(COLON);

-    result->append(QUOTE);
-    result->append(OCMessage->GetCommand()->c_str());
-    result->append(QUOTE);
+	result->append(QUOTE);
+	result->append(OCMessage->GetCommand()->c_str());
+	result->append(QUOTE);

-    result->append(COMMA);
-    
-    result->append(QUOTE);
-    result->append(VALUE);
-    result->append(QUOTE);
+	result->append(COMMA);
+	
+	result->append(QUOTE);
+	result->append(VALUE);
+	result->append(QUOTE);

-    result->append(COLON);
-    
-    if(!IsList(OCMessage->GetValue()))
-    {
-        result->append(QUOTE);
-    }
-    
-    result->append(OCMessage->GetValue()->c_str());
-    
-    if(!IsList(OCMessage->GetValue()))
-    {
-        result->append(QUOTE);
-    }
+	result->append(COLON);
+	
+	if(!IsList(OCMessage->GetValue()))
+	{
+		result->append(QUOTE);
+	}
+	
+	result->append(OCMessage->GetValue()->c_str());
+	
+	if(!IsList(OCMessage->GetValue()))
+	{
+		result->append(QUOTE);
+	}

-    result->append(CLOSE_CURLY_BRACE);
+	result->append(CLOSE_CURLY_BRACE);

-    return true;
+	return true;
 }

@@ -22,49 +22,49 @@ using namespace std;

 bool RegistryUtil::ReadRegistry(const wchar_t* key, const wchar_t* name, int* result)
 {
-    wstring* strResult = new wstring();
+	wstring* strResult = new wstring();

-    if(!ReadRegistry(key, name, strResult))
-    {
-        return false;
-    }
+	if(!ReadRegistry(key, name, strResult))
+	{
+		return false;
+	}

-    *result = stoi( strResult->c_str() );
+	*result = stoi( strResult->c_str() );

-    return true;
+	return true;
 }

 bool RegistryUtil::ReadRegistry(const wchar_t* key, const wchar_t* name, wstring* result)
 {
-    HRESULT hResult;
+	HRESULT hResult;

-    HKEY rootKey = NULL;
+	HKEY rootKey = NULL;

-    hResult = HRESULT_FROM_WIN32(RegOpenKeyEx(HKEY_CURRENT_USER, (LPCWSTR)key, NULL, KEY_READ, &rootKey));
+	hResult = HRESULT_FROM_WIN32(RegOpenKeyEx(HKEY_CURRENT_USER, (LPCWSTR)key, NULL, KEY_READ, &rootKey));

-    if(!SUCCEEDED(hResult))
-    {
-        return false;
-    }
+	if(!SUCCEEDED(hResult))
+	{
+		return false;
+	}

-    wchar_t value[SIZE];
-    DWORD value_length = SIZE;
-    
+	wchar_t value[SIZE];
+	DWORD value_length = SIZE;
+	
    hResult = RegQueryValueEx(rootKey, (LPCWSTR)name, NULL, NULL, (LPBYTE)value, &value_length );

-    if(!SUCCEEDED(hResult))
-    {
-        return false;
-    }
+	if(!SUCCEEDED(hResult))
+	{
+		return false;
+	}

-    result->append(value);
+	result->append(value);

-    HRESULT hResult2 = RegCloseKey(rootKey);
+	HRESULT hResult2 = RegCloseKey(rootKey);

-    if (!SUCCEEDED(hResult2))
-    {
-        return false;
-    }
+	if (!SUCCEEDED(hResult2))
+	{
+		return false;
+	}

-    return true;
+	return true;
 }
@@ -24,12 +24,12 @@
 class __declspec(dllexport) RegistryUtil
 {
 public:
-    RegistryUtil();
+	RegistryUtil();

-    ~RegistryUtil();
+	~RegistryUtil();

-    static bool ReadRegistry(const wchar_t*,  const wchar_t*, int*);
-    static bool ReadRegistry(const wchar_t*,  const wchar_t*, std::wstring*);
+	static bool ReadRegistry(const wchar_t*,  const wchar_t*, int*);
+	static bool ReadRegistry(const wchar_t*,  const wchar_t*, std::wstring*);
 };

 #endif
@@ -40,7 +40,7 @@ void RemotePathChecker::workerThreadLoop()
    std::unordered_set<std::wstring> asked;

    while(!_stop) {
-        Sleep(50);
+		Sleep(50);

        if (!connected) {
            asked.clear();
@@ -72,42 +72,33 @@ void RemotePathChecker::workerThreadLoop()

        std::wstring response;
        while (!_stop && socket.ReadLine(&response)) {
-            if (StringUtil::begins_with(response, wstring(L"REGISTER_PATH:"))) {
-                wstring responsePath = response.substr(14); // length of REGISTER_PATH:
+			if (StringUtil::begins_with(response, wstring(L"REGISTER_PATH:"))) {
+				wstring responsePath = response.substr(14); // length of REGISTER_PATH:

-                auto sharedPtrCopy = atomic_load(&_watchedDirectories);
-                auto vectorCopy = make_shared<vector<wstring>>(*sharedPtrCopy);
-                vectorCopy->push_back(responsePath);
-                atomic_store(&_watchedDirectories, shared_ptr<const vector<wstring>>(vectorCopy));
-
-                // We don't keep track of all files and can't know which file is currently visible
-                // to the user, but at least reload the root dir so that any shortcut to the root
-                // is updated without the user needing to refresh.
-                SHChangeNotify(SHCNE_UPDATEDIR, SHCNF_PATH | SHCNF_FLUSHNOWAIT, responsePath.data(), NULL);
-            } else if (StringUtil::begins_with(response, wstring(L"UNREGISTER_PATH:"))) {
+				{   std::unique_lock<std::mutex> lock(_mutex);
+					_watchedDirectories.push_back(responsePath);
+				}
+				SHChangeNotify(SHCNE_UPDATEDIR, SHCNF_PATH | SHCNF_FLUSHNOWAIT, responsePath.data(), NULL);
+			} else if (StringUtil::begins_with(response, wstring(L"UNREGISTER_PATH:"))) {
                wstring responsePath = response.substr(16); // length of UNREGISTER_PATH:

-                auto sharedPtrCopy = atomic_load(&_watchedDirectories);
-                auto vectorCopy = make_shared<vector<wstring>>(*sharedPtrCopy);
-                vectorCopy->erase(
-                    std::remove(vectorCopy->begin(), vectorCopy->end(), responsePath),
-                    vectorCopy->end());
-                atomic_store(&_watchedDirectories, shared_ptr<const vector<wstring>>(vectorCopy));
-
-                vector<wstring> removedPaths;
                {   std::unique_lock<std::mutex> lock(_mutex);
+                    _watchedDirectories.erase(
+                        std::remove(_watchedDirectories.begin(), _watchedDirectories.end(), responsePath),
+                        _watchedDirectories.end());
+
                    // Remove any item from the cache
                    for (auto it = _cache.begin(); it != _cache.end() ; ) {
-                        if (StringUtil::isDescendantOf(it->first, responsePath)) {
-                            removedPaths.emplace_back(move(it->first));
+                        if (StringUtil::begins_with(it->first, responsePath)) {
                            it = _cache.erase(it);
                        } else {
                            ++it;
                        }
                    }
+                    // Assume that we won't need this at this point, UNREGISTER_PATH is rare
+                    _oldCache.clear();
                }
-                for (auto& path : removedPaths)
-                    SHChangeNotify(SHCNE_UPDATEITEM, SHCNF_PATH | SHCNF_FLUSHNOWAIT, path.data(), NULL);
+				SHChangeNotify(SHCNE_UPDATEDIR, SHCNF_PATH | SHCNF_FLUSHNOWAIT, responsePath.data(), NULL);
            } else if (StringUtil::begins_with(response, wstring(L"STATUS:")) ||
                    StringUtil::begins_with(response, wstring(L"BROADCAST:"))) {

@@ -125,57 +116,57 @@ void RemotePathChecker::workerThreadLoop()
                auto state = _StrToFileState(responseStatus);
                bool wasAsked = asked.erase(responsePath) > 0;

-                bool updateView = false;
+                bool changed = false;
                {   std::unique_lock<std::mutex> lock(_mutex);
-                    auto it = _cache.find(responsePath);
-                    if (it == _cache.end()) {
-                        // The client only approximates requested files, if the bloom
-                        // filter becomes saturated after navigating multiple directories we'll start getting
-                        // status pushes that we never requested and fill our cache. Ignore those.
-                        if (!wasAsked) {
-                            continue;
-                        }
-                        it = _cache.insert(make_pair(responsePath, StateNone)).first;
+                    bool wasCached = _cache.find(responsePath) != _cache.end();
+                    if (wasAsked || wasCached) {
+                        auto &it = _cache[responsePath];
+                        changed = (it != state);
+                        it = state;
                    }
-
-                    updateView = it->second != state;
-                    it->second = state;
                }
-                if (updateView) {
+                if (changed) {
                    SHChangeNotify(SHCNE_UPDATEITEM, SHCNF_PATH | SHCNF_FLUSHNOWAIT, responsePath.data(), NULL);
+                }
+			}
+			else if (StringUtil::begins_with(response, wstring(L"UPDATE_VIEW"))) {
+				std::unique_lock<std::mutex> lock(_mutex);
+                // Keep the old states to continue having something to display while the new state is
+                // requested from the client, triggered by clearing _cache.
+                _oldCache.insert(_cache.cbegin(), _cache.cend());
+
+                // Swap to make a copy of the cache under the mutex and clear the one stored.
+                std::unordered_map<std::wstring, FileState> cache;
+                swap(cache, _cache);
+                lock.unlock();
+                // Let explorer know about the invalidated cache entries, it will re-request the ones it needs.
+                for (auto it = cache.begin(); it != cache.end(); ++it) {
+                    SHChangeNotify(SHCNE_UPDATEITEM, SHCNF_PATH | SHCNF_FLUSHNOWAIT, it->first.data(), NULL);
                }
            }
-        }
+		}

-        if (socket.Event() == INVALID_HANDLE_VALUE) {
-            atomic_store(&_watchedDirectories, make_shared<const vector<wstring>>());
-            std::unique_lock<std::mutex> lock(_mutex);
-            _connected = connected = false;
+		if (socket.Event() == INVALID_HANDLE_VALUE) {
+			std::unique_lock<std::mutex> lock(_mutex);
+			_cache.clear();
+            _oldCache.clear();
+			_watchedDirectories.clear();
+			_connected = connected = false;
+		}

-            // Swap to make a copy of the cache under the mutex and clear the one stored.
-            std::unordered_map<std::wstring, FileState> cache;
-            swap(cache, _cache);
-            lock.unlock();
-            // Let explorer know about each invalidated cache entry that needs to get its icon removed.
-            for (auto it = cache.begin(); it != cache.end(); ++it) {
-                SHChangeNotify(SHCNE_UPDATEITEM, SHCNF_PATH | SHCNF_FLUSHNOWAIT, it->first.data(), NULL);
-            }
-        }
+		if (_stop) return;

-        if (_stop) return;
-
-        HANDLE handles[2] = { _newQueries, socket.Event() };
-        WaitForMultipleObjects(2, handles, false, 0);
+		HANDLE handles[2] = { _newQueries, socket.Event() };
+		WaitForMultipleObjects(2, handles, false, 0);
    }
 }



 RemotePathChecker::RemotePathChecker()
-    : _watchedDirectories(make_shared<const vector<wstring>>())
-    , _connected(false)
+    : _connected(false)
    , _newQueries(CreateEvent(NULL, true, true, NULL))
-    , _thread([this]{ this->workerThreadLoop(); })
+	, _thread([this]{ this->workerThreadLoop(); })
 {
 }

@@ -188,9 +179,10 @@ RemotePathChecker::~RemotePathChecker()
    CloseHandle(_newQueries);
 }

-std::shared_ptr<const std::vector<std::wstring>> RemotePathChecker::WatchedDirectories() const
+vector<wstring> RemotePathChecker::WatchedDirectories()
 {
-    return atomic_load(&_watchedDirectories);
+    std::unique_lock<std::mutex> lock(_mutex);
+    return _watchedDirectories;
 }

 bool RemotePathChecker::IsMonitoredPath(const wchar_t* filePath, int* state)
@@ -206,39 +198,44 @@ bool RemotePathChecker::IsMonitoredPath(const wchar_t* filePath, int* state)

    auto it = _cache.find(path);
    if (it != _cache.end()) {
-        // The path is in our cache, and we'll get updates pushed if the status changes.
        *state = it->second;
        return true;
    }

+    // Re-request the status while we display what we have in _oldCache
    _pending.push(filePath);

+    it = _oldCache.find(path);
+    bool foundInOldCache = it != _oldCache.end();
+    if (foundInOldCache)
+        *state = it->second;
+
    lock.unlock();
    SetEvent(_newQueries);
-    return false;
+    return foundInOldCache;
 }

 RemotePathChecker::FileState RemotePathChecker::_StrToFileState(const std::wstring &str)
 {
-    if (str == L"NOP" || str == L"NONE") {
-        return StateNone;
-    } else if (str == L"SYNC" || str == L"NEW") {
-        return StateSync;
-    } else if (str == L"SYNC+SWM" || str == L"NEW+SWM") {
-        return StateSync;
-    } else if (str == L"OK") {
-        return StateOk;
-    } else if (str == L"OK+SWM") {
-        return StateOkSWM;
-    } else if (str == L"IGNORE") {
-        return StateWarning;
-    } else if (str == L"IGNORE+SWM") {
-        return StateWarning;
-    } else if (str == L"ERROR") {
-        return StateError;
-    } else if (str == L"ERROR+SWM") {
-        return StateError;
-    }
+	if (str == L"NOP" || str == L"NONE") {
+		return StateNone;
+	} else if (str == L"SYNC" || str == L"NEW") {
+		return StateSync;
+	} else if (str == L"SYNC+SWM" || str == L"NEW+SWM") {
+		return StateSync;
+	} else if (str == L"OK") {
+		return StateOk;
+	} else if (str == L"OK+SWM") {
+		return StateOkSWM;
+	} else if (str == L"IGNORE") {
+		return StateWarning;
+	} else if (str == L"IGNORE+SWM") {
+		return StateWarning;
+	} else if (str == L"ERROR") {
+		return StateError;
+	} else if (str == L"ERROR+SWM") {
+		return StateError;
+	}

-    return StateNone;
+	return StateNone;
 }
@@ -19,7 +19,6 @@
 #include <unordered_map>
 #include <queue>
 #include <thread>
-#include <memory>
 #include <mutex>
 #include <atomic>
 #include <condition_variable>
@@ -28,21 +27,21 @@

 class __declspec(dllexport) RemotePathChecker {
 public:
-    enum FileState {
-        // Order synced with OCOverlay
-        StateError = 0,
-        StateOk, StateOkSWM,
-        StateSync,
-        StateWarning,
-        StateNone
-    };
-    RemotePathChecker();
+	enum FileState {
+		// Order synced with OCOverlay
+		StateError = 0,
+		StateOk, StateOkSWM,
+		StateSync,
+		StateWarning,
+		StateNone
+	};
+	RemotePathChecker();
    ~RemotePathChecker();
-    std::shared_ptr<const std::vector<std::wstring>> WatchedDirectories() const;
-    bool IsMonitoredPath(const wchar_t* filePath, int* state);
+	std::vector<std::wstring> WatchedDirectories();
+	bool IsMonitoredPath(const wchar_t* filePath, int* state);

 private:
-    FileState _StrToFileState(const std::wstring &str);
+	FileState _StrToFileState(const std::wstring &str);
    std::mutex _mutex;
    std::atomic<bool> _stop;

@@ -53,9 +52,8 @@ private:
    std::queue<std::wstring> _pending;

    std::unordered_map<std::wstring, FileState> _cache;
-    // The vector is const since it will be accessed from multiple threads through OCOverlay::IsMemberOf.
-    // Each modification needs to be made onto a copy and then atomically replaced in the shared_ptr.
-    std::shared_ptr<const std::vector<std::wstring>> _watchedDirectories;
+    std::unordered_map<std::wstring, FileState> _oldCache;
+    std::vector<std::wstring> _watchedDirectories;
    bool _connected;


@@ -63,7 +61,7 @@ private:
    //std::condition_variable _newQueries;
    HANDLE _newQueries;

-    std::thread _thread;
+	std::thread _thread;
    void workerThreadLoop();
 };

@@ -21,18 +21,18 @@

 std::string StringUtil::toUtf8(const wchar_t *utf16, int len)
 {
-    if (len < 0) {
-        len = (int) wcslen(utf16);
-    }
+	if (len < 0) {
+		len = (int) wcslen(utf16);
+	}
    std::wstring_convert<std::codecvt_utf8_utf16<wchar_t> > converter;
    return converter.to_bytes(utf16, utf16+len);
 }

 std::wstring StringUtil::toUtf16(const char *utf8, int len)
 {
-    if (len < 0) {
-        len = (int) strlen(utf8);
-    }
-    std::wstring_convert<std::codecvt_utf8_utf16<wchar_t> > converter;
+	if (len < 0) {
+		len = (int) strlen(utf8);
+	}
+	std::wstring_convert<std::codecvt_utf8_utf16<wchar_t> > converter;
    return converter.from_bytes(utf8, utf8+len);
 }
@@ -20,30 +20,15 @@

 class __declspec(dllexport) StringUtil {
 public:
-    static std::string  toUtf8(const wchar_t* utf16, int len = -1);
-    static std::wstring toUtf16(const char* utf8, int len = -1);
+	static std::string  toUtf8(const wchar_t* utf16, int len = -1);
+	static std::wstring toUtf16(const char* utf8, int len = -1);

-    template<class T>
-    static bool begins_with(const T& input, const T& match)
-    {
-        return input.size() >= match.size()
-            && std::equal(match.begin(), match.end(), input.begin());
-    }
-
-    static bool isDescendantOf(const std::wstring& child, const std::wstring& parent) {
-        return isDescendantOf(child.c_str(), child.size(), parent.c_str(), parent.size());
-    }
-
-    static bool isDescendantOf(PCWSTR child, size_t childLength, const std::wstring& parent) {
-        return isDescendantOf(child, childLength, parent.c_str(), parent.size());
-    }
-
-    static bool isDescendantOf(PCWSTR child, size_t childLength, PCWSTR parent, size_t parentLength) {
-        if (!parentLength)
-            return false;
-        return (childLength == parentLength || childLength > parentLength && (child[parentLength] == L'\\' || child[parentLength - 1] == L'\\'))
-            && wcsncmp(child, parent, parentLength) == 0;
-    }
+	template<class T>
+	static bool begins_with(const T& input, const T& match)
+	{
+		return input.size() >= match.size()
+			&& std::equal(match.begin(), match.end(), input.begin());
+	}
 };

 #endif // STRINGUTIL_H
@@ -2,7 +2,7 @@

 // This is the number that will end up in the version window of the DLLs.
 // Increment this version before committing a new build if you are today's shell_integration build master.
-#define OCEXT_BUILD_NUM 44
+#define OCEXT_BUILD_NUM 43

 #define STRINGIZE2(s) #s
 #define STRINGIZE(s) STRINGIZE2(s)
@@ -0,0 +1,110 @@
+/*
+ * Copyright (C) by Pierre MOREAU <p.moreau@agim.idshost.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ */
+
+/**
+ * \file p12topem.cpp
+ * \brief Static library to convert p12 to pem
+ * \author Pierre MOREAU <p.moreau@agim.idshost.fr>
+ * \version 1.0.0
+ * \date 09 January 2014
+ */
+
+#include "p12topem.h"
+
+/**
+ * \fn string x509ToString (BIO)
+ * \brief Return string from BIO SSL
+ * \param BIO o PEM_write_BIO_...
+ * \return string PEM
+ */
+string x509ToString(BIO *o) {
+    BUF_MEM *bptr;
+    BIO_get_mem_ptr(o, &bptr);
+    int len = bptr->length;
+    void* data = calloc(len+10, sizeof(char));
+    BIO_read(o, data, len);
+    string ret = std::string(static_cast<char*>(data));
+    free(data);
+        
+    return ret;
+}
+
+/**
+ * \fn resultP12ToPem p12ToPem (string, string)
+ * \brief Convert P12 to PEM
+ * \param string p12File Path to P12 file
+ * \param string p12Passwd Password to open P12 file
+ * \return result (bool ReturnCode, Int ErrorCode, String Comment, String PrivateKey, String Certificate)
+ */
+resultP12ToPem p12ToPem(string p12File, string p12Passwd) {
+    FILE *fp;
+    PKCS12 *p12 = NULL;
+    EVP_PKEY *pkey = NULL;
+    X509 *cert = NULL;
+    STACK_OF(X509) *ca = NULL;
+    
+    BIO *o = BIO_new(BIO_s_mem());
+    
+    string privateKey = "";
+    string certificate = "";
+        
+    resultP12ToPem ret;
+    ret.ReturnCode = false;
+    ret.ErrorCode = 0;
+    ret.Comment = "";
+    ret.PrivateKey = "";
+    ret.Certificate = "";
+    
+    SSLeay_add_all_algorithms();
+    ERR_load_crypto_strings();
+    if(!(fp = fopen(p12File.c_str(), "rb"))) {
+        ret.ErrorCode = 1;
+        ret.Comment = strerror(errno);
+        return ret;
+    }
+    
+    p12 = d2i_PKCS12_fp(fp, &p12);
+    fclose (fp);
+    
+    if (!p12) {
+        ret.ErrorCode = 2;
+        ret.Comment = "Unable to open PKCS#12 file";
+        return ret;
+    }
+    if (!PKCS12_parse(p12, p12Passwd.c_str(), &pkey, &cert, &ca)) {
+        ret.ErrorCode = 3;
+        ret.Comment = "Unable to parse PKCS#12 file (wrong password ?)";
+        return ret;
+    }
+    PKCS12_free(p12);
+    
+    if (!(pkey && cert)) {
+        ret.ErrorCode = 4;
+        ret.Comment = "Certificate and/or key file doesn't exists";
+    } else {
+        PEM_write_bio_PrivateKey(o, pkey, 0, 0, 0, NULL, 0);
+        privateKey = x509ToString(o);
+                
+        PEM_write_bio_X509(o, cert);
+        certificate = x509ToString(o);
+        
+        BIO_free(o);
+        
+        ret.ReturnCode = true;
+        ret.ErrorCode = 0;
+        ret.Comment = "All is fine";
+        ret.PrivateKey = privateKey;
+        ret.Certificate = certificate;
+    }
+    return ret;
+}
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) by Pierre MOREAU <p.moreau@agim.idshost.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ */
+
+#ifndef P12TOPEM_H
+#define	P12TOPEM_H
+
+/**
+ * \file p12topem.h
+ * \brief Static library to convert p12 to pem
+ * \author Pierre MOREAU <p.moreau@agim.idshost.fr>
+ * \version 1.0.0
+ * \date 09 January 2014
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <string>
+#include <openssl/pem.h>
+#include <openssl/err.h>
+#include <openssl/pkcs12.h>
+
+using namespace std;
+
+/**
+ * \struct resultP12ToPem p12topem.h
+ */
+struct resultP12ToPem {
+    bool ReturnCode;
+    int ErrorCode;
+    string Comment;
+    string PrivateKey;
+    string Certificate;
+};
+
+/**
+ * \brief Return string from BIO SSL
+ * \param BIO o PEM_write_BIO_...
+ * \return string PEM
+ */
+string x509ToString(BIO *o);
+
+/**
+ * \brief Convert P12 to PEM
+ * \param string p12File Path to P12 file
+ * \param string p12Passwd Password to open P12 file
+ * \return result (bool ReturnCode, Int ErrorCode, String Comment, String PrivateKey, String Certificate)
+ */
+resultP12ToPem p12ToPem(string p12File, string p12Passwd);
+
+#endif	/* P12TOPEM_H */
+
@@ -108,8 +108,7 @@ extern "C" {
 ** be held constant and Z will be incremented or else Y will be incremented
 ** and Z will be reset to zero.
 **
-** Since [version 3.6.18] ([dateof:3.6.18]), 
-** SQLite source code has been stored in the
+** Since version 3.6.18, SQLite source code has been stored in the
 ** <a href="http://www.fossil-scm.org/">Fossil configuration management
 ** system</a>.  ^The SQLITE_SOURCE_ID macro evaluates to
 ** a string which identifies a particular check-in of SQLite
@@ -121,13 +120,13 @@ extern "C" {
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
 ** [sqlite_version()] and [sqlite_source_id()].
 */
-#define SQLITE_VERSION        "3.16.1"
-#define SQLITE_VERSION_NUMBER 3016001
-#define SQLITE_SOURCE_ID      "2017-01-03 18:27:03 979f04392853b8053817a3eea2fc679947b437fd"
+#define SQLITE_VERSION        "3.14.2"
+#define SQLITE_VERSION_NUMBER 3014002
+#define SQLITE_SOURCE_ID      "2016-09-12 18:50:49 29dbef4b8585f753861a36d6dd102ca634197bd6"

 /*
 ** CAPI3REF: Run-Time Library Version Numbers
-** KEYWORDS: sqlite3_version sqlite3_sourceid
+** KEYWORDS: sqlite3_version, sqlite3_sourceid
 **
 ** These interfaces provide the same information as the [SQLITE_VERSION],
 ** [SQLITE_VERSION_NUMBER], and [SQLITE_SOURCE_ID] C preprocessor macros
@@ -453,8 +452,7 @@ SQLITE_API int sqlite3_exec(
 ** [result codes].  However, experience has shown that many of
 ** these result codes are too coarse-grained.  They do not provide as
 ** much information about problems as programmers might like.  In an effort to
-** address this, newer versions of SQLite (version 3.3.8 [dateof:3.3.8]
-** and later) include
+** address this, newer versions of SQLite (version 3.3.8 and later) include
 ** support for additional result codes that provide more detailed information
 ** about errors. These [extended result codes] are enabled or disabled
 ** on a per database connection basis using the
@@ -978,12 +976,6 @@ struct sqlite3_io_methods {
 ** on whether or not the file has been renamed, moved, or deleted since it
 ** was first opened.
 **
-** <li>[[SQLITE_FCNTL_WIN32_GET_HANDLE]]
-** The [SQLITE_FCNTL_WIN32_GET_HANDLE] opcode can be used to obtain the
-** underlying native file handle associated with a file handle.  This file
-** control interprets its argument as a pointer to a native file handle and
-** writes the resulting value there.
-**
 ** <li>[[SQLITE_FCNTL_WIN32_SET_HANDLE]]
 ** The [SQLITE_FCNTL_WIN32_SET_HANDLE] opcode is used for debugging.  This
 ** opcode causes the xFileControl method to swap the file handle with the one
@@ -1034,8 +1026,6 @@ struct sqlite3_io_methods {
 #define SQLITE_FCNTL_RBU                    26
 #define SQLITE_FCNTL_VFS_POINTER            27
 #define SQLITE_FCNTL_JOURNAL_POINTER        28
-#define SQLITE_FCNTL_WIN32_GET_HANDLE       29
-#define SQLITE_FCNTL_PDB                    30

 /* deprecated names */
 #define SQLITE_GET_LOCKPROXYFILE      SQLITE_FCNTL_GET_LOCKPROXYFILE
@@ -1979,36 +1969,13 @@ struct sqlite3_mem_methods {
 ** be a NULL pointer, in which case the new setting is not reported back.
 ** </dd>
 **
-** <dt>SQLITE_DBCONFIG_MAINDBNAME</dt>
-** <dd> ^This option is used to change the name of the "main" database
-** schema.  ^The sole argument is a pointer to a constant UTF8 string
-** which will become the new schema name in place of "main".  ^SQLite
-** does not make a copy of the new main schema name string, so the application
-** must ensure that the argument passed into this DBCONFIG option is unchanged
-** until after the database connection closes.
-** </dd>
-**
-** <dt>SQLITE_DBCONFIG_NO_CKPT_ON_CLOSE</dt>
-** <dd> Usually, when a database in wal mode is closed or detached from a 
-** database handle, SQLite checks if this will mean that there are now no 
-** connections at all to the database. If so, it performs a checkpoint 
-** operation before closing the connection. This option may be used to
-** override this behaviour. The first parameter passed to this operation
-** is an integer - non-zero to disable checkpoints-on-close, or zero (the
-** default) to enable them. The second parameter is a pointer to an integer
-** into which is written 0 or 1 to indicate whether checkpoints-on-close
-** have been disabled - 0 if they are not disabled, 1 if they are.
-** </dd>
-**
 ** </dl>
 */
-#define SQLITE_DBCONFIG_MAINDBNAME            1000 /* const char* */
 #define SQLITE_DBCONFIG_LOOKASIDE             1001 /* void* int int */
 #define SQLITE_DBCONFIG_ENABLE_FKEY           1002 /* int int* */
 #define SQLITE_DBCONFIG_ENABLE_TRIGGER        1003 /* int int* */
 #define SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER 1004 /* int int* */
 #define SQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION 1005 /* int int* */
-#define SQLITE_DBCONFIG_NO_CKPT_ON_CLOSE      1006 /* int int* */


 /*
@@ -3610,10 +3577,6 @@ SQLITE_API char *sqlite3_expanded_sql(sqlite3_stmt *pStmt);
 ** sqlite3_stmt_readonly() to return true since, while those statements
 ** change the configuration of a database connection, they do not make 
 ** changes to the content of the database files on disk.
-** ^The sqlite3_stmt_readonly() interface returns true for [BEGIN] since
-** [BEGIN] merely sets internal flags, but the [BEGIN|BEGIN IMMEDIATE] and
-** [BEGIN|BEGIN EXCLUSIVE] commands do touch the database and so
-** sqlite3_stmt_readonly() returns false for those commands.
 */
 SQLITE_API int sqlite3_stmt_readonly(sqlite3_stmt *pStmt);

@@ -4078,8 +4041,7 @@ SQLITE_API const void *sqlite3_column_decltype16(sqlite3_stmt*,int);
 ** other than [SQLITE_ROW] before any subsequent invocation of
 ** sqlite3_step().  Failure to reset the prepared statement using 
 ** [sqlite3_reset()] would result in an [SQLITE_MISUSE] return from
-** sqlite3_step().  But after [version 3.6.23.1] ([dateof:3.6.23.1],
-** sqlite3_step() began
+** sqlite3_step().  But after version 3.6.23.1, sqlite3_step() began
 ** calling [sqlite3_reset()] automatically in this circumstance rather
 ** than returning [SQLITE_MISUSE].  This is not considered a compatibility
 ** break because any application that ever receives an SQLITE_MISUSE error
@@ -5442,8 +5404,7 @@ SQLITE_API void *sqlite3_update_hook(
 ** and disabled if the argument is false.)^
 **
 ** ^Cache sharing is enabled and disabled for an entire process.
-** This is a change as of SQLite [version 3.5.0] ([dateof:3.5.0]). 
-** In prior versions of SQLite,
+** This is a change as of SQLite version 3.5.0. In prior versions of SQLite,
 ** sharing was enabled or disabled for each thread separately.
 **
 ** ^(The cache sharing mode set by this interface effects all subsequent
@@ -5537,8 +5498,7 @@ SQLITE_API int sqlite3_db_release_memory(sqlite3*);
 **      from the heap.
 ** </ul>)^
 **
-** Beginning with SQLite [version 3.7.3] ([dateof:3.7.3]), 
-** the soft heap limit is enforced
+** Beginning with SQLite version 3.7.3, the soft heap limit is enforced
 ** regardless of whether or not the [SQLITE_ENABLE_MEMORY_MANAGEMENT]
 ** compile-time option is invoked.  With [SQLITE_ENABLE_MEMORY_MANAGEMENT],
 ** the soft heap limit is enforced on every memory allocation.  Without
@@ -5932,15 +5892,13 @@ struct sqlite3_module {
 ** the xUpdate method are automatically rolled back by SQLite.
 **
 ** IMPORTANT: The estimatedRows field was added to the sqlite3_index_info
-** structure for SQLite [version 3.8.2] ([dateof:3.8.2]). 
-** If a virtual table extension is
+** structure for SQLite version 3.8.2. If a virtual table extension is
 ** used with an SQLite version earlier than 3.8.2, the results of attempting 
 ** to read or write the estimatedRows field are undefined (but are likely 
 ** to included crashing the application). The estimatedRows field should
 ** therefore only be used if [sqlite3_libversion_number()] returns a
 ** value greater than or equal to 3008002. Similarly, the idxFlags field
-** was added for [version 3.9.0] ([dateof:3.9.0]). 
-** It may therefore only be used if
+** was added for version 3.9.0. It may therefore only be used if
 ** sqlite3_libversion_number() returns a value greater than or equal to
 ** 3009000.
 */
@@ -6638,7 +6596,7 @@ SQLITE_API int sqlite3_mutex_notheld(sqlite3_mutex*);
 #define SQLITE_MUTEX_STATIC_MEM       3  /* sqlite3_malloc() */
 #define SQLITE_MUTEX_STATIC_MEM2      4  /* NOT USED */
 #define SQLITE_MUTEX_STATIC_OPEN      4  /* sqlite3BtreeOpen() */
-#define SQLITE_MUTEX_STATIC_PRNG      5  /* sqlite3_randomness() */
+#define SQLITE_MUTEX_STATIC_PRNG      5  /* sqlite3_random() */
 #define SQLITE_MUTEX_STATIC_LRU       6  /* lru page list */
 #define SQLITE_MUTEX_STATIC_LRU2      7  /* NOT USED */
 #define SQLITE_MUTEX_STATIC_PMEM      7  /* sqlite3PageMalloc() */
@@ -6742,7 +6700,6 @@ SQLITE_API int sqlite3_test_control(int op, ...);
 #define SQLITE_TESTCTRL_SCRATCHMALLOC           17
 #define SQLITE_TESTCTRL_LOCALTIME_FAULT         18
 #define SQLITE_TESTCTRL_EXPLAIN_STMT            19  /* NOT USED */
-#define SQLITE_TESTCTRL_ONCE_RESET_THRESHOLD    19
 #define SQLITE_TESTCTRL_NEVER_CORRUPT           20
 #define SQLITE_TESTCTRL_VDBE_COVERAGE           21
 #define SQLITE_TESTCTRL_BYTEORDER               22
@@ -8229,8 +8186,7 @@ SQLITE_API int sqlite3_db_cacheflush(sqlite3*);
 **
 ** See also:  [sqlite3_update_hook()]
 */
-#if defined(SQLITE_ENABLE_PREUPDATE_HOOK)
-SQLITE_API void *sqlite3_preupdate_hook(
+SQLITE_API SQLITE_EXPERIMENTAL void *sqlite3_preupdate_hook(
  sqlite3 *db,
  void(*xPreUpdate)(
    void *pCtx,                   /* Copy of third arg to preupdate_hook() */
@@ -8243,11 +8199,10 @@ SQLITE_API void *sqlite3_preupdate_hook(
  ),
  void*
 );
-SQLITE_API int sqlite3_preupdate_old(sqlite3 *, int, sqlite3_value **);
-SQLITE_API int sqlite3_preupdate_count(sqlite3 *);
-SQLITE_API int sqlite3_preupdate_depth(sqlite3 *);
-SQLITE_API int sqlite3_preupdate_new(sqlite3 *, int, sqlite3_value **);
-#endif
+SQLITE_API SQLITE_EXPERIMENTAL int sqlite3_preupdate_old(sqlite3 *, int, sqlite3_value **);
+SQLITE_API SQLITE_EXPERIMENTAL int sqlite3_preupdate_count(sqlite3 *);
+SQLITE_API SQLITE_EXPERIMENTAL int sqlite3_preupdate_depth(sqlite3 *);
+SQLITE_API SQLITE_EXPERIMENTAL int sqlite3_preupdate_new(sqlite3 *, int, sqlite3_value **);

 /*
 ** CAPI3REF: Low-level system error code
@@ -8263,7 +8218,7 @@ SQLITE_API int sqlite3_system_errno(sqlite3*);

 /*
 ** CAPI3REF: Database Snapshot
-** KEYWORDS: {snapshot} {sqlite3_snapshot}
+** KEYWORDS: {snapshot}
 ** EXPERIMENTAL
 **
 ** An instance of the snapshot object records the state of a [WAL mode]
@@ -8287,9 +8242,7 @@ SQLITE_API int sqlite3_system_errno(sqlite3*);
 ** to an historical snapshot (if possible).  The destructor for 
 ** sqlite3_snapshot objects is [sqlite3_snapshot_free()].
 */
-typedef struct sqlite3_snapshot {
-  unsigned char hidden[48];
-} sqlite3_snapshot;
+typedef struct sqlite3_snapshot sqlite3_snapshot;

 /*
 ** CAPI3REF: Record A Database Snapshot
@@ -8300,32 +8253,9 @@ typedef struct sqlite3_snapshot {
 ** schema S in database connection D.  ^On success, the
 ** [sqlite3_snapshot_get(D,S,P)] interface writes a pointer to the newly
 ** created [sqlite3_snapshot] object into *P and returns SQLITE_OK.
-** If there is not already a read-transaction open on schema S when
-** this function is called, one is opened automatically. 
-**
-** The following must be true for this function to succeed. If any of
-** the following statements are false when sqlite3_snapshot_get() is
-** called, SQLITE_ERROR is returned. The final value of *P is undefined
-** in this case. 
-**
-** <ul>
-**   <li> The database handle must be in [autocommit mode].
-**
-**   <li> Schema S of [database connection] D must be a [WAL mode] database.
-**
-**   <li> There must not be a write transaction open on schema S of database
-**        connection D.
-**
-**   <li> One or more transactions must have been written to the current wal
-**        file since it was created on disk (by any connection). This means
-**        that a snapshot cannot be taken on a wal mode database with no wal 
-**        file immediately after it is first opened. At least one transaction
-**        must be written to it first.
-** </ul>
-**
-** This function may also return SQLITE_NOMEM.  If it is called with the
-** database handle in autocommit mode but fails for some other reason, 
-** whether or not a read transaction is opened on schema S is undefined.
+** ^If schema S of [database connection] D is not a [WAL mode] database
+** that is in a read transaction, then [sqlite3_snapshot_get(D,S,P)]
+** leaves the *P value unchanged and returns an appropriate [error code].
 **
 ** The [sqlite3_snapshot] object returned from a successful call to
 ** [sqlite3_snapshot_get()] must be freed using [sqlite3_snapshot_free()]
@@ -8418,28 +8348,6 @@ SQLITE_API SQLITE_EXPERIMENTAL int sqlite3_snapshot_cmp(
  sqlite3_snapshot *p2
 );

-/*
-** CAPI3REF: Recover snapshots from a wal file
-** EXPERIMENTAL
-**
-** If all connections disconnect from a database file but do not perform
-** a checkpoint, the existing wal file is opened along with the database
-** file the next time the database is opened. At this point it is only
-** possible to successfully call sqlite3_snapshot_open() to open the most
-** recent snapshot of the database (the one at the head of the wal file),
-** even though the wal file may contain other valid snapshots for which
-** clients have sqlite3_snapshot handles.
-**
-** This function attempts to scan the wal file associated with database zDb
-** of database handle db and make all valid snapshots available to
-** sqlite3_snapshot_open(). It is an error if there is already a read
-** transaction open on the database, or if the database is not a wal mode
-** database.
-**
-** SQLITE_OK is returned if successful, or an SQLite error code otherwise.
-*/
-SQLITE_API SQLITE_EXPERIMENTAL int sqlite3_snapshot_recover(sqlite3 *db, const char *zDb);
-
 /*
 ** Undo the hack that converts floating point types to integer for
 ** builds on processors without floating point support.
@@ -8731,7 +8639,7 @@ int sqlite3session_attach(
 ** CAPI3REF: Set a table filter on a Session Object.
 **
 ** The second argument (xFilter) is the "filter callback". For changes to rows 
-** in tables that are not attached to the Session object, the filter is called
+** in tables that are not attached to the Session oject, the filter is called
 ** to determine whether changes to the table's rows should be tracked or not. 
 ** If xFilter returns 0, changes is not tracked. Note that once a table is 
 ** attached, xFilter will not be called again.
@@ -8997,7 +8905,7 @@ int sqlite3session_isempty(sqlite3_session *pSession);
 ** [sqlite3changeset_invert()] functions, all changes within the changeset 
 ** that apply to a single table are grouped together. This means that when 
 ** an application iterates through a changeset using an iterator created by 
-** this function, all changes that relate to a single table are visited 
+** this function, all changes that relate to a single table are visted 
 ** consecutively. There is no chance that the iterator will visit a change 
 ** the applies to table X, then one for table Y, and then later on visit 
 ** another change for table X.
@@ -9084,7 +8992,7 @@ int sqlite3changeset_op(
 ** 0x01 if the corresponding column is part of the tables primary key, or
 ** 0x00 if it is not.
 **
-** If argument pnCol is not NULL, then *pnCol is set to the number of columns
+** If argumet pnCol is not NULL, then *pnCol is set to the number of columns
 ** in the table.
 **
 ** If this function is called when the iterator does not point to a valid
@@ -9301,12 +9209,12 @@ int sqlite3changeset_concat(


 /*
-** CAPI3REF: Changegroup Handle
+** Changegroup handle.
 */
 typedef struct sqlite3_changegroup sqlite3_changegroup;

 /*
-** CAPI3REF: Create A New Changegroup Object
+** CAPI3REF: Combine two or more changesets into a single changeset.
 **
 ** An sqlite3_changegroup object is used to combine two or more changesets
 ** (or patchsets) into a single changeset (or patchset). A single changegroup
@@ -9343,8 +9251,6 @@ typedef struct sqlite3_changegroup sqlite3_changegroup;
 int sqlite3changegroup_new(sqlite3_changegroup **pp);

 /*
-** CAPI3REF: Add A Changeset To A Changegroup
-**
 ** Add all changes within the changeset (or patchset) in buffer pData (size
 ** nData bytes) to the changegroup. 
 **
@@ -9359,7 +9265,7 @@ int sqlite3changegroup_new(sqlite3_changegroup **pp);
 ** apply to the same row as a change already present in the changegroup if
 ** the two rows have the same primary key.
 **
-** Changes to rows that do not already appear in the changegroup are
+** Changes to rows that that do not already appear in the changegroup are
 ** simply copied into it. Or, if both the new changeset and the changegroup
 ** contain changes that apply to a single row, the final contents of the
 ** changegroup depends on the type of each change, as follows:
@@ -9420,8 +9326,6 @@ int sqlite3changegroup_new(sqlite3_changegroup **pp);
 int sqlite3changegroup_add(sqlite3_changegroup*, int nData, void *pData);

 /*
-** CAPI3REF: Obtain A Composite Changeset From A Changegroup
-**
 ** Obtain a buffer containing a changeset (or patchset) representing the
 ** current contents of the changegroup. If the inputs to the changegroup
 ** were themselves changesets, the output is a changeset. Or, if the
@@ -9450,7 +9354,7 @@ int sqlite3changegroup_output(
 );

 /*
-** CAPI3REF: Delete A Changegroup Object
+** Delete a changegroup object.
 */
 void sqlite3changegroup_delete(sqlite3_changegroup*);

@@ -1,8 +1,6 @@
 project(cmd)
 set(CMAKE_AUTOMOC TRUE)

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
-
 set(cmd_NAME ${APPLICATION_EXECUTABLE}cmd)
 set(cmd_SRC
    cmd.cpp
@@ -121,7 +121,7 @@ QString queryPassword(const QString &user)
 class HttpCredentialsText : public HttpCredentials {
 public:
    HttpCredentialsText(const QString& user, const QString& password)
-        : HttpCredentials(user, password), // FIXME: not working with client certs yet (qknight)
+        : HttpCredentials(user, password, "", ""), // FIXME: not working with client certs yet (qknight)
          _sslTrusted(false)
    {}

@@ -507,7 +507,7 @@ restart_sync:

    app.exec();

-    if (engine.isAnotherSyncNeeded() != NoFollowUpSync) {
+    if (engine.isAnotherSyncNeeded()) {
        if (restartCount < options.restartTimes) {
            restartCount++;
            qDebug() << "Restarting Sync, because another sync is needed" << restartCount;
@@ -3,8 +3,6 @@ set(CMAKE_AUTOMOC TRUE)

 add_subdirectory(updater)

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
-
 #TODO Move resources files
 qt_add_resources(MIRALL_RC_SRC ../../client.qrc)
 if ( IS_DIRECTORY ${OEM_THEME_DIR} )
@@ -153,6 +151,7 @@ set(3rdparty_SRC
    ../3rdparty/qtsingleapplication/qtlocalpeer.cpp
    ../3rdparty/qtsingleapplication/qtsingleapplication.cpp
    ../3rdparty/qtsingleapplication/qtsinglecoreapplication.cpp
+    ../3rdparty/certificates/p12topem.cpp
   )

 if (APPLE)
@@ -214,17 +214,6 @@ AccountPtr AccountManager::loadAccountHelper(QSettings& settings)
    auto acc = createAccount();

    QString authType = settings.value(QLatin1String(authTypeC)).toString();
-
-    // There was an account-type saving bug when 'skip folder config' was used
-    // See #5408. This attempts to fix up the "dummy" authType
-    if (authType == QLatin1String("dummy")) {
-        if (settings.contains(QLatin1String("http_user"))) {
-            authType = "http";
-        } else if (settings.contains(QLatin1String("shibboleth_shib_user"))) {
-            authType = "shibboleth";
-        }
-    }
-
    QString overrideUrl = Theme::instance()->overrideServerUrl();
    QString forceAuth = Theme::instance()->forceConfigAuthType();
    if(!forceAuth.isEmpty() && !overrideUrl.isEmpty() ) {
@@ -235,9 +224,6 @@ AccountPtr AccountManager::loadAccountHelper(QSettings& settings)
    } else {
        acc->setUrl(urlConfig.toUrl());
    }
-
-    qDebug() << "Account for" << acc->url() << "using auth type" << authType;
-
    acc->_serverVersion = settings.value(QLatin1String(serverVersionC)).toString();

    // We want to only restore settings for that auth type and the user value
@@ -251,7 +237,7 @@ AccountPtr AccountManager::loadAccountHelper(QSettings& settings)

    acc->setCredentials(CredentialsFactory::create(authType));

-    // now the server cert, it is in the general group
+    // now the cert, it is in the general group
    settings.beginGroup(QLatin1String("General"));
    acc->setApprovedCerts(QSslCertificate::fromData(settings.value(caCertsKeyC).toByteArray()));
    settings.endGroup();
@@ -10,7 +10,7 @@
    <x>0</x>
    <y>0</y>
    <width>462</width>
-    <height>188</height>
+    <height>186</height>
   </rect>
  </property>
  <property name="windowTitle">
@@ -32,7 +32,7 @@
     <item row="0" column="0">
      <widget class="QLabel" name="labelCertificateFile">
       <property name="text">
-        <string>Certificate &amp; Key (pkcs12) :</string>
+        <string>Certificate :</string>
       </property>
      </widget>
     </item>
@@ -27,7 +27,7 @@ class HttpCredentialsGui : public HttpCredentials {
    Q_OBJECT
 public:
    explicit HttpCredentialsGui() : HttpCredentials() {}
-    HttpCredentialsGui(const QString& user, const QString& password, const QSslCertificate& certificate, const QSslKey& key) : HttpCredentials(user, password, certificate, key) {}
+    HttpCredentialsGui(const QString& user, const QString& password, const QString& certificatePath, const QString& certificatePasswd) : HttpCredentials(user, password, certificatePath, certificatePasswd) {}
    void askFromUser() Q_DECL_OVERRIDE;
    Q_INVOKABLE void askFromUserAsync();

@@ -46,6 +46,8 @@

 namespace OCC {

+const char oldJournalPath[] = ".csync_journal.db";
+
 Folder::Folder(const FolderDefinition& definition,
               AccountState* accountState,
               QObject* parent)
@@ -821,7 +823,7 @@ void Folder::slotSyncFinished(bool success)
    _fileLog->finish();
    bubbleUpSyncResult();

-    auto anotherSyncNeeded = _engine->isAnotherSyncNeeded();
+    bool anotherSyncNeeded = _engine->isAnotherSyncNeeded();

    if (_csyncError) {
        _syncResult.setStatus(SyncResult::Error);
@@ -872,7 +874,7 @@ void Folder::slotSyncFinished(bool success)
    _timeSinceLastSyncDone.restart();

    // Increment the follow-up sync counter if necessary.
-    if (anotherSyncNeeded == ImmediateFollowUp) {
+    if (anotherSyncNeeded) {
        _consecutiveFollowUpSyncs++;
        qDebug() << "another sync was requested by the finished sync, this has"
                 << "happened" << _consecutiveFollowUpSyncs << "times";
@@ -881,7 +883,7 @@ void Folder::slotSyncFinished(bool success)
    }

    // Maybe force a follow-up sync to take place, but only a couple of times.
-    if (anotherSyncNeeded == ImmediateFollowUp && _consecutiveFollowUpSyncs <= 3)
+    if (anotherSyncNeeded && _consecutiveFollowUpSyncs <= 3)
    {
        // Sometimes another sync is requested because a local file is still
        // changing, so wait at least a small amount of time before syncing
@@ -115,7 +115,7 @@ void FolderMan::unloadFolder( Folder *f )
    disconnect(f, SIGNAL(syncPausedChanged(Folder*,bool)),
               this, SLOT(slotFolderSyncPaused(Folder*,bool)));
    disconnect(&f->syncEngine().syncFileStatusTracker(), SIGNAL(fileStatusChanged(const QString &, SyncFileStatus)),
-               _socketApi.data(), SLOT(broadcastStatusPushMessage(const QString &, SyncFileStatus)));
+               _socketApi.data(), SLOT(slotFileStatusChanged(const QString &, SyncFileStatus)));
    disconnect(f, SIGNAL(watchedFileChangedExternally(QString)),
               &f->syncEngine().syncFileStatusTracker(), SLOT(slotPathTouched(QString)));
 }
@@ -148,7 +148,6 @@ int FolderMan::unloadAndDeleteAllFolders()
 void FolderMan::registerFolderMonitor( Folder *folder )
 {
    if( !folder ) return;
-    if( !QDir(folder->path()).exists() ) return;

    if( !_folderWatchers.contains(folder->alias() ) ) {
        FolderWatcher *fw = new FolderWatcher(folder->path(), folder);
@@ -731,10 +730,6 @@ void FolderMan::slotStartScheduledFolderSync()

    // Start syncing this folder!
    if( folder ) {
-        // Safe to call several times, and necessary to try again if
-        // the folder path didn't exist previously.
-        registerFolderMonitor(folder);
-
        _currentSyncFolder = folder;
        folder->startSync( QStringList() );
    }
@@ -838,20 +833,18 @@ void FolderMan::slotScheduleFolderByTime()
            continue;
        }

-        // Retry a couple of times after failure; or regularly if requested
-        bool syncAgain =
-                (f->consecutiveFailingSyncs() > 0 && f->consecutiveFailingSyncs() < 3)
-                || f->syncEngine().isAnotherSyncNeeded() == DelayedFollowUp;
-        qint64 syncAgainDelay = 10 * 1000; // 10s for the first retry-after-fail
+        // Retry a couple of times after failure
+        bool syncAgainAfterFail = f->consecutiveFailingSyncs() > 0 && f->consecutiveFailingSyncs() < 3;
+        qint64 syncAgainAfterFailDelay = 10 * 1000; // 10s for the first retry-after-fail
        if (f->consecutiveFailingSyncs() > 1)
-            syncAgainDelay = 60 * 1000; // 60s for each further attempt
-        if (syncAgain
-                && msecsSinceSync > syncAgainDelay) {
+            syncAgainAfterFailDelay = 60 * 1000; // 60s for each further attempt
+        if (syncAgainAfterFail
+                && msecsSinceSync > syncAgainAfterFailDelay) {
            qDebug() << "** scheduling folder" << f->alias()
-                     << ", the last" << f->consecutiveFailingSyncs() << "syncs failed"
-                     << ", anotherSyncNeeded" << f->syncEngine().isAnotherSyncNeeded()
-                     << ", last status:" << f->syncResult().statusString()
-                     << ", time since last sync:" << msecsSinceSync;
+                     << "because the last"
+                     << f->consecutiveFailingSyncs() << "syncs failed, last status:"
+                     << f->syncResult().statusString()
+                     << "time since last sync:" << msecsSinceSync;

            scheduleFolder(f);
            continue;
@@ -938,7 +931,7 @@ Folder* FolderMan::addFolderInternal(FolderDefinition folderDefinition,
    connect(folder, SIGNAL(syncPausedChanged(Folder*,bool)), SLOT(slotFolderSyncPaused(Folder*,bool)));
    connect(folder, SIGNAL(canSyncChanged()), SLOT(slotFolderCanSyncChanged()));
    connect(&folder->syncEngine().syncFileStatusTracker(), SIGNAL(fileStatusChanged(const QString &, SyncFileStatus)),
-            _socketApi.data(), SLOT(broadcastStatusPushMessage(const QString &, SyncFileStatus)));
+            _socketApi.data(), SLOT(slotFileStatusChanged(const QString &, SyncFileStatus)));
    connect(folder, SIGNAL(watchedFileChangedExternally(QString)),
            &folder->syncEngine().syncFileStatusTracker(), SLOT(slotPathTouched(QString)));

@@ -110,8 +110,7 @@ void GeneralSettings::loadMiscSettings()

 void GeneralSettings::slotUpdateInfo()
 {
-    // Note: the sparkle-updater is not an OCUpdater
-    OCUpdater *updater = qobject_cast<OCUpdater*>(Updater::instance());
+    OCUpdater *updater = dynamic_cast<OCUpdater*>(Updater::instance());
    if (ConfigFile().skipUpdateCheck()) {
        updater = 0; // don't show update info if updates are disabled
    }
@@ -107,8 +107,7 @@ int main(int argc, char **argv)
    // if handleStartup returns true, main()
    // needs to terminate here, e.g. because
    // the updater is triggered
-    Updater *updater = Updater::instance();
-    if ( updater && updater->handleStartup()) {
+    if (Updater::instance()->handleStartup()) {
        return true;
    }

@@ -207,15 +207,10 @@ void OwncloudSetupWizard::slotNoOwnCloudFoundAuth(QNetworkReply *reply)
    QString contentType = reply->header(QNetworkRequest::ContentTypeHeader).toString();

    // Do this early because reply might be deleted in message box event loop
-    QString msg;
-    if (!_ocWizard->account()->url().isValid()) {
-        msg = tr("Invalid URL");
-    } else {
-        msg = tr("Failed to connect to %1 at %2:<br/>%3")
+    QString msg = tr("Failed to connect to %1 at %2:<br/>%3")
            .arg(Theme::instance()->appNameGUI(),
                 reply->url().toString(),
                 reply->errorString());
-    }
    bool isDowngradeAdvised = checkDowngradeAdvised(reply);

    // If a client cert is needed, nginx sends:
@@ -558,13 +553,6 @@ void OwncloudSetupWizard::slotSkipFolderConfiguration()
 AccountState *OwncloudSetupWizard::applyAccountChanges()
 {
    AccountPtr newAccount = _ocWizard->account();
-
-    // Detach the account that is going to be saved from the
-    // wizard to ensure it doesn't accidentally get modified
-    // later (such as from running cleanup such as
-    // AbstractCredentialsWizardPage::cleanupPage())
-    _ocWizard->setAccount(AccountManager::createAccount());
-
    auto manager = AccountManager::instance();

    auto newState = manager->addAccount(newAccount);
@@ -229,7 +229,7 @@ void ShareLinkWidget::slotSharesFetched(const QList<QSharedPointer<Share>> &shar
    Q_FOREACH(auto share, shares) {

        if (share->getShareType() == Share::TypeLink) {
-            _share = qSharedPointerObjectCast<LinkShare>(share);
+            _share = qSharedPointerDynamicCast<LinkShare>(share);
            _ui->pushButton_copy->show();
            _ui->pushButton_mail->show();

@@ -32,10 +32,8 @@
 #include "account.h"
 #include "capabilities.h"

-#include <QBitArray>
 #include <QDebug>
 #include <QUrl>
-#include <QMetaMethod>
 #include <QMetaObject>
 #include <QStringList>
 #include <QScopedPointer>
@@ -58,11 +56,6 @@
 // The second number should be changed when there are new features.
 #define MIRALL_SOCKET_API_VERSION "1.0"

-#define DEBUG qDebug() << "SocketApi: "
-
-Q_DECLARE_METATYPE(OCC::SocketListener)
-
-
 static inline QString removeTrailingSlash(QString path)
 {
    Q_ASSERT(path.endsWith(QLatin1Char('/')));
@@ -70,89 +63,9 @@ static inline QString removeTrailingSlash(QString path)
    return path;
 }

-static QString buildMessage(const QString& verb, const QString &path, const QString &status = QString::null )
-{
-    QString msg(verb);
-
-    if( !status.isEmpty() ) {
-        msg.append(QLatin1Char(':'));
-        msg.append(status);
-    }
-    if( !path.isEmpty() ) {
-        msg.append(QLatin1Char(':'));
-        QFileInfo fi(path);
-        msg.append(QDir::toNativeSeparators(fi.absoluteFilePath()));
-    }
-    return msg;
-}
-
 namespace OCC {

-class BloomFilter {
-    // Initialize with m=1024 bits and k=2 (high and low 16 bits of a qHash).
-    // For a client navigating in less than 100 directories, this gives us a probability less than (1-e^(-2*100/1024))^2 = 0.03147872136 false positives.
-    const static int NumBits = 1024;
-
-public:
-    BloomFilter() : hashBits(NumBits) { }
-
-    void storeHash(uint hash) {
-        hashBits.setBit((hash & 0xFFFF) % NumBits);
-        hashBits.setBit((hash >> 16) % NumBits);
-    }
-    bool isHashMaybeStored(uint hash) const {
-        return hashBits.testBit((hash & 0xFFFF) % NumBits)
-            && hashBits.testBit((hash >> 16) % NumBits);
-    }
-
-private:
-    QBitArray hashBits;
-};
-
-class SocketListener {
-public:
-    QIODevice* socket;
-
-    SocketListener(QIODevice* socket = nullptr) : socket(socket) { }
-
-    void sendMessage(const QString& message, bool doWait = false) const
-    {
-        DEBUG << "Sending message: " << message;
-        QString localMessage = message;
-        if( ! localMessage.endsWith(QLatin1Char('\n'))) {
-            localMessage.append(QLatin1Char('\n'));
-        }
-
-        QByteArray bytesToSend = localMessage.toUtf8();
-        qint64 sent = socket->write(bytesToSend);
-        if( doWait ) {
-            socket->waitForBytesWritten(1000);
-        }
-        if( sent != bytesToSend.length() ) {
-            qDebug() << "WARN: Could not send all data on socket for " << localMessage;
-        }
-
-    }
-
-    void sendMessageIfDirectoryMonitored(const QString& message, uint systemDirectoryHash) const
-    {
-        if (_monitoredDirectoriesBloomFilter.isHashMaybeStored(systemDirectoryHash))
-            sendMessage(message, false);
-    }
-
-    void registerMonitoredDirectory(uint systemDirectoryHash)
-    {
-        _monitoredDirectoriesBloomFilter.storeHash(systemDirectoryHash);
-    }
-private:
-    BloomFilter _monitoredDirectoriesBloomFilter;
-};
-
-struct ListenerHasSocketPred {
-    QIODevice *socket;
-    ListenerHasSocketPred(QIODevice *socket) : socket(socket) { }
-    bool operator()(const SocketListener &listener) const { return listener.socket == socket; }
-};
+#define DEBUG qDebug() << "SocketApi: "

 SocketApi::SocketApi(QObject* parent)
    : QObject(parent)
@@ -216,7 +129,7 @@ SocketApi::~SocketApi()
    DEBUG << "dtor";
    _localServer.close();
    // All remaining sockets will be destroyed with _localServer, their parent
-    Q_ASSERT(_listeners.isEmpty() || _listeners.first().socket->parent() == &_localServer);
+    Q_ASSERT(_listeners.isEmpty() || _listeners.first()->parent() == &_localServer);
    _listeners.clear();
 }

@@ -230,16 +143,14 @@ void SocketApi::slotNewConnection()
    DEBUG << "New connection" << socket;
    connect(socket, SIGNAL(readyRead()), this, SLOT(slotReadSocket()));
    connect(socket, SIGNAL(disconnected()), this, SLOT(onLostConnection()));
-    connect(socket, SIGNAL(destroyed(QObject*)), this, SLOT(slotSocketDestroyed(QObject*)));
    Q_ASSERT(socket->readAll().isEmpty());

-    _listeners.append(SocketListener(socket));
-    SocketListener &listener = _listeners.last();
+    _listeners.append(socket);

    foreach( Folder *f, FolderMan::instance()->map() ) {
        if (f->canSync()) {
            QString message = buildRegisterPathMessage(removeTrailingSlash(f->path()));
-            listener.sendMessage(message);
+            sendMessage(socket, message);            
        }
    }
 }
@@ -247,33 +158,32 @@ void SocketApi::slotNewConnection()
 void SocketApi::onLostConnection()
 {
    DEBUG << "Lost connection " << sender();
-    sender()->deleteLater();
+
+    QIODevice* socket = qobject_cast<QIODevice*>(sender());
+    _listeners.removeAll(socket);
+    socket->deleteLater();
 }

-void SocketApi::slotSocketDestroyed(QObject* obj)
-{
-    QIODevice* socket = static_cast<QIODevice*>(obj);
-    _listeners.erase(std::remove_if(_listeners.begin(), _listeners.end(), ListenerHasSocketPred(socket)), _listeners.end());
-}

 void SocketApi::slotReadSocket()
 {
    QIODevice* socket = qobject_cast<QIODevice*>(sender());
    Q_ASSERT(socket);
-    SocketListener *listener = &*std::find_if(_listeners.begin(), _listeners.end(), ListenerHasSocketPred(socket));

    while(socket->canReadLine()) {
        // Make sure to normalize the input from the socket to
        // make sure that the path will match, especially on OS X.
        QString line = QString::fromUtf8(socket->readLine()).normalized(QString::NormalizationForm_C);
        line.chop(1); // remove the '\n'
-        QByteArray command = line.split(":").value(0).toAscii();
-        QByteArray functionWithArguments = "command_" + command + "(QString,SocketListener*)";
-        int indexOfMethod = staticMetaObject.indexOfMethod(functionWithArguments);
+        QString command = line.split(":").value(0);
+        QString function = QString(QLatin1String("command_")).append(command);
+
+        QString functionWithArguments = function + QLatin1String("(QString,QIODevice*)");
+        int indexOfMethod = this->metaObject()->indexOfMethod(functionWithArguments.toAscii());

        QString argument = line.remove(0, command.length()+1);
        if(indexOfMethod != -1) {
-            staticMetaObject.method(indexOfMethod).invoke(this, Q_ARG(QString, argument), Q_ARG(SocketListener*, listener));
+            QMetaObject::invokeMethod(this, function.toAscii(), Q_ARG(QString, argument), Q_ARG(QIODevice*, socket));
        } else {
            DEBUG << "The command is not supported by this version of the client:" << command << "with argument:" << argument;
        }
@@ -289,8 +199,8 @@ void SocketApi::slotRegisterPath( const QString& alias )
    Folder *f = FolderMan::instance()->folder(alias);
    if (f) {
        QString message = buildRegisterPathMessage(removeTrailingSlash(f->path()));
-        foreach (auto &listener, _listeners) {
-            listener.sendMessage(message);
+        foreach(QIODevice *socket, _listeners) {
+            sendMessage(socket, message);
        }
    }

@@ -304,7 +214,7 @@ void SocketApi::slotUnregisterPath( const QString& alias )

    Folder *f = FolderMan::instance()->folder(alias);
    if (f)
-        broadcastMessage(buildMessage(QLatin1String("UNREGISTER_PATH"), removeTrailingSlash(f->path()), QString::null), true);
+        broadcastMessage(QLatin1String("UNREGISTER_PATH"), removeTrailingSlash(f->path()), QString::null, true );

    _registeredAliases.remove(alias);
 }
@@ -325,42 +235,74 @@ void SocketApi::slotUpdateFolderView(Folder *f)
                f->syncResult().status() == SyncResult::SetupError ) {

            QString rootPath = removeTrailingSlash(f->path());
-            broadcastStatusPushMessage(rootPath, f->syncEngine().syncFileStatusTracker().fileStatus(""));
+            broadcastMessage(QLatin1String("STATUS"), rootPath,
+                             f->syncEngine().syncFileStatusTracker().fileStatus("").toSocketAPIString());

-            broadcastMessage(buildMessage(QLatin1String("UPDATE_VIEW"), rootPath));
+            broadcastMessage(QLatin1String("UPDATE_VIEW"), rootPath);
        } else {
            qDebug() << "Not sending UPDATE_VIEW for" << f->alias() << "because status() is" << f->syncResult().status();
        }
    }
 }

-void SocketApi::broadcastMessage(const QString& msg, bool doWait)
+void SocketApi::slotFileStatusChanged(const QString& systemFileName, SyncFileStatus fileStatus)
 {
-    foreach (auto &listener, _listeners) {
-        listener.sendMessage(msg, doWait);
+    broadcastMessage(QLatin1String("STATUS"), systemFileName, fileStatus.toSocketAPIString());
+}
+
+void SocketApi::sendMessage(QIODevice *socket, const QString& message, bool doWait)
+{
+    DEBUG << "Sending message: " << message;
+    QString localMessage = message;
+    if( ! localMessage.endsWith(QLatin1Char('\n'))) {
+        localMessage.append(QLatin1Char('\n'));
+    }
+
+    QByteArray bytesToSend = localMessage.toUtf8();
+    qint64 sent = socket->write(bytesToSend);
+    if( doWait ) {
+        socket->waitForBytesWritten(1000);
+    }
+    if( sent != bytesToSend.length() ) {
+        qDebug() << "WARN: Could not send all data on socket for " << localMessage;
+    }
+
+}
+
+void SocketApi::broadcastMessage( const QString& verb, const QString& path, const QString& status, bool doWait )
+{
+    QString msg(verb);
+
+    if( !status.isEmpty() ) {
+        msg.append(QLatin1Char(':'));
+        msg.append(status);
+    }
+    if( !path.isEmpty() ) {
+        msg.append(QLatin1Char(':'));
+        QFileInfo fi(path);
+        msg.append(QDir::toNativeSeparators(fi.absoluteFilePath()));
+    }
+
+    foreach(QIODevice *socket, _listeners) {
+        sendMessage(socket, msg, doWait);
    }
 }

-void SocketApi::broadcastStatusPushMessage(const QString& systemPath, SyncFileStatus fileStatus)
-{
-    QString msg = buildMessage(QLatin1String("STATUS"), systemPath, fileStatus.toSocketAPIString());
-    Q_ASSERT(!systemPath.endsWith('/'));
-    uint directoryHash = qHash(systemPath.left(systemPath.lastIndexOf('/')));
-    foreach (auto &listener, _listeners) {
-        listener.sendMessageIfDirectoryMonitored(msg, directoryHash);
-    }
-}
-
-void SocketApi::command_RETRIEVE_FOLDER_STATUS(const QString& argument, SocketListener* listener)
+void SocketApi::command_RETRIEVE_FOLDER_STATUS(const QString& argument, QIODevice* socket)
 {
    // This command is the same as RETRIEVE_FILE_STATUS

    //qDebug() << Q_FUNC_INFO << argument;
-    command_RETRIEVE_FILE_STATUS(argument, listener);
+    command_RETRIEVE_FILE_STATUS(argument, socket);
 }

-void SocketApi::command_RETRIEVE_FILE_STATUS(const QString& argument, SocketListener* listener)
+void SocketApi::command_RETRIEVE_FILE_STATUS(const QString& argument, QIODevice* socket)
 {
+    if( !socket ) {
+        qDebug() << "No valid socket object.";
+        return;
+    }
+
    qDebug() << Q_FUNC_INFO << argument;

    QString statusString;
@@ -370,27 +312,27 @@ void SocketApi::command_RETRIEVE_FILE_STATUS(const QString& argument, SocketList
        // this can happen in offline mode e.g.: nothing to worry about
        statusString = QLatin1String("NOP");
    } else {
-        QString systemPath = QDir::cleanPath(argument);
-        if( systemPath.endsWith(QLatin1Char('/')) ) {
-            systemPath.truncate(systemPath.length()-1);
-            qWarning() << "Removed trailing slash for directory: " << systemPath << "Status pushes won't have one.";
+        QString relativePath = QDir::cleanPath(argument).mid(syncFolder->cleanPath().length()+1);
+        if( relativePath.endsWith(QLatin1Char('/')) ) {
+            relativePath.truncate(relativePath.length()-1);
+            qWarning() << "Removed trailing slash for directory: " << relativePath << "Status pushes won't have one.";
        }
-        // The user probably visited this directory in the file shell.
-        // Let the listener know that it should now send status pushes for sibblings of this file.
-        QString directory = systemPath.left(systemPath.lastIndexOf('/'));
-        listener->registerMonitoredDirectory(qHash(directory));
-
-        QString relativePath = systemPath.mid(syncFolder->cleanPath().length()+1);
        SyncFileStatus fileStatus = syncFolder->syncEngine().syncFileStatusTracker().fileStatus(relativePath);
+
        statusString = fileStatus.toSocketAPIString();
    }

    const QString message = QLatin1String("STATUS:") % statusString % QLatin1Char(':') %  QDir::toNativeSeparators(argument);
-    listener->sendMessage(message);
+    sendMessage(socket, message);
 }

-void SocketApi::command_SHARE(const QString& localFile, SocketListener* listener)
+void SocketApi::command_SHARE(const QString& localFile, QIODevice* socket)
 {
+    if (!socket) {
+        qDebug() << Q_FUNC_INFO << "No valid socket object.";
+        return;
+    }
+
    qDebug() << Q_FUNC_INFO << localFile;

    auto theme = Theme::instance();
@@ -399,16 +341,16 @@ void SocketApi::command_SHARE(const QString& localFile, SocketListener* listener
    if (!shareFolder) {
        const QString message = QLatin1String("SHARE:NOP:")+QDir::toNativeSeparators(localFile);
        // files that are not within a sync folder are not synced.
-        listener->sendMessage(message);
+        sendMessage(socket, message);
    } else if (!shareFolder->accountState()->isConnected()) {
        const QString message = QLatin1String("SHARE:NOTCONNECTED:")+QDir::toNativeSeparators(localFile);
        // if the folder isn't connected, don't open the share dialog
-        listener->sendMessage(message);
+        sendMessage(socket, message);
    } else if (!theme->linkSharing() && (
                 !theme->userGroupSharing() ||
                 shareFolder->accountState()->account()->serverVersionInt() < ((8 << 16) + (2 << 8)))) {
        const QString message = QLatin1String("SHARE:NOP:")+QDir::toNativeSeparators(localFile);
-        listener->sendMessage(message);
+        sendMessage(socket, message);
    } else {
        const QString localFileClean = QDir::cleanPath(localFile);
        const QString file = localFileClean.mid(shareFolder->cleanPath().length()+1);
@@ -417,7 +359,7 @@ void SocketApi::command_SHARE(const QString& localFile, SocketListener* listener
        // Verify the file is on the server (to our knowledge of course)
        if (fileStatus.tag() != SyncFileStatus::StatusUpToDate) {
            const QString message = QLatin1String("SHARE:NOTSYNCED:")+QDir::toNativeSeparators(localFile);
-            listener->sendMessage(message);
+            sendMessage(socket, message);
            return;
        }

@@ -426,7 +368,7 @@ void SocketApi::command_SHARE(const QString& localFile, SocketListener* listener
        // Can't share root folder
        if (remotePath == "/") {
            const QString message = QLatin1String("SHARE:CANNOTSHAREROOT:")+QDir::toNativeSeparators(localFile);
-            listener->sendMessage(message);
+            sendMessage(socket, message);
            return;
        }

@@ -440,26 +382,31 @@ void SocketApi::command_SHARE(const QString& localFile, SocketListener* listener
            }
        }
        const QString message = QLatin1String("SHARE:OK:")+QDir::toNativeSeparators(localFile);
-        listener->sendMessage(message);
+        sendMessage(socket, message);

        emit shareCommandReceived(remotePath, localFileClean, allowReshare);
    }
 }

-void SocketApi::command_VERSION(const QString&, SocketListener* listener)
+void SocketApi::command_VERSION(const QString&, QIODevice* socket)
 {
-    listener->sendMessage(QLatin1String("VERSION:" MIRALL_VERSION_STRING ":" MIRALL_SOCKET_API_VERSION));
+    sendMessage(socket, QLatin1String("VERSION:" MIRALL_VERSION_STRING ":" MIRALL_SOCKET_API_VERSION));
 }

-void SocketApi::command_SHARE_STATUS(const QString &localFile, SocketListener* listener)
+void SocketApi::command_SHARE_STATUS(const QString &localFile, QIODevice *socket)
 {
+    if (!socket) {
+        qDebug() << Q_FUNC_INFO << "No valid socket object.";
+        return;
+    }
+
    qDebug() << Q_FUNC_INFO << localFile;

    Folder *shareFolder = FolderMan::instance()->folderForPath(localFile);

    if (!shareFolder) {
        const QString message = QLatin1String("SHARE_STATUS:NOP:")+QDir::toNativeSeparators(localFile);
-        listener->sendMessage(message);
+        sendMessage(socket, message);
    } else {
        const QString file = QDir::cleanPath(localFile).mid(shareFolder->cleanPath().length()+1);
        SyncFileStatus fileStatus = shareFolder->syncEngine().syncFileStatusTracker().fileStatus(file);
@@ -467,7 +414,7 @@ void SocketApi::command_SHARE_STATUS(const QString &localFile, SocketListener* l
        // Verify the file is on the server (to our knowledge of course)
        if (fileStatus.tag() != SyncFileStatus::StatusUpToDate) {
            const QString message = QLatin1String("SHARE_STATUS:NOTSYNCED:")+QDir::toNativeSeparators(localFile);
-            listener->sendMessage(message);
+            sendMessage(socket, message);
            return;
        }

@@ -475,7 +422,7 @@ void SocketApi::command_SHARE_STATUS(const QString &localFile, SocketListener* l

        if (!capabilities.shareAPI()) {
            const QString message = QLatin1String("SHARE_STATUS:DISABLED:")+QDir::toNativeSeparators(localFile);
-            listener->sendMessage(message);
+            sendMessage(socket, message);
        } else {
            auto theme = Theme::instance();
            QString available;
@@ -494,18 +441,18 @@ void SocketApi::command_SHARE_STATUS(const QString &localFile, SocketListener* l

            if (available.isEmpty()) {
                const QString message = QLatin1String("SHARE_STATUS:DISABLED") + ":" + QDir::toNativeSeparators(localFile);
-                listener->sendMessage(message);
+                sendMessage(socket, message);
            } else {
                const QString message = QLatin1String("SHARE_STATUS:") + available + ":" + QDir::toNativeSeparators(localFile);
-                listener->sendMessage(message);
+                sendMessage(socket, message);
            }
        }
    }
 }

-void SocketApi::command_SHARE_MENU_TITLE(const QString &, SocketListener* listener)
+void SocketApi::command_SHARE_MENU_TITLE(const QString &, QIODevice* socket)
 {
-    listener->sendMessage(QLatin1String("SHARE_MENU_TITLE:") + tr("Share with %1", "parameter is ownCloud").arg(Theme::instance()->appNameGUI()));
+    sendMessage(socket, QLatin1String("SHARE_MENU_TITLE:") + tr("Share with %1", "parameter is ownCloud").arg(Theme::instance()->appNameGUI()));
 }

 QString SocketApi::buildRegisterPathMessage(const QString& path)
@@ -35,7 +35,6 @@ namespace OCC {

 class SyncFileStatus;
 class Folder;
-class SocketListener;

 /**
 * @brief The SocketApi class
@@ -61,25 +60,25 @@ signals:
 private slots:
    void slotNewConnection();
    void onLostConnection();
-    void slotSocketDestroyed(QObject* obj);
    void slotReadSocket();
-    void broadcastStatusPushMessage(const QString& systemPath, SyncFileStatus fileStatus);
+    void slotFileStatusChanged(const QString& systemFileName, SyncFileStatus fileStatus);

 private:
-    void broadcastMessage(const QString& msg, bool doWait = false);
+    void sendMessage(QIODevice* socket, const QString& message, bool doWait = false);
+    void broadcastMessage(const QString& verb, const QString &path, const QString &status = QString::null, bool doWait = false);

-    Q_INVOKABLE void command_RETRIEVE_FOLDER_STATUS(const QString& argument, SocketListener* listener);
-    Q_INVOKABLE void command_RETRIEVE_FILE_STATUS(const QString& argument, SocketListener* listener);
-    Q_INVOKABLE void command_SHARE(const QString& localFile, SocketListener* listener);
+    Q_INVOKABLE void command_RETRIEVE_FOLDER_STATUS(const QString& argument, QIODevice* socket);
+    Q_INVOKABLE void command_RETRIEVE_FILE_STATUS(const QString& argument, QIODevice* socket);
+    Q_INVOKABLE void command_SHARE(const QString& localFile, QIODevice* socket);

-    Q_INVOKABLE void command_VERSION(const QString& argument, SocketListener* listener);
+    Q_INVOKABLE void command_VERSION(const QString& argument, QIODevice* socket);

-    Q_INVOKABLE void command_SHARE_STATUS(const QString& localFile, SocketListener* listener);
-    Q_INVOKABLE void command_SHARE_MENU_TITLE(const QString& argument, SocketListener* listener);
+    Q_INVOKABLE void command_SHARE_STATUS(const QString& localFile, QIODevice *socket);
+    Q_INVOKABLE void command_SHARE_MENU_TITLE(const QString& argument, QIODevice* socket);
    QString buildRegisterPathMessage(const QString& path);

    QSet<QString> _registeredAliases;
-    QList<SocketListener> _listeners;
+    QList<QIODevice*> _listeners;
    SocketApiServer _localServer;
 };

@@ -19,7 +19,6 @@

 #include "updater/ocupdater.h"

-#include <QObject>
 #include <QtCore>
 #include <QtNetwork>
 #include <QtGui>
@@ -44,8 +43,9 @@ UpdaterScheduler::UpdaterScheduler(QObject *parent) :
    connect( &_updateCheckTimer, SIGNAL(timeout()),
             this, SLOT(slotTimerFired()) );

-    // Note: the sparkle-updater is not an OCUpdater
-    if (OCUpdater *updater = qobject_cast<OCUpdater*>(Updater::instance())) {
+    // Note: the sparkle-updater is not an OCUpdater and thus the dynamic_cast
+    // returns NULL. Clever detail.
+    if (OCUpdater *updater = dynamic_cast<OCUpdater*>(Updater::instance())) {
        connect(updater,  SIGNAL(newUpdateAvailable(QString,QString)),
                this,     SIGNAL(updaterAnnouncement(QString,QString)) );
        connect(updater, SIGNAL(requestRestart()), SIGNAL(requestRestart()));
@@ -76,17 +76,14 @@ void UpdaterScheduler::slotTimerFired()
        return;
    }

-    Updater *updater = Updater::instance();
-    if (updater) {
-        updater->backgroundCheckForUpdate();
-    }
+    Updater::instance()->backgroundCheckForUpdate();
 }


 /* ----------------------------------------------------------------- */

-OCUpdater::OCUpdater(const QUrl &url) :
-    Updater()
+OCUpdater::OCUpdater(const QUrl &url, QObject *parent) :
+    QObject(parent)
  , _updateUrl(url)
  , _state(Unknown)
  , _accessManager(new AccessManager(this))
@@ -245,8 +242,8 @@ void OCUpdater::slotTimedOut()

 ////////////////////////////////////////////////////////////////////////

-NSISUpdater::NSISUpdater(const QUrl &url)
-    : OCUpdater(url)
+NSISUpdater::NSISUpdater(const QUrl &url, QObject *parent)
+    : OCUpdater(url, parent)
    , _showFallbackMessage(false)
 {
 }
@@ -424,8 +421,8 @@ void NSISUpdater::slotSetSeenVersion()

 ////////////////////////////////////////////////////////////////////////

-PassiveUpdateNotifier::PassiveUpdateNotifier(const QUrl &url)
-    : OCUpdater(url)
+PassiveUpdateNotifier::PassiveUpdateNotifier(const QUrl &url, QObject *parent)
+    : OCUpdater(url, parent)
 {
    // remember the version of the currently running binary. On Linux it might happen that the
    // package management updates the package while the app is running. This is detected in the
@@ -86,7 +86,7 @@ private:
 * @brief Class that uses an ownCloud proprietary XML format to fetch update information
 * @ingroup gui
 */
-class OCUpdater : public Updater
+class OCUpdater : public QObject, public Updater
 {
    Q_OBJECT
 public:
@@ -94,7 +94,7 @@ public:
                         Downloading, DownloadComplete,
                         DownloadFailed, DownloadTimedOut,
                         UpdateOnlyAvailableThroughSystem };
-    explicit OCUpdater(const QUrl &url);
+    explicit OCUpdater(const QUrl &url, QObject *parent = 0);

    bool performUpdate();

@@ -141,7 +141,7 @@ class NSISUpdater : public OCUpdater {
    Q_OBJECT
 public:
    enum UpdateState { NoUpdate = 0, UpdateAvailable, UpdateFailed };
-    explicit NSISUpdater(const QUrl &url);
+    explicit NSISUpdater(const QUrl &url, QObject *parent = 0);
    bool handleStartup() Q_DECL_OVERRIDE;
 private slots:
    void slotSetSeenVersion();
@@ -167,7 +167,7 @@ private:
 class PassiveUpdateNotifier : public OCUpdater {
    Q_OBJECT
 public:
-    explicit PassiveUpdateNotifier(const QUrl &url);
+    explicit PassiveUpdateNotifier(const QUrl &url, QObject *parent = 0);
    bool handleStartup() Q_DECL_OVERRIDE { return false; }
    void backgroundCheckForUpdate() Q_DECL_OVERRIDE;

@@ -87,10 +87,6 @@ Updater *Updater::create()
    if (updateBaseUrl.isEmpty()) {
        updateBaseUrl = QUrl(QLatin1String(APPLICATION_UPDATE_URL));
    }
-    if (!updateBaseUrl.isValid() || updateBaseUrl.host() == ".") {
-        qDebug() << "Not a valid updater URL, will not do update check";
-        return 0;
-    }
    updateBaseUrl = addQueryParams(updateBaseUrl);
 #if defined(Q_OS_MAC) && defined(HAVE_SPARKLE)
    updateBaseUrl.addQueryItem( QLatin1String("sparkle"), QLatin1String("true"));
@@ -21,8 +21,7 @@ class QUrl;

 namespace OCC {

-class Updater : public QObject {
-    Q_OBJECT
+class Updater {
 public:
    struct Helper {
        static qint64 stringVersionToInt(const QString& version);
@@ -38,7 +37,6 @@ public:

 protected:
    static QString clientVersion();
-    Updater() : QObject(0) {}

 private:
    static QString getSystemInfo();
@@ -29,11 +29,8 @@ OwncloudConnectionMethodDialog::OwncloudConnectionMethodDialog(QWidget *parent)
    connect(ui->btnClientSideTLS, SIGNAL(clicked(bool)), this, SLOT(returnClientSideTLS()));
    connect(ui->btnBack, SIGNAL(clicked(bool)), this, SLOT(returnBack()));

-
-#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
-    // We support only from Qt 5.4.x because of https://doc.qt.io/qt-5/qsslcertificate.html#importPkcs12
+    // DM: TLS Client Cert GUI support disabled for now
    ui->btnClientSideTLS->hide();
-#endif
 }

 void OwncloudConnectionMethodDialog::setUrl(const QUrl &url)
@@ -192,7 +192,7 @@ void OwncloudHttpCredsPage::setErrorString(const QString& err)

 AbstractCredentials* OwncloudHttpCredsPage::getCredentials() const
 {
-    return new HttpCredentialsGui(_ui.leUsername->text(), _ui.lePassword->text(), _ocWizard->_clientSslCertificate, _ocWizard->_clientSslKey);
+    return new HttpCredentialsGui(_ui.leUsername->text(), _ui.lePassword->text(), _ocWizard->ownCloudCertificatePath, _ocWizard->ownCloudCertificatePasswd);
 }


@@ -21,13 +21,13 @@
 #include <QMessageBox>
 #include <QSsl>
 #include <QSslCertificate>
-#include <QNetworkAccessManager>

 #include "QProgressIndicator.h"

 #include "wizard/owncloudwizardcommon.h"
 #include "wizard/owncloudsetuppage.h"
 #include "wizard/owncloudconnectionmethoddialog.h"
+#include "../3rdparty/certificates/p12topem.h"
 #include "theme.h"
 #include "account.h"

@@ -71,6 +71,7 @@ OwncloudSetupPage::OwncloudSetupPage(QWidget *parent)
    connect(_ui.leUrl, SIGNAL(editingFinished()), SLOT(slotUrlEditFinished()));

    addCertDial = new AddCertificateDialog(this);
+    connect(_ocWizard,SIGNAL(needCertificate()),this,SLOT(slotAskSSLClientCertificate()));
 }

 void OwncloudSetupPage::setServerUrl( const QString& newUrl )
@@ -138,7 +139,7 @@ void OwncloudSetupPage::slotUrlChanged(const QString& url)
 void OwncloudSetupPage::slotUrlEditFinished()
 {
    QString url = _ui.leUrl->fullText();
-    if (QUrl(url).isRelative() && !url.isEmpty()) {
+    if (QUrl(url).isRelative()) {
        // no scheme defined, set one
        url.prepend("https://");
    }
@@ -268,10 +269,7 @@ void OwncloudSetupPage::setErrorString( const QString& err, bool retryHTTPonly )
                    }
                    break;
                case OwncloudConnectionMethodDialog::Client_Side_TLS:
-#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
-                    addCertDial->show();
-                    connect(addCertDial, SIGNAL(accepted()),this,SLOT(slotCertificateAccepted()));
-#endif
+                    slotAskSSLClientCertificate();
                    break;
                case OwncloudConnectionMethodDialog::Closed:
                case OwncloudConnectionMethodDialog::Back:
@@ -304,6 +302,12 @@ void OwncloudSetupPage::stopSpinner()
    _progressIndi->stopAnimation();
 }

+void OwncloudSetupPage::slotAskSSLClientCertificate()
+{
+    addCertDial->show();
+    connect(addCertDial, SIGNAL(accepted()),this,SLOT(slotCertificateAccepted()));
+}
+
 QString subjectInfoHelper(const QSslCertificate& cert, const QByteArray &qa)
 {
 #if QT_VERSION < QT_VERSION_CHECK(5,0,0)
@@ -316,40 +320,36 @@ QString subjectInfoHelper(const QSslCertificate& cert, const QByteArray &qa)
 //called during the validation of the client certificate.
 void OwncloudSetupPage::slotCertificateAccepted()
 {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
-    QList<QSslCertificate> clientCaCertificates;
-    QFile certFile(addCertDial->getCertificatePath());
-    certFile.open(QFile::ReadOnly);
-    if(QSslCertificate::importPkcs12(&certFile,
-                                         &_ocWizard->_clientSslKey, &_ocWizard->_clientSslCertificate,
-                                            &clientCaCertificates,
-                                            addCertDial->getCertificatePasswd().toLocal8Bit())){
+    QSslCertificate sslCertificate;
+
+    resultP12ToPem certif = p12ToPem(addCertDial->getCertificatePath().toStdString() , addCertDial->getCertificatePasswd().toStdString());
+    if(certif.ReturnCode){
+        QString s = QString::fromStdString(certif.Certificate);
+        QByteArray ba = s.toLocal8Bit();
+
+        QList<QSslCertificate> sslCertificateList = QSslCertificate::fromData(ba, QSsl::Pem);
+        sslCertificate = sslCertificateList.takeAt(0);
+
+        _ocWizard->ownCloudCertificate = ba;
+        _ocWizard->ownCloudPrivateKey = certif.PrivateKey.c_str();
+        _ocWizard->ownCloudCertificatePath = addCertDial->getCertificatePath();
+        _ocWizard->ownCloudCertificatePasswd = addCertDial->getCertificatePasswd();
+
        AccountPtr acc = _ocWizard->account();
-
-        // to re-create the session ticket because we added a key/cert
-        acc->setSslConfiguration(QSslConfiguration());
-        QSslConfiguration sslConfiguration = acc->getOrCreateSslConfig();
-
-        // We're stuffing the certificate into the configuration form here. Later the
-        // cert will come via the HttpCredentials
-        sslConfiguration.setLocalCertificate(_ocWizard->_clientSslCertificate);
-        sslConfiguration.setPrivateKey(_ocWizard->_clientSslKey);
-        acc->setSslConfiguration(sslConfiguration);
-
-        // Make sure TCP connections get re-established
-        acc->networkAccessManager()->clearAccessCache();
-
-        addCertDial->reinit(); // FIXME: Why not just have this only created on use?
+        acc->setCertificate(_ocWizard->ownCloudCertificate, _ocWizard->ownCloudPrivateKey);
+        addCertDial->reinit();
        validatePage();
    } else {
-        addCertDial->showErrorMessage("Could not load certificate");
+        QString message;
+        message = certif.Comment.c_str();
+        addCertDial->showErrorMessage(message);
        addCertDial->show();
    }
-#endif
 }

 OwncloudSetupPage::~OwncloudSetupPage()
 {
+    delete addCertDial;
 }

 } // namespace OCC
@@ -59,6 +59,7 @@ public slots:
  void setErrorString( const QString&, bool retryHTTPonly );
  void startSpinner();
  void stopSpinner();
+  void slotAskSSLClientCertificate();
  void slotCertificateAccepted();

 protected slots:
@@ -224,4 +224,11 @@ AbstractCredentials* OwncloudWizard::getCredentials() const
  return 0;
 }

+// outputs the signal needed to authenticate a certificate
+void OwncloudWizard::raiseCertificatePopup()
+{
+    emit needCertificate();
+}
+
+
 } // end namespace
@@ -17,8 +17,6 @@
 #define MIRALL_OWNCLOUD_WIZARD_H

 #include <QWizard>
-#include <QSslKey>
-#include <QSslCertificate>

 #include "wizard/owncloudwizardcommon.h"
 #include "accountfwd.h"
@@ -65,10 +63,11 @@ public:
    void displayError( const QString&, bool retryHTTPonly);
    AbstractCredentials* getCredentials() const;

-    // FIXME: Can those be local variables?
-    // Set from the OwncloudSetupPage, later used from OwncloudHttpCredsPage
-    QSslKey _clientSslKey;
-    QSslCertificate _clientSslCertificate;
+    void raiseCertificatePopup();
+    QByteArray ownCloudCertificate;
+    QString ownCloudPrivateKey;
+    QString ownCloudCertificatePath;
+    QString ownCloudCertificatePasswd;

 public slots:
    void setAuthType(WizardCommon::AuthType type);
@@ -1,8 +1,6 @@
 project(libsync)
 set(CMAKE_AUTOMOC TRUE)

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
-
 configure_file( version.h.in "${CMAKE_CURRENT_BINARY_DIR}/version.h" )

 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
@@ -72,6 +70,7 @@ set(libsync_SRCS
    creds/abstractcredentials.cpp
    creds/credentialscommon.cpp
    ../3rdparty/qjson/json.cpp
+    ../3rdparty/certificates/p12topem.cpp
 )

 if(TOKEN_AUTH_ONLY)
@@ -18,6 +18,7 @@
 #include "configfile.h"
 #include "accessmanager.h"
 #include "creds/abstractcredentials.h"
+#include "../3rdparty/certificates/p12topem.h"
 #include "capabilities.h"
 #include "theme.h"

@@ -92,7 +93,7 @@ void Account::setDavUser(const QString &newDavUser)

 QString Account::displayName() const
 {
-    QString dn = QString("%1@%2").arg(_credentials->user(), _url.host());
+    QString dn = QString("%1@%2").arg(davUser(), _url.host());
    int port = url().port();
    if (port > 0 && port != 80 && port != 443) {
        dn.append(QLatin1Char(':'));
@@ -148,14 +149,10 @@ QUrl Account::davUrl() const
    return Utility::concatUrlPath(url(), davPath());
 }

-/**
- * clear all cookies. (Session cookies or not)
- */
 void Account::clearCookieJar()
 {
    Q_ASSERT(qobject_cast<CookieJar*>(_am->cookieJar()));
-    static_cast<CookieJar*>(_am->cookieJar())->setAllCookies(QList<QNetworkCookie>());
-    emit wantsAccountSaved(this);
+    static_cast<CookieJar*>(_am->cookieJar())->clearSessionCookies();
 }

 /*! This shares our official cookie jar (containing all the tasty
@@ -245,6 +242,12 @@ QNetworkReply *Account::davRequest(const QByteArray &verb, const QUrl &url, QNet
    return _am->sendCustomRequest(req, verb, data);
 }

+void Account::setCertificate(const QByteArray certficate, const QString privateKey)
+{
+    _pemCertificate=certficate;
+    _pemPrivateKey=privateKey;
+}
+
 void Account::setSslConfiguration(const QSslConfiguration &config)
 {
    _sslConfiguration = config;
@@ -261,7 +264,31 @@ QSslConfiguration Account::getOrCreateSslConfig()
    // if setting the client certificate fails, you will probably get an error similar to this:
    //  "An internal error number 1060 happened. SSL handshake failed, client certificate was requested: SSL error: sslv3 alert handshake failure"
    QSslConfiguration sslConfig = QSslConfiguration::defaultConfiguration();
+    QSslCertificate sslClientCertificate;
    
+    ConfigFile cfgFile;
+    if(!cfgFile.certificatePath().isEmpty() && !cfgFile.certificatePasswd().isEmpty()) {
+        resultP12ToPem certif = p12ToPem(cfgFile.certificatePath().toStdString(), cfgFile.certificatePasswd().toStdString());
+        QString s = QString::fromStdString(certif.Certificate);
+        QByteArray ba = s.toLocal8Bit();
+        this->setCertificate(ba, QString::fromStdString(certif.PrivateKey));
+    }
+    if((!_pemCertificate.isEmpty())&&(!_pemPrivateKey.isEmpty())) {
+        // Read certificates
+        QList<QSslCertificate> sslCertificateList = QSslCertificate::fromData(_pemCertificate, QSsl::Pem);
+        if(sslCertificateList.length() != 0) {
+            sslClientCertificate = sslCertificateList.takeAt(0);
+        }
+        // Read key from file
+        QSslKey privateKey(_pemPrivateKey.toLocal8Bit(), QSsl::Rsa, QSsl::Pem, QSsl::PrivateKey , "");
+
+        // SSL configuration
+        sslConfig.setCaCertificates(QSslSocket::systemCaCertificates());
+        sslConfig.setLocalCertificate(sslClientCertificate);
+        sslConfig.setPrivateKey(privateKey);
+        qDebug() << "Added SSL client certificate to the query";
+    }
+
 #if QT_VERSION > QT_VERSION_CHECK(5, 2, 0)
    // Try hard to re-use session for different requests
    sslConfig.setSslOption(QSsl::SslOptionDisableSessionTickets, false);
@@ -224,7 +224,8 @@ private:
    QList<QSslCertificate> _rejectedCertificates;

    static QString _configFileName;
-
+    QByteArray _pemCertificate; 
+    QString _pemPrivateKey;  
    QString _davPath; // defaults to value from theme, might be overwritten in brandings
    friend class AccountManager;
 };
@@ -116,18 +116,5 @@ bool Capabilities::chunkingNg() const
    return _capabilities["dav"].toMap()["chunking"].toByteArray() >= "1.0";
 }

-bool Capabilities::chunkingParallelUploadDisabled() const
-{
-    return _capabilities["dav"].toMap()["chunkingParallelUploadDisabled"].toBool();
-}
-
-QList<int> Capabilities::httpErrorCodesThatResetFailingChunkedUploads() const
-{
-    QList<int> list;
-    foreach (const auto & t, _capabilities["dav"].toMap()["httpErrorCodesThatResetFailingChunkedUploads"].toList()) {
-        list.push_back(t.toInt());
-    }
-    return list;
-}

 }
@@ -42,9 +42,6 @@ public:
    bool shareResharing() const;
    bool chunkingNg() const;

-    /// disable parallel upload in chunking
-    bool chunkingParallelUploadDisabled() const;
-
    /// returns true if the capabilities report notifications
    bool notificationsAvailable() const;

@@ -81,25 +78,6 @@ public:
     */
    QByteArray uploadChecksumType() const;

-    /**
-     * List of HTTP error codes should be guaranteed to eventually reset
-     * failing chunked uploads.
-     *
-     * The resetting works by tracking UploadInfo::errorCount.
-     *
-     * Note that other error codes than the ones listed here may reset the
-     * upload as well.
-     *
-     * Motivation: See #5344. They should always be reset on 412 (possibly
-     * checksum error), but broken servers may also require resets on
-     * unusual error codes such as 503.
-     *
-     * Path: dav/httpErrorCodesThatResetFailingChunkedUploads
-     * Default: []
-     * Example: [503, 500]
-     */
-    QList<int> httpErrorCodesThatResetFailingChunkedUploads() const;
-
 private:
    QVariantMap _capabilities;
 };
@@ -144,12 +144,7 @@ void ConnectionValidator::slotStatusFound(const QUrl&url, const QVariantMap &inf
 // status.php could not be loaded (network or server issue!).
 void ConnectionValidator::slotNoStatusFound(QNetworkReply *reply)
 {
-    qDebug() << Q_FUNC_INFO << reply->error() << reply->errorString() << reply->peek(1024);
-    if (reply && !_account->credentials()->ready()) {
-        // This could be needed for SSL client certificates
-        // We need to load them from keychain and try
-        reportResult( CredentialsMissingOrWrong );
-    } else
+    qDebug() << Q_FUNC_INFO << reply->error() << reply->errorString();
    if( reply && ! _account->credentials()->stillValid(reply)) {
        _errors.append(tr("Authentication error: Either username or password are wrong."));
    }  else {
@@ -17,7 +17,6 @@
 #include <QDebug>
 #include <QNetworkReply>
 #include <QSettings>
-#include <QSslKey>

 #include <keychain.h>

@@ -37,8 +36,8 @@ namespace OCC
 namespace
 {
 const char userC[] = "user";
-const char clientCertificatePEMC[] = "_clientCertificatePEM";
-const char clientKeyPEMC[] = "_clientKeyPEM";
+const char certifPathC[] = "certificatePath";
+const char certifPasswdC[] = "certificatePasswd";
 const char authenticationFailedC[] = "owncloud-authentication-failed";
 } // ns

@@ -51,47 +50,24 @@ protected:
        QByteArray credHash = QByteArray(_cred->user().toUtf8()+":"+_cred->password().toUtf8()).toBase64();
        QNetworkRequest req(request);
        req.setRawHeader(QByteArray("Authorization"), QByteArray("Basic ") + credHash);
-        //qDebug() << "Request for " << req.url() << "with authorization"
-        //         << QByteArray::fromBase64(credHash)
-        //         << _cred->_clientSslKey << _cred->_clientSslCertificate
-        //         << _cred->_clientSslKey.isNull() << _cred->_clientSslCertificate.isNull();
-
-        if (!_cred->_clientSslKey.isNull() && !_cred->_clientSslCertificate.isNull()) {
-            // SSL configuration
-            QSslConfiguration sslConfiguration = req.sslConfiguration();
-            sslConfiguration.setLocalCertificate(_cred->_clientSslCertificate);
-            sslConfiguration.setPrivateKey(_cred->_clientSslKey);
-            req.setSslConfiguration(sslConfiguration);
-        }
-
-
+        //qDebug() << "Request for " << req.url() << "with authorization" << QByteArray::fromBase64(credHash);
        return AccessManager::createRequest(op, req, outgoingData);
    }
 private:
    const HttpCredentials *_cred;
 };

-
-static void addSettingsToJob(Account *account, QKeychain::Job *job)
-{
-    Q_UNUSED(account);
-    auto settings = Utility::settingsWithGroup(Theme::instance()->appName());
-    settings->setParent(job); // make the job parent to make setting deleted properly
-    job->setSettings(settings.release());
-}
-
 HttpCredentials::HttpCredentials()
    : _ready(false)
 {
 }

-// From wizard
-HttpCredentials::HttpCredentials(const QString& user, const QString& password, const QSslCertificate& certificate, const QSslKey& key)
+HttpCredentials::HttpCredentials(const QString& user, const QString& password, const QString& certificatePath, const QString& certificatePasswd)
    : _user(user),
      _password(password),
      _ready(true),
-      _clientSslKey(key),
-      _clientSslCertificate(certificate)
+      _certificatePath(certificatePath),
+      _certificatePasswd(certificatePasswd)
 {
 }

@@ -110,6 +86,16 @@ QString HttpCredentials::password() const
    return _password;
 }

+QString HttpCredentials::certificatePath() const
+{
+    return _certificatePath;
+}
+
+QString HttpCredentials::certificatePasswd() const
+{
+    return _certificatePasswd;
+}
+
 void HttpCredentials::setAccount(Account* account)
 {
    AbstractCredentials::setAccount(account);
@@ -143,83 +129,35 @@ void HttpCredentials::fetchFromKeychain()
 {
    // User must be fetched from config file
    fetchUser();
+    _certificatePath = _account->credentialSetting(QLatin1String(certifPathC)).toString();
+    _certificatePasswd = _account->credentialSetting(QLatin1String(certifPasswdC)).toString();

+    auto settings = Utility::settingsWithGroup(Theme::instance()->appName());
    const QString kck = keychainKey(_account->url().toString(), _user );

+    QString key = QString::fromLatin1( "%1/data" ).arg( kck );
+    if( settings && settings->contains(key) ) {
+        // Clean the password from the config file if it is in there.
+        // we do not want a security problem.
+        settings->remove(key);
+        key = QString::fromLatin1( "%1/type" ).arg( kck );
+        settings->remove(key);
+        settings->sync();
+    }
+
    if (_ready) {
        Q_EMIT fetched();
    } else {
-        // Read client cert from keychain
-        const QString kck = keychainKey(_account->url().toString(), _user + clientCertificatePEMC);
        ReadPasswordJob *job = new ReadPasswordJob(Theme::instance()->appName());
-        addSettingsToJob(_account, job);
+        settings->setParent(job); // make the job parent to make setting deleted properly
+        job->setSettings(settings.release());
+
        job->setInsecureFallback(false);
        job->setKey(kck);
-        qDebug() << "-------- ----->" << _clientSslCertificate << _clientSslKey;
-
-        connect(job, SIGNAL(finished(QKeychain::Job*)), SLOT(slotReadClientCertPEMJobDone(QKeychain::Job*)));
+        connect(job, SIGNAL(finished(QKeychain::Job*)), SLOT(slotReadJobDone(QKeychain::Job*)));
        job->start();
    }
 }
-
-void HttpCredentials::slotReadClientCertPEMJobDone(QKeychain::Job* incoming)
-{
-    // Store PEM in memory
-    ReadPasswordJob *readJob = static_cast<ReadPasswordJob*>(incoming);
-    if (readJob->error() == NoError && readJob->binaryData().length() > 0) {
-        QList<QSslCertificate> sslCertificateList = QSslCertificate::fromData(readJob->binaryData(), QSsl::Pem);
-        if(sslCertificateList.length() >= 1) {
-            _clientSslCertificate = sslCertificateList.at(0);
-        }
-    }
-
-    // Load key too
-    const QString kck = keychainKey(_account->url().toString(), _user + clientKeyPEMC);
-    ReadPasswordJob *job = new ReadPasswordJob(Theme::instance()->appName());
-    addSettingsToJob(_account, job);
-    job->setInsecureFallback(false);
-    job->setKey(kck);
-
-    connect(job, SIGNAL(finished(QKeychain::Job*)), SLOT(slotReadClientKeyPEMJobDone(QKeychain::Job*)));
-    job->start();
-}
-
-void HttpCredentials::slotReadClientKeyPEMJobDone(QKeychain::Job* incoming)
-{
-    // Store key in memory
-    ReadPasswordJob *readJob = static_cast<ReadPasswordJob*>(incoming);
-
-    if (readJob->error() == NoError && readJob->binaryData().length() > 0) {
-        QByteArray clientKeyPEM = readJob->binaryData();
-        // FIXME Unfortunately Qt has a bug and we can't just use QSsl::Opaque to let it
-        // load whatever we have. So we try until it works.
-        _clientSslKey = QSslKey(clientKeyPEM, QSsl::Rsa);
-        if (_clientSslKey.isNull()) {
-            _clientSslKey = QSslKey(clientKeyPEM, QSsl::Dsa);
-        }
-#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)
-        // ec keys are Qt 5.5
-        if (_clientSslKey.isNull()) {
-            _clientSslKey = QSslKey(clientKeyPEM, QSsl::Ec);
-        }
-#endif
-        if (_clientSslKey.isNull()) {
-            qDebug() << "Warning: Could not load SSL key into Qt!";
-        }
-    }
-
-    // Now fetch the actual server password
-    const QString kck = keychainKey(_account->url().toString(), _user );
-    ReadPasswordJob *job = new ReadPasswordJob(Theme::instance()->appName());
-    addSettingsToJob(_account, job);
-    job->setInsecureFallback(false);
-    job->setKey(kck);
-
-    connect(job, SIGNAL(finished(QKeychain::Job*)), SLOT(slotReadJobDone(QKeychain::Job*)));
-    job->start();
-}
-
-
 bool HttpCredentials::stillValid(QNetworkReply *reply)
 {
    return ((reply->error() != QNetworkReply::AuthenticationRequiredError)
@@ -228,10 +166,10 @@ bool HttpCredentials::stillValid(QNetworkReply *reply)
                || !reply->property(authenticationFailedC).toBool()));
 }

-void HttpCredentials::slotReadJobDone(QKeychain::Job *incomingJob)
+void HttpCredentials::slotReadJobDone(QKeychain::Job *job)
 {
-    QKeychain::ReadPasswordJob *job = static_cast<ReadPasswordJob*>(incomingJob);
-    _password = job->textData();
+    ReadPasswordJob *readJob = static_cast<ReadPasswordJob*>(job);
+    _password = readJob->textData();

    if( _user.isEmpty()) {
        qDebug() << "Strange: User is empty!";
@@ -240,6 +178,7 @@ void HttpCredentials::slotReadJobDone(QKeychain::Job *incomingJob)
    QKeychain::Error error = job->error();

    if( !_password.isEmpty() && error == NoError ) {
+
        // All cool, the keychain did not come back with error.
        // Still, the password can be empty which indicates a problem and
        // the password dialog has to be opened.
@@ -275,7 +214,9 @@ void HttpCredentials::invalidateToken()
    }

    DeletePasswordJob *job = new DeletePasswordJob(Theme::instance()->appName());
-    addSettingsToJob(_account, job);
+    auto settings = Utility::settingsWithGroup(Theme::instance()->appName());
+    settings->setParent(job); // make the job parent to make setting deleted properly
+    job->setSettings(settings.release());
    job->setInsecureFallback(true);
    job->setKey(kck);
    job->start();
@@ -320,37 +261,14 @@ void HttpCredentials::persist()
        // We never connected or fetched the user, there is nothing to save.
        return;
    }
-
    _account->setCredentialSetting(QLatin1String(userC), _user);
-
-    // write cert
+    _account->setCredentialSetting(QLatin1String(certifPathC), _certificatePath);
+    _account->setCredentialSetting(QLatin1String(certifPasswdC), _certificatePasswd);
    WritePasswordJob *job = new WritePasswordJob(Theme::instance()->appName());
-    addSettingsToJob(_account, job);
-    job->setInsecureFallback(false);
-    connect(job, SIGNAL(finished(QKeychain::Job*)), SLOT(slotWriteClientCertPEMJobDone(QKeychain::Job*)));
-    job->setKey(keychainKey(_account->url().toString(), _user + clientCertificatePEMC));
-    job->setBinaryData(_clientSslCertificate.toPem());
-    job->start();
-}
+    auto settings = Utility::settingsWithGroup(Theme::instance()->appName());
+    settings->setParent(job); // make the job parent to make setting deleted properly
+    job->setSettings(settings.release());

-void HttpCredentials::slotWriteClientCertPEMJobDone(Job *incomingJob)
-{
-    Q_UNUSED(incomingJob);
-    // write ssl key
-    WritePasswordJob* job = new WritePasswordJob(Theme::instance()->appName());
-    addSettingsToJob(_account, job);
-    job->setInsecureFallback(false);
-    connect(job, SIGNAL(finished(QKeychain::Job*)), SLOT(slotWriteClientKeyPEMJobDone(QKeychain::Job*)));
-    job->setKey(keychainKey(_account->url().toString(), _user + clientKeyPEMC));
-    job->setBinaryData(_clientSslKey.toPem());
-    job->start();
-}
-
-void HttpCredentials::slotWriteClientKeyPEMJobDone(Job *incomingJob)
-{
-    Q_UNUSED(incomingJob);
-    WritePasswordJob* job = new WritePasswordJob(Theme::instance()->appName());
-    addSettingsToJob(_account, job);
    job->setInsecureFallback(false);
    connect(job, SIGNAL(finished(QKeychain::Job*)), SLOT(slotWriteJobDone(QKeychain::Job*)));
    job->setKey(keychainKey(_account->url().toString(), _user));
@@ -17,8 +17,7 @@
 #define MIRALL_CREDS_HTTP_CREDENTIALS_H

 #include <QMap>
-#include <QSslCertificate>
-#include <QSslKey>
+
 #include "creds/abstractcredentials.h"

 class QNetworkReply;
@@ -26,8 +25,6 @@ class QAuthenticator;

 namespace QKeychain {
 class Job;
-class WritePasswordJob;
-class ReadPasswordJob;
 }

 namespace OCC
@@ -36,10 +33,10 @@ namespace OCC
 class OWNCLOUDSYNC_EXPORT HttpCredentials : public AbstractCredentials
 {
    Q_OBJECT
-    friend class HttpCredentialsAccessManager;
+
 public:
    explicit HttpCredentials();
-    HttpCredentials(const QString& user, const QString& password, const QSslCertificate& certificate = QSslCertificate(), const QSslKey& key = QSslKey());
+    HttpCredentials(const QString& user, const QString& password, const QString& certificatePath,  const QString& certificatePasswd);

    QString authType() const Q_DECL_OVERRIDE;
    QNetworkAccessManager* getQNAM() const Q_DECL_OVERRIDE;
@@ -53,19 +50,15 @@ public:
    void forgetSensitiveData() Q_DECL_OVERRIDE;
    QString fetchUser();
    virtual bool sslIsTrusted() { return false; }
+    QString certificatePath() const;
+    QString certificatePasswd() const;

    // To fetch the user name as early as possible
    void setAccount(Account* account) Q_DECL_OVERRIDE;

 private Q_SLOTS:
    void slotAuthentication(QNetworkReply*, QAuthenticator*);
-
-    void slotReadClientCertPEMJobDone(QKeychain::Job*);
-    void slotReadClientKeyPEMJobDone(QKeychain::Job*);
    void slotReadJobDone(QKeychain::Job*);
-
-    void slotWriteClientCertPEMJobDone(QKeychain::Job*);
-    void slotWriteClientKeyPEMJobDone(QKeychain::Job*);
    void slotWriteJobDone(QKeychain::Job*);
    void clearQNAMCache();

@@ -73,11 +66,12 @@ protected:
    QString _user;
    QString _password;
    QString _previousPassword;
-
    QString _fetchErrorString;
    bool _ready;
-    QSslKey _clientSslKey;
-    QSslCertificate _clientSslCertificate;
+
+private:
+    QString _certificatePath;
+    QString _certificatePasswd;
 };

 } // namespace OCC
@@ -472,7 +472,7 @@ bool CheckServerJob::finished()
        QVariantMap status = QtJson::parse(QString::fromUtf8(body), success).toMap();
        // empty or invalid response
        if (!success || status.isEmpty()) {
-            qDebug() << "status.php from server is not valid JSON!" << body << reply()->request().url();
+            qDebug() << "status.php from server is not valid JSON!";
        }

        qDebug() << "status.php returns: " << status << " " << reply()->error() << " Reply: " << reply();
@@ -99,7 +99,7 @@ int OwncloudPropagator::hardMaximumActiveJob()

 /** Updates, creates or removes a blacklist entry for the given item.
 *
- * Returns whether the error should be suppressed.
+ * Returns whether the file is in the blacklist now.
 */
 static bool blacklistCheck(SyncJournalDb* journal, const SyncFileItem& item)
 {
@@ -108,13 +108,16 @@ static bool blacklistCheck(SyncJournalDb* journal, const SyncFileItem& item)

    if (newEntry.isValid()) {
        journal->updateErrorBlacklistEntry(newEntry);
+        // Also clear upload info if any so we don't resume from the same transfer-id if there was too many failures (#5344)
+        // (maybe the reason is that the state for this transfer id is broken on the server.)
+        if (newEntry._retryCount > 3) {
+            journal->setUploadInfo(item._file, SyncJournalDb::UploadInfo());
+        }
    } else if (oldEntry.isValid()) {
        journal->wipeErrorBlacklistEntry(item._file);
    }

-    // In some cases we add errors to the blacklist for tracking, but don't
-    // want to actively suppress them.
-    return newEntry.isValid() && newEntry._ignoreDuration > 0;
+    return newEntry.isValid();
 }

 void PropagateItemJob::done(SyncFileItem::Status status, const QString &errorString)
@@ -132,7 +135,7 @@ void PropagateItemJob::done(SyncFileItem::Status status, const QString &errorStr
        }
    }

-    if( propagator()->_abortRequested.fetchAndAddRelaxed(0) &&
+    if( _propagator->_abortRequested.fetchAndAddRelaxed(0) &&
            (status == SyncFileItem::NormalError || status == SyncFileItem::FatalError)) {
        // an abort request is ongoing. Change the status to Soft-Error
        status = SyncFileItem::SoftError;
@@ -141,12 +144,10 @@ void PropagateItemJob::done(SyncFileItem::Status status, const QString &errorStr
    switch( status ) {
    case SyncFileItem::SoftError:
    case SyncFileItem::FatalError:
+        // do not blacklist in case of soft error or fatal error.
+        break;
    case SyncFileItem::NormalError:
-        // For normal errors, we blacklist aggressively, otherwise only on
-        // explicit request.
-        if ((status == SyncFileItem::NormalError || _item->_errorMayBeBlacklisted)
-                && blacklistCheck(propagator()->_journal, *_item)
-                && _item->_hasBlacklistEntry) {
+        if (blacklistCheck(_propagator->_journal, *_item) && _item->_hasBlacklistEntry) {
            // do not error if the item was, and continues to be, blacklisted
            status = SyncFileItem::FileIgnored;
            _item->_errorString.prepend(tr("Continue blacklisting:") + " ");
@@ -156,10 +157,10 @@ void PropagateItemJob::done(SyncFileItem::Status status, const QString &errorStr
    case SyncFileItem::Restoration:
        if( _item->_hasBlacklistEntry ) {
            // wipe blacklist entry.
-            propagator()->_journal->wipeErrorBlacklistEntry(_item->_file);
+            _propagator->_journal->wipeErrorBlacklistEntry(_item->_file);
            // remove a blacklist entry in case the file was moved.
            if( _item->_originalFile != _item->_file ) {
-                propagator()->_journal->wipeErrorBlacklistEntry(_item->_originalFile);
+                _propagator->_journal->wipeErrorBlacklistEntry(_item->_originalFile);
            }
        }
        break;
@@ -186,7 +187,7 @@ bool PropagateItemJob::checkForProblemsWithShared(int httpStatusCode, const QStr
 {
    PropagateItemJob *newJob = NULL;

-    if( httpStatusCode == 403 && propagator()->isInSharedDirectory(_item->_file )) {
+    if( httpStatusCode == 403 && _propagator->isInSharedDirectory(_item->_file )) {
        if( !_item->_isDirectory ) {
            SyncFileItemPtr downloadItem(new SyncFileItem(*_item));
            if (downloadItem->_instruction == CSYNC_INSTRUCTION_NEW
@@ -205,18 +206,18 @@ bool PropagateItemJob::checkForProblemsWithShared(int httpStatusCode, const QStr
                downloadItem->_instruction = CSYNC_INSTRUCTION_SYNC;
            }
            downloadItem->_direction = SyncFileItem::Down;
-            newJob = new PropagateDownloadFile(propagator(), downloadItem);
+            newJob = new PropagateDownloadFile(_propagator, downloadItem);
        } else {
            // Directories are harder to recover.
            // But just re-create the directory, next sync will be able to recover the files
            SyncFileItemPtr mkdirItem(new SyncFileItem(*_item));
            mkdirItem->_instruction = CSYNC_INSTRUCTION_NEW;
            mkdirItem->_direction = SyncFileItem::Down;
-            newJob = new PropagateLocalMkdir(propagator(), mkdirItem);
+            newJob = new PropagateLocalMkdir(_propagator, mkdirItem);
            // Also remove the inodes and fileid from the db so no further renames are tried for
            // this item.
-            propagator()->_journal->avoidRenamesOnNextSync(_item->_file);
-            propagator()->_anotherSyncNeeded = true;
+            _propagator->_journal->avoidRenamesOnNextSync(_item->_file);
+            _propagator->_anotherSyncNeeded = true;
        }
        if( newJob )  {
            newJob->setRestoreJobMsg(msg);
@@ -307,11 +308,18 @@ void OwncloudPropagator::start(const SyncFileItemVector& items)
     * In order to do that we loop over the items. (which are sorted by destination)
     * When we enter a directory, we can create the directory job and push it on the stack. */

+    /// root job is initialized as PropagateDirectory
    _rootJob.reset(new PropagateDirectory(this));
+
    QStack<QPair<QString /* directory name */, PropagateDirectory* /* job */> > directories;
    directories.push(qMakePair(QString(), _rootJob.data()));
    QVector<PropagatorJob*> directoriesToRemove;
    QString removedDirectory;
+
+    PropagateDataTransfers* dataTransfers = new PropagateDataTransfers(this);
+
+    /// directories will be used to create a sync logic
+    /// this will create/update logical directories structure
    foreach(const SyncFileItemPtr &item, items) {

        if (!removedDirectory.isEmpty() && item->_file.startsWith(removedDirectory)) {
@@ -388,7 +396,12 @@ void OwncloudPropagator::start(const SyncFileItemVector& items)
                currentDirJob->append(dir);
            }
            directories.push(qMakePair(item->destination() + "/" , dir));
+        } else if (item->_instruction == CSYNC_INSTRUCTION_NEW
+                   || item->_instruction == CSYNC_INSTRUCTION_SYNC){
+            // for new/updated files add this to data transfers job
+            dataTransfers->append(createJob(item));
        } else if (PropagateItemJob* current = createJob(item)) {
+            // for conflics, ignore, move, delete etc sync items, add the to directories logic
            if (item->_instruction == CSYNC_INSTRUCTION_TYPE_CHANGE) {
                // will delete directories, so defer execution
                directoriesToRemove.prepend(current);
@@ -399,6 +412,11 @@ void OwncloudPropagator::start(const SyncFileItemVector& items)
        }
    }

+    /// dataTransfers will be used to create a data transfer logic
+    /// create/update files withing already created/updated directories structure
+    _rootJob->append(dataTransfers);
+
+    /// directories to remove have to go last, nice there could be moves
    foreach(PropagatorJob* it, directoriesToRemove) {
        _rootJob->append(it);
    }
@@ -573,18 +591,6 @@ OwncloudPropagator::DiskSpaceResult OwncloudPropagator::diskSpaceCheck() const

 // ================================================================================

-PropagatorJob::PropagatorJob(OwncloudPropagator *propagator)
-    : QObject(propagator)
-    , _state(NotYetStarted)
-{
-
-}
-
-OwncloudPropagator *PropagatorJob::propagator() const
-{
-    return qobject_cast<OwncloudPropagator*>(parent());
-}
-
 PropagatorJob::JobParallelism PropagateDirectory::parallelism()
 {
    // If any of the non-finished sub jobs is not parallel, we have to wait
@@ -700,7 +706,7 @@ void PropagateDirectory::finalize()
            if(_item->_instruction == CSYNC_INSTRUCTION_RENAME
                    && _item->_originalFile != _item->_renameTarget) {
                // Remove the stale entries from the database.
-                propagator()->_journal->deleteFileRecord(_item->_originalFile, true);
+                _propagator->_journal->deleteFileRecord(_item->_originalFile, true);
            }

            _item->_file = _item->_renameTarget;
@@ -718,8 +724,8 @@ void PropagateDirectory::finalize()
                    _item->_fileId = mkdir->_item->_fileId;
                }
            }
-            SyncJournalFileRecord record(*_item,  propagator()->_localDir + _item->_file);
-            ok = propagator()->_journal->setFileRecordMetadata(record);
+            SyncJournalFileRecord record(*_item,  _propagator->_localDir + _item->_file);
+            ok = _propagator->_journal->setFileRecordMetadata(record);
            if (!ok) {
                _hasError = _item->_status = SyncFileItem::FatalError;
                _item->_errorString = tr("Error writing metadata to the database");
@@ -740,6 +746,97 @@ qint64 PropagateDirectory::committedDiskSpace() const
    return needed;
 }

+
+// ================================================================================
+
+PropagatorJob::JobParallelism PropagateDataTransfers::parallelism()
+{
+    // Upload and Download jobs parallelism is FullParallelism
+
+    return FullParallelism;
+}
+
+
+bool PropagateDataTransfers::scheduleNextJob()
+{
+    if (_state == Finished) {
+        return false;
+    }
+
+    if (_state == NotYetStarted) {
+        _state = Running;
+
+        // at the begining of the Directory Job, update expected number of Jobs to be synced
+        _totalJobs = _subJobs.count();
+
+        if (_subJobs.isEmpty()) {
+            finalize();
+            return true;
+        }
+    }
+
+    QMutableListIterator<PropagatorJob *> subJobsIterator(_subJobs);
+
+    while (subJobsIterator.hasNext()) {
+        subJobsIterator.next();
+        // get the state of the state of the sub job pointed by call next()
+        // peekPrevious() will directly access the item through hash in the QList at that subjob
+        if (subJobsIterator.peekPrevious()->_state == Finished) {
+            // if this items is finish, remove it from the _subJobs list as it is not needed anymore
+            subJobsIterator.remove();
+            continue;
+        }
+
+        if (possiblyRunNextJob(subJobsIterator.peekPrevious())) {
+            return true;
+        }
+
+        Q_ASSERT(subJobsIterator.peekPrevious()->_state == Running);
+    }
+    return false;
+}
+
+void PropagateDataTransfers::slotSubJobFinished(SyncFileItem::Status status)
+{
+    if (status == SyncFileItem::FatalError) {
+        abort();
+        _state = Finished;
+        emit finished(status);
+        return;
+    } else if (status == SyncFileItem::NormalError || status == SyncFileItem::SoftError) {
+        _hasError = status;
+    }
+    _runningNow--;
+    _jobsFinished++;
+
+    // We finished processing all the jobs
+    // check if we finished
+    if (_jobsFinished >= _totalJobs) {
+        Q_ASSERT(!_runningNow); // how can we be finished if there are still jobs running now
+        finalize();
+    } else {
+        emit ready();
+    }
+}
+
+void PropagateDataTransfers::finalize()
+{
+    _state = Finished;
+    emit finished(_hasError == SyncFileItem::NoStatus ?  SyncFileItem::Success : _hasError);
+}
+
+qint64 PropagateDataTransfers::committedDiskSpace() const
+{
+    qint64 needed = 0;
+    foreach (PropagatorJob* job, _subJobs) {
+        needed += job->committedDiskSpace();
+    }
+    return needed;
+}
+
+
+// ================================================================================
+
 CleanupPollsJob::~CleanupPollsJob()
 {}

@@ -56,9 +56,11 @@ class OwncloudPropagator;
 */
 class PropagatorJob : public QObject {
    Q_OBJECT
+protected:
+    OwncloudPropagator *_propagator;

 public:
-    explicit PropagatorJob(OwncloudPropagator* propagator);
+    explicit PropagatorJob(OwncloudPropagator* propagator) : _propagator(propagator), _state(NotYetStarted) {}

    enum JobState {
        NotYetStarted,
@@ -124,8 +126,6 @@ signals:

    void progress(const SyncFileItem& item, quint64 bytes);

-protected:
-    OwncloudPropagator *propagator() const;
 };


@@ -178,7 +178,7 @@ public slots:


 /**
- * @brief Propagate a directory, and all its sub entries.
+ * @brief Propagate a directory, and all its sub entries which are not uploads/downloads.
 * @ingroup libsync
 */
 class OWNCLOUDSYNC_EXPORT PropagateDirectory : public PropagatorJob {
@@ -243,6 +243,60 @@ private slots:
    void slotSubJobFinished(SyncFileItem::Status status);
 };

+/**
+ * @brief Propagate new/updates of files to be uploaded/downloaded
+ * @ingroup libsync
+ */
+class OWNCLOUDSYNC_EXPORT PropagateDataTransfers : public PropagatorJob {
+    Q_OBJECT
+public:
+    // all the file uploads and downloads
+    QList<PropagatorJob *> _subJobs;
+
+    int _jobsFinished; // number of jobs that have completed
+    int _runningNow; // number of subJobs running right now
+    SyncFileItem::Status _hasError;  // NoStatus,  or NormalError / SoftError if there was an error
+    int _totalJobs;
+
+    explicit PropagateDataTransfers(OwncloudPropagator *propagator)
+        : PropagatorJob(propagator)
+        , _jobsFinished(0), _runningNow(0), _hasError(SyncFileItem::NoStatus), _totalJobs(0)
+    { }
+
+    virtual ~PropagateDataTransfers() {
+        qDeleteAll(_subJobs);
+    }
+
+    void append(PropagatorJob *subJob) {
+        _subJobs.append(subJob);
+    }
+
+    virtual bool scheduleNextJob() Q_DECL_OVERRIDE;
+    virtual JobParallelism parallelism() Q_DECL_OVERRIDE;
+    virtual void abort() Q_DECL_OVERRIDE {
+        foreach (PropagatorJob *j, _subJobs)
+            j->abort();
+    }
+
+    void finalize();
+
+    qint64 committedDiskSpace() const Q_DECL_OVERRIDE;
+
+private slots:
+    bool possiblyRunNextJob(PropagatorJob *next) {
+        if (next->_state == NotYetStarted) {
+            connect(next, SIGNAL(finished(SyncFileItem::Status)), this, SLOT(slotSubJobFinished(SyncFileItem::Status)), Qt::QueuedConnection);
+            connect(next, SIGNAL(itemCompleted(const SyncFileItem &, const PropagatorJob &)),
+                    this, SIGNAL(itemCompleted(const SyncFileItem &, const PropagatorJob &)));
+            connect(next, SIGNAL(progress(const SyncFileItem &,quint64)), this, SIGNAL(progress(const SyncFileItem &,quint64)));
+            connect(next, SIGNAL(ready()), this, SIGNAL(ready()));
+            _runningNow++;
+        }
+        return next->scheduleNextJob();
+    }
+
+    void slotSubJobFinished(SyncFileItem::Status status);
+};

 /**
 * @brief Dummy job that just mark it as completed and ignored
@@ -70,9 +70,7 @@ bool SqlDatabase::openHelper( const QString& filename, int sqliteFlags )

 bool SqlDatabase::checkDb()
 {
-    // quick_check can fail with a disk IO error when diskspace is low
-    SqlQuery quick_check(*this);
-    quick_check.prepare("PRAGMA quick_check;", /*allow_failure=*/true);
+    SqlQuery quick_check("PRAGMA quick_check;", *this);
    if( !quick_check.exec() ) {
        qDebug() << "Error running quick_check on database";
        return false;
@@ -201,7 +199,7 @@ SqlQuery::SqlQuery(const QString& sql, SqlDatabase& db)
    prepare(sql);
 }

-int SqlQuery::prepare( const QString& sql, bool allow_failure )
+int SqlQuery::prepare( const QString& sql)
 {
    QString s(sql);
    _sql = s.trimmed();
@@ -223,11 +221,7 @@ int SqlQuery::prepare( const QString& sql, bool allow_failure )
        if( _errId != SQLITE_OK ) {
            _error = QString::fromUtf8(sqlite3_errmsg(_db));
            qWarning() << "Sqlite prepare statement error:" << _error << "in" <<_sql;
-            if (!allow_failure) {
-                qFatal("SQLITE Prepare error: %s in %s",
-                       _error.toLocal8Bit().data(),
-                       sql.toLocal8Bit().data());
-            }
+            Q_ASSERT(!"SQLITE Prepare error");
        }
    }
    return _errId;
@@ -80,7 +80,7 @@ public:
    bool isSelect();
    bool isPragma();
    bool exec();
-    int  prepare( const QString& sql, bool allow_failure = false );
+    int  prepare( const QString& sql );
    bool next();
    void bindValue(int pos, const QVariant& value);
    QString lastQuery() const;
@@ -310,10 +310,10 @@ QString GETFileJob::errorString() const

 void PropagateDownloadFile::start()
 {
-    if (propagator()->_abortRequested.fetchAndAddRelaxed(0))
+    if (_propagator->_abortRequested.fetchAndAddRelaxed(0))
        return;

-    qDebug() << Q_FUNC_INFO << _item->_file << propagator()->_activeJobList.count();
+    qDebug() << Q_FUNC_INFO << _item->_file << _propagator->_activeJobList.count();
    _stopwatch.start();

    if (_deleteExisting) {
@@ -326,7 +326,7 @@ void PropagateDownloadFile::start()
    }

    // do a klaas' case clash check.
-    if( propagator()->localFileNameClash(_item->_file) ) {
+    if( _propagator->localFileNameClash(_item->_file) ) {
        done( SyncFileItem::NormalError, tr("File %1 can not be downloaded because of a local file name clash!")
              .arg(QDir::toNativeSeparators(_item->_file)) );
        return;
@@ -336,12 +336,12 @@ void PropagateDownloadFile::start()

    QString tmpFileName;
    QByteArray expectedEtagForResume;
-    const SyncJournalDb::DownloadInfo progressInfo = propagator()->_journal->getDownloadInfo(_item->_file);
+    const SyncJournalDb::DownloadInfo progressInfo = _propagator->_journal->getDownloadInfo(_item->_file);
    if (progressInfo._valid) {
        // if the etag has changed meanwhile, remove the already downloaded part.
        if (progressInfo._etag != _item->_etag) {
-            FileSystem::remove(propagator()->getFilePath(progressInfo._tmpfile));
-            propagator()->_journal->setDownloadInfo(_item->_file, SyncJournalDb::DownloadInfo());
+            FileSystem::remove(_propagator->getFilePath(progressInfo._tmpfile));
+            _propagator->_journal->setDownloadInfo(_item->_file, SyncJournalDb::DownloadInfo());
        } else {
            tmpFileName = progressInfo._tmpfile;
            expectedEtagForResume = progressInfo._etag;
@@ -353,7 +353,7 @@ void PropagateDownloadFile::start()
        tmpFileName = createDownloadTmpFileName(_item->_file);
    }

-    _tmpFile.setFileName(propagator()->getFilePath(tmpFileName));
+    _tmpFile.setFileName(_propagator->getFilePath(tmpFileName));
    if (!_tmpFile.open(QIODevice::Append | QIODevice::Unbuffered)) {
        done(SyncFileItem::NormalError, _tmpFile.errorString());
        return;
@@ -372,7 +372,7 @@ void PropagateDownloadFile::start()
    }

    // If there's not enough space to fully download this file, stop.
-    const auto diskSpaceResult = propagator()->diskSpaceCheck();
+    const auto diskSpaceResult = _propagator->diskSpaceCheck();
    if (diskSpaceResult == OwncloudPropagator::DiskSpaceFailure) {
        _item->_errorMayBeBlacklisted = true;
        done(SyncFileItem::NormalError,
@@ -391,16 +391,16 @@ void PropagateDownloadFile::start()
        pi._etag = _item->_etag;
        pi._tmpfile = tmpFileName;
        pi._valid = true;
-        propagator()->_journal->setDownloadInfo(_item->_file, pi);
-        propagator()->_journal->commit("download file start");
+        _propagator->_journal->setDownloadInfo(_item->_file, pi);
+        _propagator->_journal->commit("download file start");
    }

    QMap<QByteArray, QByteArray> headers;

    if (_item->_directDownloadUrl.isEmpty()) {
        // Normal job, download from oC instance
-        _job = new GETFileJob(propagator()->account(),
-                            propagator()->_remoteFolder + _item->_file,
+        _job = new GETFileJob(_propagator->account(),
+                            _propagator->_remoteFolder + _item->_file,
                            &_tmpFile, headers, expectedEtagForResume, _resumeStart, this);
    } else {
        // We were provided a direct URL, use that one
@@ -411,14 +411,14 @@ void PropagateDownloadFile::start()
        }

        QUrl url = QUrl::fromUserInput(_item->_directDownloadUrl);
-        _job = new GETFileJob(propagator()->account(),
+        _job = new GETFileJob(_propagator->account(),
                              url,
                              &_tmpFile, headers, expectedEtagForResume, _resumeStart, this);
    }
-    _job->setBandwidthManager(&propagator()->_bandwidthManager);
+    _job->setBandwidthManager(&_propagator->_bandwidthManager);
    connect(_job, SIGNAL(finishedSignal()), this, SLOT(slotGetFinished()));
    connect(_job, SIGNAL(downloadProgress(qint64,qint64)), this, SLOT(slotDownloadProgress(qint64,qint64)));
-    propagator()->_activeJobList.append(this);
+    _propagator->_activeJobList.append(this);
    _job->start();
 }

@@ -438,7 +438,7 @@ void PropagateDownloadFile::setDeleteExistingFolder(bool enabled)
 const char owncloudCustomSoftErrorStringC[] = "owncloud-custom-soft-error-string";
 void PropagateDownloadFile::slotGetFinished()
 {
-    propagator()->_activeJobList.removeOne(this);
+    _propagator->_activeJobList.removeOne(this);

    GETFileJob *job = qobject_cast<GETFileJob *>(sender());
    Q_ASSERT(job);
@@ -459,7 +459,7 @@ void PropagateDownloadFile::slotGetFinished()
        const bool badRangeHeader = job->resumeStart() > 0 && _item->_httpErrorCode == 416;
        if (badRangeHeader) {
            qDebug() << Q_FUNC_INFO << "server replied 416 to our range request, trying again without";
-            propagator()->_anotherSyncNeeded = true;
+            _propagator->_anotherSyncNeeded = true;
        }

        // Getting a 404 probably means that the file was deleted on the server.
@@ -473,7 +473,7 @@ void PropagateDownloadFile::slotGetFinished()
        if (_tmpFile.size() == 0 || badRangeHeader || fileNotFound) {
            _tmpFile.close();
            FileSystem::remove(_tmpFile.fileName());
-            propagator()->_journal->setDownloadInfo(_item->_file, SyncJournalDb::DownloadInfo());
+            _propagator->_journal->setDownloadInfo(_item->_file, SyncJournalDb::DownloadInfo());
        }

        if(!_item->_directDownloadUrl.isEmpty() && err != QNetworkReply::OperationCanceledError) {
@@ -503,7 +503,7 @@ void PropagateDownloadFile::slotGetFinished()
        SyncFileItem::Status status = job->errorStatus();
        if (status == SyncFileItem::NoStatus) {
            status = classifyError(err, _item->_httpErrorCode,
-                                   &propagator()->_anotherSyncNeeded);
+                                   &_propagator->_anotherSyncNeeded);
        }

        done(status, job->errorString());
@@ -544,7 +544,7 @@ void PropagateDownloadFile::slotGetFinished()

    if(bodySize > 0 && bodySize != _tmpFile.size() - job->resumeStart() ) {
        qDebug() << bodySize << _tmpFile.size() << job->resumeStart();
-        propagator()->_anotherSyncNeeded = true;
+        _propagator->_anotherSyncNeeded = true;
        done(SyncFileItem::SoftError, tr("The file could not be downloaded completely."));
        return;
    }
@@ -572,13 +572,13 @@ void PropagateDownloadFile::slotGetFinished()
 void PropagateDownloadFile::slotChecksumFail( const QString& errMsg )
 {
    FileSystem::remove(_tmpFile.fileName());
-    propagator()->_anotherSyncNeeded = true;
+    _propagator->_anotherSyncNeeded = true;
    done(SyncFileItem::SoftError, errMsg ); // tr("The file downloaded with a broken checksum, will be redownloaded."));
 }

 void PropagateDownloadFile::deleteExistingFolder()
 {
-    QString existingDir = propagator()->getFilePath(_item->_file);
+    QString existingDir = _propagator->getFilePath(_item->_file);
    if (!QFileInfo(existingDir).isDir()) {
        return;
    }
@@ -595,8 +595,8 @@ void PropagateDownloadFile::deleteExistingFolder()
    QString conflictDir = FileSystem::makeConflictFileName(
            existingDir, Utility::qDateTimeFromTime_t(FileSystem::getModTime(existingDir)));

-    emit propagator()->touchedFile(existingDir);
-    emit propagator()->touchedFile(conflictDir);
+    emit _propagator->touchedFile(existingDir);
+    emit _propagator->touchedFile(conflictDir);
    QString renameError;
    if (!FileSystem::rename(existingDir, conflictDir, &renameError)) {
        done(SyncFileItem::NormalError, renameError);
@@ -706,11 +706,11 @@ void PropagateDownloadFile::contentChecksumComputed(const QByteArray &checksumTy

 void PropagateDownloadFile::downloadFinished()
 {
-    QString fn = propagator()->getFilePath(_item->_file);
+    QString fn = _propagator->getFilePath(_item->_file);

    // In case of file name clash, report an error
    // This can happen if another parallel download saved a clashing file.
-    if (propagator()->localFileNameClash(_item->_file)) {
+    if (_propagator->localFileNameClash(_item->_file)) {
        done( SyncFileItem::NormalError, tr("File %1 cannot be saved because of a local file name clash!")
              .arg(QDir::toNativeSeparators(_item->_file)) );
        return;
@@ -730,7 +730,7 @@ void PropagateDownloadFile::downloadFinished()
            // If the file is locked, we want to retry this sync when it
            // becomes available again.
            if (FileSystem::isFileLocked(fn)) {
-                emit propagator()->seenLockedFile(fn);
+                emit _propagator->seenLockedFile(fn);
            }

            done(SyncFileItem::SoftError, renameError);
@@ -759,7 +759,7 @@ void PropagateDownloadFile::downloadFinished()
        const qint64 expectedSize = _item->log._other_size;
        const time_t expectedMtime = _item->log._other_modtime;
        if (! FileSystem::verifyFileUnchanged(fn, expectedSize, expectedMtime)) {
-            propagator()->_anotherSyncNeeded = true;
+            _propagator->_anotherSyncNeeded = true;
            done(SyncFileItem::SoftError, tr("File has changed since discovery"));
            return;
        }
@@ -769,13 +769,13 @@ void PropagateDownloadFile::downloadFinished()
    // Older server versions sometimes provide empty remote permissions
    // see #4450 - don't adjust the write permissions there.
    const int serverVersionGoodRemotePerm = 0x070000; // 7.0.0
-    if (propagator()->account()->serverVersionInt() >= serverVersionGoodRemotePerm) {
+    if (_propagator->account()->serverVersionInt() >= serverVersionGoodRemotePerm) {
        FileSystem::setFileReadOnlyWeak(_tmpFile.fileName(),
                                        !_item->_remotePerm.contains('W'));
    }

    QString error;
-    emit propagator()->touchedFile(fn);
+    emit _propagator->touchedFile(fn);
    // The fileChanged() check is done above to generate better error messages.
    if (!FileSystem::uncheckedRenameReplace(_tmpFile.fileName(), fn, &error)) {
        qDebug() << Q_FUNC_INFO << QString("Rename failed: %1 => %2").arg(_tmpFile.fileName()).arg(fn);
@@ -788,16 +788,16 @@ void PropagateDownloadFile::downloadFinished()
        // which makes it look like we're just about to initially download
        // it.
        if (isConflict) {
-            propagator()->_journal->deleteFileRecord(fn);
-            propagator()->_journal->commit("download finished");
+            _propagator->_journal->deleteFileRecord(fn);
+            _propagator->_journal->commit("download finished");
        }

        // If the file is locked, we want to retry this sync when it
        // becomes available again, otherwise try again directly
        if (FileSystem::isFileLocked(fn)) {
-            emit propagator()->seenLockedFile(fn);
+            emit _propagator->seenLockedFile(fn);
        } else {
-            propagator()->_anotherSyncNeeded = true;
+            _propagator->_anotherSyncNeeded = true;
        }

        done(SyncFileItem::SoftError, error);
@@ -809,19 +809,19 @@ void PropagateDownloadFile::downloadFinished()
    // Get up to date information for the journal.
    _item->_size = FileSystem::getSize(fn);

-    if (!propagator()->_journal->setFileRecord(SyncJournalFileRecord(*_item, fn))) {
+    if (!_propagator->_journal->setFileRecord(SyncJournalFileRecord(*_item, fn))) {
        done(SyncFileItem::FatalError, tr("Error writing metadata to the database"));
        return;
    }
-    propagator()->_journal->setDownloadInfo(_item->_file, SyncJournalDb::DownloadInfo());
-    propagator()->_journal->commit("download file start2");
+    _propagator->_journal->setDownloadInfo(_item->_file, SyncJournalDb::DownloadInfo());
+    _propagator->_journal->commit("download file start2");
    done(isConflict ? SyncFileItem::Conflict : SyncFileItem::Success);

    // handle the special recall file
    if(!_item->_remotePerm.contains("S")
            && (_item->_file == QLatin1String(".sys.admin#recall#")
                || _item->_file.endsWith("/.sys.admin#recall#"))) {
-        handleRecallFile(fn, propagator()->_localDir, *propagator()->_journal);
+        handleRecallFile(fn, _propagator->_localDir, *_propagator->_journal);
    }

    qint64 duration = _stopwatch.elapsed();
@@ -58,16 +58,16 @@ bool DeleteJob::finished()

 void PropagateRemoteDelete::start()
 {
-    if (propagator()->_abortRequested.fetchAndAddRelaxed(0))
+    if (_propagator->_abortRequested.fetchAndAddRelaxed(0))
        return;

    qDebug() << Q_FUNC_INFO << _item->_file;

-    _job = new DeleteJob(propagator()->account(),
-                         propagator()->_remoteFolder + _item->_file,
+    _job = new DeleteJob(_propagator->account(),
+                         _propagator->_remoteFolder + _item->_file,
                         this);
    connect(_job, SIGNAL(finishedSignal()), this, SLOT(slotDeleteJobFinished()));
-    propagator()->_activeJobList.append(this);
+    _propagator->_activeJobList.append(this);
    _job->start();
 }

@@ -79,7 +79,7 @@ void PropagateRemoteDelete::abort()

 void PropagateRemoteDelete::slotDeleteJobFinished()
 {
-    propagator()->_activeJobList.removeOne(this);
+    _propagator->_activeJobList.removeOne(this);

    Q_ASSERT(_job);

@@ -99,7 +99,7 @@ void PropagateRemoteDelete::slotDeleteJobFinished()
        }

        SyncFileItem::Status status = classifyError(err, _item->_httpErrorCode,
-                                                    &propagator()->_anotherSyncNeeded);
+                                                    &_propagator->_anotherSyncNeeded);
        done(status, _job->errorString());
        return;
    }
@@ -120,8 +120,8 @@ void PropagateRemoteDelete::slotDeleteJobFinished()
        return;
    }

-    propagator()->_journal->deleteFileRecord(_item->_originalFile, _item->_isDirectory);
-    propagator()->_journal->commit("Remote Remove");
+    _propagator->_journal->deleteFileRecord(_item->_originalFile, _item->_isDirectory);
+    _propagator->_journal->commit("Remote Remove");
    done(SyncFileItem::Success);
 }

@@ -23,19 +23,19 @@ namespace OCC {

 void PropagateRemoteMkdir::start()
 {
-    if (propagator()->_abortRequested.fetchAndAddRelaxed(0))
+    if (_propagator->_abortRequested.fetchAndAddRelaxed(0))
        return;

    qDebug() << Q_FUNC_INFO << _item->_file;

-    propagator()->_activeJobList.append(this);
+    _propagator->_activeJobList.append(this);

    if (!_deleteExisting) {
        return slotStartMkcolJob();
    }

-    _job = new DeleteJob(propagator()->account(),
-                         propagator()->_remoteFolder + _item->_file,
+    _job = new DeleteJob(_propagator->account(),
+                         _propagator->_remoteFolder + _item->_file,
                         this);
    connect(_job, SIGNAL(finishedSignal()), SLOT(slotStartMkcolJob()));
    _job->start();
@@ -43,13 +43,13 @@ void PropagateRemoteMkdir::start()

 void PropagateRemoteMkdir::slotStartMkcolJob()
 {
-    if (propagator()->_abortRequested.fetchAndAddRelaxed(0))
+    if (_propagator->_abortRequested.fetchAndAddRelaxed(0))
        return;

    qDebug() << Q_FUNC_INFO << _item->_file;

-    _job = new MkColJob(propagator()->account(),
-                        propagator()->_remoteFolder + _item->_file,
+    _job = new MkColJob(_propagator->account(),
+                        _propagator->_remoteFolder + _item->_file,
                        this);
    connect(_job, SIGNAL(finished(QNetworkReply::NetworkError)), this, SLOT(slotMkcolJobFinished()));
    _job->start();
@@ -68,7 +68,7 @@ void PropagateRemoteMkdir::setDeleteExisting(bool enabled)

 void PropagateRemoteMkdir::slotMkcolJobFinished()
 {
-    propagator()->_activeJobList.removeOne(this);
+    _propagator->_activeJobList.removeOne(this);

    Q_ASSERT(_job);

@@ -83,7 +83,7 @@ void PropagateRemoteMkdir::slotMkcolJobFinished()
        // This happens when the directory already exists. Nothing to do.
    } else if (err != QNetworkReply::NoError) {
        SyncFileItem::Status status = classifyError(err, _item->_httpErrorCode,
-                                                    &propagator()->_anotherSyncNeeded);
+                                                    &_propagator->_anotherSyncNeeded);
        auto errorString = _job->reply()->errorString();
        if (_job->reply()->hasRawHeader("OC-ErrorString")) {
            errorString = _job->reply()->rawHeader("OC-ErrorString");
@@ -109,7 +109,7 @@ void PropagateRemoteMkdir::slotMkcolJobFinished()
        // So we must get the file id using a PROPFIND
        // This is required so that we can detect moves even if the folder is renamed on the server
        // while files are still uploading
-        propagator()->_activeJobList.append(this);
+        _propagator->_activeJobList.append(this);
        auto propfindJob = new PropfindJob(_job->account(), _job->path(), this);
        propfindJob->setProperties(QList<QByteArray>() << "getetag" << "http://owncloud.org/ns:id");
        QObject::connect(propfindJob, SIGNAL(result(QVariantMap)), this, SLOT(propfindResult(QVariantMap)));
@@ -123,7 +123,7 @@ void PropagateRemoteMkdir::slotMkcolJobFinished()

 void PropagateRemoteMkdir::propfindResult(const QVariantMap &result)
 {
-    propagator()->_activeJobList.removeOne(this);
+    _propagator->_activeJobList.removeOne(this);
    if (result.contains("getetag")) {
        _item->_etag = result["getetag"].toByteArray();
    }
@@ -136,15 +136,15 @@ void PropagateRemoteMkdir::propfindResult(const QVariantMap &result)
 void PropagateRemoteMkdir::propfindError()
 {
    // ignore the PROPFIND error
-    propagator()->_activeJobList.removeOne(this);
+    _propagator->_activeJobList.removeOne(this);
    done(SyncFileItem::Success);
 }

 void PropagateRemoteMkdir::success()
 {
    // save the file id already so we can detect rename or remove
-    SyncJournalFileRecord record(*_item, propagator()->_localDir + _item->destination());
-    if (!propagator()->_journal->setFileRecord(record)) {
+    SyncJournalFileRecord record(*_item, _propagator->_localDir + _item->destination());
+    if (!_propagator->_journal->setFileRecord(record)) {
        done(SyncFileItem::FatalError, tr("Error writing metadata to the database"));
        return;
    }
@@ -71,12 +71,12 @@ bool MoveJob::finished()

 void PropagateRemoteMove::start()
 {
-    if (propagator()->_abortRequested.fetchAndAddRelaxed(0))
+    if (_propagator->_abortRequested.fetchAndAddRelaxed(0))
        return;

    qDebug() << Q_FUNC_INFO << _item->_file << _item->_renameTarget;

-    QString targetFile(propagator()->getFilePath(_item->_renameTarget));
+    QString targetFile(_propagator->getFilePath(_item->_renameTarget));

    if (_item->_file == _item->_renameTarget) {
        // The parent has been renamed already so there is nothing more to do.
@@ -87,11 +87,11 @@ void PropagateRemoteMove::start()
        // Before owncloud 7, there was no permissions system. At the time all the shared files were
        // in a directory called "Shared" and were not supposed to be moved, otherwise bad things happened

-        QString versionString = propagator()->account()->serverVersion();
+        QString versionString = _propagator->account()->serverVersion();
        if (versionString.contains('.') && versionString.split('.')[0].toInt() < 7) {
-            QString originalFile(propagator()->getFilePath(QLatin1String("Shared")));
-            emit propagator()->touchedFile(originalFile);
-            emit propagator()->touchedFile(targetFile);
+            QString originalFile(_propagator->getFilePath(QLatin1String("Shared")));
+            emit _propagator->touchedFile(originalFile);
+            emit _propagator->touchedFile(targetFile);
            QString renameError;
            if( FileSystem::rename(targetFile, originalFile, &renameError) ) {
                done(SyncFileItem::NormalError, tr("This folder must not be renamed. It is renamed back to its original name."));
@@ -102,13 +102,13 @@ void PropagateRemoteMove::start()
        }
    }

-    QString destination = QDir::cleanPath(propagator()->account()->url().path() + QLatin1Char('/')
-            + propagator()->account()->davPath() + propagator()->_remoteFolder + _item->_renameTarget);
-    _job = new MoveJob(propagator()->account(),
-                        propagator()->_remoteFolder + _item->_file,
+    QString destination = QDir::cleanPath(_propagator->account()->url().path() + QLatin1Char('/')
+            + _propagator->account()->davPath() + _propagator->_remoteFolder + _item->_renameTarget);
+    _job = new MoveJob(_propagator->account(),
+                        _propagator->_remoteFolder + _item->_file,
                        destination, this);
    connect(_job, SIGNAL(finishedSignal()), this, SLOT(slotMoveJobFinished()));
-    propagator()->_activeJobList.append(this);
+    _propagator->_activeJobList.append(this);
    _job->start();

 }
@@ -121,7 +121,7 @@ void PropagateRemoteMove::abort()

 void PropagateRemoteMove::slotMoveJobFinished()
 {
-    propagator()->_activeJobList.removeOne(this);
+    _propagator->_activeJobList.removeOne(this);

    Q_ASSERT(_job);

@@ -140,7 +140,7 @@ void PropagateRemoteMove::slotMoveJobFinished()
        }

        SyncFileItem::Status status = classifyError(err, _item->_httpErrorCode,
-                                                    &propagator()->_anotherSyncNeeded);
+                                                    &_propagator->_anotherSyncNeeded);
        done(status, _job->errorString());
        return;
    }
@@ -164,14 +164,14 @@ void PropagateRemoteMove::slotMoveJobFinished()
 void PropagateRemoteMove::finalize()
 {
    SyncJournalFileRecord oldRecord =
-            propagator()->_journal->getFileRecord(_item->_originalFile);
+            _propagator->_journal->getFileRecord(_item->_originalFile);
    // if reading from db failed still continue hoping that deleteFileRecord
    // reopens the db successfully.
    // The db is only queried to transfer the content checksum from the old
    // to the new record. It is not a problem to skip it here.
-    propagator()->_journal->deleteFileRecord(_item->_originalFile);
+    _propagator->_journal->deleteFileRecord(_item->_originalFile);

-    SyncJournalFileRecord record(*_item, propagator()->getFilePath(_item->_renameTarget));
+    SyncJournalFileRecord record(*_item, _propagator->getFilePath(_item->_renameTarget));
    record._path = _item->_renameTarget;
    if (oldRecord.isValid()) {
        record._contentChecksum = oldRecord._contentChecksum;
@@ -182,19 +182,19 @@ void PropagateRemoteMove::finalize()
        }
    }

-    if (!propagator()->_journal->setFileRecord(record)) {
+    if (!_propagator->_journal->setFileRecord(record)) {
        done(SyncFileItem::FatalError, tr("Error writing metadata to the database"));
        return;
    }

    if (_item->_isDirectory) {
-        if (!adjustSelectiveSync(propagator()->_journal, _item->_file, _item->_renameTarget)) {
+        if (!adjustSelectiveSync(_propagator->_journal, _item->_file, _item->_renameTarget)) {
            done(SyncFileItem::FatalError, tr("Error writing metadata to the database"));
            return;
        }
    }

-    propagator()->_journal->commit("Remote Rename");
+    _propagator->_journal->commit("Remote Rename");
    done(SyncFileItem::Success);
 }

@@ -193,18 +193,18 @@ void PropagateUploadFileCommon::setDeleteExisting(bool enabled)

 void PropagateUploadFileCommon::start()
 {
-    if (propagator()->_abortRequested.fetchAndAddRelaxed(0)) {
+    if (_propagator->_abortRequested.fetchAndAddRelaxed(0)) {
        return;
    }

-    propagator()->_activeJobList.append(this);
+    _propagator->_activeJobList.append(this);

    if (!_deleteExisting) {
        return slotComputeContentChecksum();
    }

-    auto job = new DeleteJob(propagator()->account(),
-                             propagator()->_remoteFolder + _item->_file,
+    auto job = new DeleteJob(_propagator->account(),
+                             _propagator->_remoteFolder + _item->_file,
                             this);
    _jobs.append(job);
    connect(job, SIGNAL(finishedSignal()), SLOT(slotComputeContentChecksum()));
@@ -214,11 +214,11 @@ void PropagateUploadFileCommon::start()

 void PropagateUploadFileCommon::slotComputeContentChecksum()
 {
-    if (propagator()->_abortRequested.fetchAndAddRelaxed(0)) {
+    if (_propagator->_abortRequested.fetchAndAddRelaxed(0)) {
        return;
    }

-    const QString filePath = propagator()->getFilePath(_item->_file);
+    const QString filePath = _propagator->getFilePath(_item->_file);

    // remember the modtime before checksumming to be able to detect a file
    // change during the checksum calculation
@@ -256,7 +256,7 @@ void PropagateUploadFileCommon::slotComputeTransmissionChecksum(const QByteArray

    // Reuse the content checksum as the transmission checksum if possible
    const auto supportedTransmissionChecksums =
-            propagator()->account()->capabilities().supportedChecksumTypes();
+            _propagator->account()->capabilities().supportedChecksumTypes();
    if (supportedTransmissionChecksums.contains(contentChecksumType)) {
        slotStartUpload(contentChecksumType, contentChecksum);
        return;
@@ -265,7 +265,7 @@ void PropagateUploadFileCommon::slotComputeTransmissionChecksum(const QByteArray
    // Compute the transmission checksum.
    auto computeChecksum = new ComputeChecksum(this);
    if (uploadChecksumEnabled()) {
-        computeChecksum->setChecksumType(propagator()->account()->capabilities().uploadChecksumType());
+        computeChecksum->setChecksumType(_propagator->account()->capabilities().uploadChecksumType());
    } else {
        computeChecksum->setChecksumType(QByteArray());
    }
@@ -274,7 +274,7 @@ void PropagateUploadFileCommon::slotComputeTransmissionChecksum(const QByteArray
            SLOT(slotStartUpload(QByteArray,QByteArray)));
    connect(computeChecksum, SIGNAL(done(QByteArray,QByteArray)),
            computeChecksum, SLOT(deleteLater()));
-    const QString filePath = propagator()->getFilePath(_item->_file);
+    const QString filePath = _propagator->getFilePath(_item->_file);
    computeChecksum->start(filePath);
 }

@@ -282,7 +282,7 @@ void PropagateUploadFileCommon::slotStartUpload(const QByteArray& transmissionCh
 {
    // Remove ourselfs from the list of active job, before any posible call to done()
    // When we start chunks, we will add it again, once for every chunks.
-    propagator()->_activeJobList.removeOne(this);
+    _propagator->_activeJobList.removeOne(this);

    _transmissionChecksum = transmissionChecksum;
    _transmissionChecksumType = transmissionChecksumType;
@@ -293,7 +293,7 @@ void PropagateUploadFileCommon::slotStartUpload(const QByteArray& transmissionCh
        _item->_contentChecksumType = transmissionChecksumType;
    }

-    const QString fullFilePath = propagator()->getFilePath(_item->_file);
+    const QString fullFilePath = _propagator->getFilePath(_item->_file);

    if (!FileSystem::fileExists(fullFilePath)) {
        done(SyncFileItem::SoftError, tr("File Removed"));
@@ -307,7 +307,7 @@ void PropagateUploadFileCommon::slotStartUpload(const QByteArray& transmissionCh

    _item->_modtime = FileSystem::getModTime(fullFilePath);
    if( prevModtime != _item->_modtime ) {
-        propagator()->_anotherSyncNeeded = true;
+        _propagator->_anotherSyncNeeded = true;
        done(SyncFileItem::SoftError, tr("Local file changed during syncing. It will be resumed."));
        return;
    }
@@ -319,7 +319,7 @@ void PropagateUploadFileCommon::slotStartUpload(const QByteArray& transmissionCh
    // That usually indicates a file that is still being changed
    // or not yet fully copied to the destination.
    if (fileIsStillChanging(*_item)) {
-        propagator()->_anotherSyncNeeded = true;
+        _propagator->_anotherSyncNeeded = true;
        done(SyncFileItem::SoftError, tr("Local file changed during sync."));
        return;
    }
@@ -464,16 +464,16 @@ void UploadDevice::setChoked(bool b) {

 void PropagateUploadFileCommon::startPollJob(const QString& path)
 {
-    PollJob* job = new PollJob(propagator()->account(), path, _item,
-                               propagator()->_journal, propagator()->_localDir, this);
+    PollJob* job = new PollJob(_propagator->account(), path, _item,
+                               _propagator->_journal, _propagator->_localDir, this);
    connect(job, SIGNAL(finishedSignal()), SLOT(slotPollFinished()));
    SyncJournalDb::PollInfo info;
    info._file = _item->_file;
    info._url = path;
    info._modtime = _item->_modtime;
-    propagator()->_journal->setPollInfo(info);
-    propagator()->_journal->commit("add poll info");
-    propagator()->_activeJobList.append(this);
+    _propagator->_journal->setPollInfo(info);
+    _propagator->_journal->commit("add poll info");
+    _propagator->_activeJobList.append(this);
    job->start();
 }

@@ -482,7 +482,7 @@ void PropagateUploadFileCommon::slotPollFinished()
    PollJob *job = qobject_cast<PollJob *>(sender());
    Q_ASSERT(job);

-    propagator()->_activeJobList.removeOne(this);
+    _propagator->_activeJobList.removeOne(this);

    if (job->_item->_status != SyncFileItem::Success) {
        _finished = true;
@@ -493,27 +493,6 @@ void PropagateUploadFileCommon::slotPollFinished()
    finalize();
 }

-void PropagateUploadFileCommon::checkResettingErrors()
-{
-    if (_item->_httpErrorCode == 412
-            || propagator()->account()->capabilities().httpErrorCodesThatResetFailingChunkedUploads()
-                   .contains(_item->_httpErrorCode)) {
-        auto uploadInfo = propagator()->_journal->getUploadInfo(_item->_file);
-        uploadInfo._errorCount += 1;
-        if (uploadInfo._errorCount > 3) {
-            qDebug() << "Reset transfer of" << _item->_file
-                     << "due to repeated error" << _item->_httpErrorCode;
-            uploadInfo = SyncJournalDb::UploadInfo();
-        } else {
-            qDebug() << "Error count for maybe-reset error" << _item->_httpErrorCode
-                     << "on file" << _item->_file
-                     << "is" << uploadInfo._errorCount;
-        }
-        propagator()->_journal->setUploadInfo(_item->_file, uploadInfo);
-        propagator()->_journal->commit("Upload info");
-    }
-}
-
 void PropagateUploadFileCommon::slotJobDestroyed(QObject* job)
 {
    _jobs.erase(std::remove(_jobs.begin(), _jobs.end(), job) , _jobs.end());
@@ -572,13 +551,13 @@ void PropagateUploadFileCommon::finalize()
    _item->_requestDuration = _duration.elapsed();
    _finished = true;

-    if (!propagator()->_journal->setFileRecord(SyncJournalFileRecord(*_item, propagator()->getFilePath(_item->_file)))) {
+    if (!_propagator->_journal->setFileRecord(SyncJournalFileRecord(*_item, _propagator->getFilePath(_item->_file)))) {
        done(SyncFileItem::FatalError, tr("Error writing metadata to the database"));
        return;
    }
    // Remove from the progress database:
-    propagator()->_journal->setUploadInfo(_item->_file, SyncJournalDb::UploadInfo());
-    propagator()->_journal->commit("upload file start");
+    _propagator->_journal->setUploadInfo(_item->_file, SyncJournalDb::UploadInfo());
+    _propagator->_journal->commit("upload file start");

    done(SyncFileItem::Success);
 }
@@ -232,13 +232,6 @@ private slots:
    void slotPollFinished();

 protected:
-    /**
-     * Checks whether the current error is one that should reset the whole
-     * transfer if it happens too often. If so: Bump UploadInfo::errorCount
-     * and maybe perform the reset.
-     */
-    void checkResettingErrors();
-
    // Bases headers that need to be sent with every chunk
    QMap<QByteArray, QByteArray> headers();

@@ -269,7 +262,7 @@ private:
    int _chunkCount; /// Total number of chunks for this file
    int _transferId; /// transfer id (part of the url)

-    quint64 chunkSize() const { return propagator()->chunkSize(); }
+    quint64 chunkSize() const { return _propagator->chunkSize(); }


 public:
@@ -302,7 +295,7 @@ private:
    // (Only used from slotPropfindIterate/slotPropfindFinished because the LsColJob use signals to report data.)
    QMap<int, quint64> _serverChunks;

-    quint64 chunkSize() const { return propagator()->chunkSize(); }
+    quint64 chunkSize() const { return _propagator->chunkSize(); }
    /**
     * Return the URL of a chunk.
     * If chunk == -1, returns the URL of the parent folder containing the chunks
@@ -38,12 +38,12 @@ namespace OCC {
 QUrl PropagateUploadFileNG::chunkUrl(int chunk)
 {
    QString path = QLatin1String("remote.php/dav/uploads/")
-        + propagator()->account()->davUser()
+        + _propagator->account()->davUser()
        + QLatin1Char('/') + QString::number(_transferId);
    if (chunk >= 0) {
        path += QLatin1Char('/') + QString::number(chunk);
    }
-    return Utility::concatUrlPath(propagator()->account()->url(), path);
+    return Utility::concatUrlPath(_propagator->account()->url(), path);
 }

 /*
@@ -80,13 +80,13 @@ QUrl PropagateUploadFileNG::chunkUrl(int chunk)
 void PropagateUploadFileNG::doStartUpload()
 {
    _duration.start();
-    propagator()->_activeJobList.append(this);
+    _propagator->_activeJobList.append(this);

-    const SyncJournalDb::UploadInfo progressInfo = propagator()->_journal->getUploadInfo(_item->_file);
+    const SyncJournalDb::UploadInfo progressInfo = _propagator->_journal->getUploadInfo(_item->_file);
    if (progressInfo._valid && Utility::qDateTimeToTime_t(progressInfo._modtime) == _item->_modtime ) {
        _transferId = progressInfo._transferid;
        auto url = chunkUrl();
-        auto job = new LsColJob(propagator()->account(), url, this);
+        auto job = new LsColJob(_propagator->account(), url, this);
        _jobs.append(job);
        job->setProperties(QList<QByteArray>() << "resourcetype" << "getcontentlength");
        connect(job, SIGNAL(finishedWithoutError()), this, SLOT(slotPropfindFinished()));
@@ -118,7 +118,7 @@ void PropagateUploadFileNG::slotPropfindFinished()
 {
    auto job = qobject_cast<LsColJob *>(sender());
    slotJobDestroyed(job); // remove it from the _jobs list
-    propagator()->_activeJobList.removeOne(this);
+    _propagator->_activeJobList.removeOne(this);

    _currentChunk = 0;
    _sent = 0;
@@ -142,19 +142,18 @@ void PropagateUploadFileNG::slotPropfindFinished()

    if (!_serverChunks.isEmpty()) {
        qDebug() << "To Delete" << _serverChunks;
-        propagator()->_activeJobList.append(this);
+        _propagator->_activeJobList.append(this);
        _removeJobError = false;

        // Make sure that if there is a "hole" and then a few more chunks, on the server
        // we should remove the later chunks. Otherwise when we do dynamic chunk sizing, we may end up
        // with corruptions if there are too many chunks, or if we abort and there are still stale chunks.
        for (auto it = _serverChunks.begin(); it != _serverChunks.end(); ++it) {
-            auto job = new DeleteJob(propagator()->account(), Utility::concatUrlPath(chunkUrl(), QString::number(it.key())), this);
+            auto job = new DeleteJob(_propagator->account(), Utility::concatUrlPath(chunkUrl(), QString::number(it.key())), this);
            QObject::connect(job, SIGNAL(finishedSignal()), this, SLOT(slotDeleteJobFinished()));
            _jobs.append(job);
            job->start();
        }
-        _serverChunks.clear();
        return;
    }

@@ -167,9 +166,9 @@ void PropagateUploadFileNG::slotPropfindFinishedWithError()
    slotJobDestroyed(job); // remove it from the _jobs list
    QNetworkReply::NetworkError err = job->reply()->error();
    auto httpErrorCode = job->reply()->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
-    auto status = classifyError(err, httpErrorCode, &propagator()->_anotherSyncNeeded);
+    auto status = classifyError(err, httpErrorCode, &_propagator->_anotherSyncNeeded);
    if (status == SyncFileItem::FatalError) {
-        propagator()->_activeJobList.removeOne(this);
+        _propagator->_activeJobList.removeOne(this);
        QString errorString = errorMessage(job->reply()->errorString(), job->reply()->readAll());
        abortWithError(status, errorString);
        return;
@@ -198,7 +197,7 @@ void PropagateUploadFileNG::slotDeleteJobFinished()
    }

    if (_jobs.isEmpty()) {
-        propagator()->_activeJobList.removeOne(this);
+        _propagator->_activeJobList.removeOne(this);
        if (_removeJobError) {
            // There was an error removing some files, just start over
            startNewUpload();
@@ -212,7 +211,7 @@ void PropagateUploadFileNG::slotDeleteJobFinished()

 void PropagateUploadFileNG::startNewUpload()
 {
-    Q_ASSERT(propagator()->_activeJobList.count(this) == 1);
+    Q_ASSERT(_propagator->_activeJobList.count(this) == 1);
    _transferId = qrand() ^ _item->_modtime ^ (_item->_size << 16) ^ qHash(_item->_file);
    _sent = 0;
    _currentChunk = 0;
@@ -223,11 +222,11 @@ void PropagateUploadFileNG::startNewUpload()
    pi._valid = true;
    pi._transferid = _transferId;
    pi._modtime =  Utility::qDateTimeFromTime_t(_item->_modtime);
-    propagator()->_journal->setUploadInfo(_item->_file, pi);
-    propagator()->_journal->commit("Upload info");
+    _propagator->_journal->setUploadInfo(_item->_file, pi);
+    _propagator->_journal->commit("Upload info");
    QMap<QByteArray, QByteArray> headers;
    headers["OC-Total-Length"] = QByteArray::number(_item->_size);
-    auto job = new MkColJob(propagator()->account(), chunkUrl(), headers, this);
+    auto job = new MkColJob(_propagator->account(), chunkUrl(), headers, this);

    connect(job, SIGNAL(finished(QNetworkReply::NetworkError)),
            this, SLOT(slotMkColFinished(QNetworkReply::NetworkError)));
@@ -237,7 +236,7 @@ void PropagateUploadFileNG::startNewUpload()

 void PropagateUploadFileNG::slotMkColFinished(QNetworkReply::NetworkError)
 {
-    propagator()->_activeJobList.removeOne(this);
+    _propagator->_activeJobList.removeOne(this);
    auto job = qobject_cast<MkColJob *>(sender());
    slotJobDestroyed(job); // remove it from the _jobs list
    QNetworkReply::NetworkError err = job->reply()->error();
@@ -245,7 +244,7 @@ void PropagateUploadFileNG::slotMkColFinished(QNetworkReply::NetworkError)

    if (err != QNetworkReply::NoError || _item->_httpErrorCode != 201) {
        SyncFileItem::Status status = classifyError(err, _item->_httpErrorCode,
-                                                    &propagator()->_anotherSyncNeeded);
+                                                    &_propagator->_anotherSyncNeeded);
        QString errorString = errorMessage(job->reply()->errorString(), job->reply()->readAll());
        if (job->reply()->hasRawHeader("OC-ErrorString")) {
            errorString = job->reply()->rawHeader("OC-ErrorString");
@@ -258,7 +257,7 @@ void PropagateUploadFileNG::slotMkColFinished(QNetworkReply::NetworkError)

 void PropagateUploadFileNG::startNextChunk()
 {
-    if (propagator()->_abortRequested.fetchAndAddRelaxed(0))
+    if (_propagator->_abortRequested.fetchAndAddRelaxed(0))
        return;

    quint64 fileSize = _item->_size;
@@ -269,8 +268,8 @@ void PropagateUploadFileNG::startNextChunk()
        Q_ASSERT(_jobs.isEmpty()); // There should be no running job anymore
        _finished = true;
        // Finish with a MOVE
-        QString destination = QDir::cleanPath(propagator()->account()->url().path() + QLatin1Char('/')
-            + propagator()->account()->davPath() + propagator()->_remoteFolder + _item->_file);
+        QString destination = QDir::cleanPath(_propagator->account()->url().path() + QLatin1Char('/')
+            + _propagator->account()->davPath() + _propagator->_remoteFolder + _item->_file);
        auto headers = PropagateUploadFileCommon::headers();

        // "If-Match applies to the source, but we are interested in comparing the etag of the destination
@@ -283,18 +282,18 @@ void PropagateUploadFileNG::startNextChunk()
                _transmissionChecksumType, _transmissionChecksum);
        }

-        auto job = new MoveJob(propagator()->account(), Utility::concatUrlPath(chunkUrl(), "/.file"),
+        auto job = new MoveJob(_propagator->account(), Utility::concatUrlPath(chunkUrl(), "/.file"),
                               destination, headers, this);
        _jobs.append(job);
        connect(job, SIGNAL(finishedSignal()), this, SLOT(slotMoveJobFinished()));
        connect(job, SIGNAL(destroyed(QObject*)), this, SLOT(slotJobDestroyed(QObject*)));
-        propagator()->_activeJobList.append(this);
+        _propagator->_activeJobList.append(this);
        job->start();
        return;
    }

-    auto device = new UploadDevice(&propagator()->_bandwidthManager);
-    const QString fileName = propagator()->getFilePath(_item->_file);
+    auto device = new UploadDevice(&_propagator->_bandwidthManager);
+    const QString fileName = _propagator->getFilePath(_item->_file);

    if (! device->prepareAndOpen(fileName, _sent, currentChunkSize)) {
        qDebug() << "ERR: Could not prepare upload device: " << device->errorString();
@@ -302,7 +301,7 @@ void PropagateUploadFileNG::startNextChunk()
        // If the file is currently locked, we want to retry the sync
        // when it becomes available again.
        if (FileSystem::isFileLocked(fileName)) {
-            emit propagator()->seenLockedFile(fileName);
+            emit _propagator->seenLockedFile(fileName);
        }
        // Soft error because this is likely caused by the user modifying his files while syncing
        abortWithError( SyncFileItem::SoftError, device->errorString() );
@@ -316,7 +315,7 @@ void PropagateUploadFileNG::startNextChunk()
    QUrl url = chunkUrl(_currentChunk);

    // job takes ownership of device via a QScopedPointer. Job deletes itself when finishing
-    PUTFileJob* job = new PUTFileJob(propagator()->account(), url, device, headers, _currentChunk, this);
+    PUTFileJob* job = new PUTFileJob(_propagator->account(), url, device, headers, _currentChunk, this);
    _jobs.append(job);
    connect(job, SIGNAL(finishedSignal()), this, SLOT(slotPutFinished()));
    connect(job, SIGNAL(uploadProgress(qint64,qint64)),
@@ -325,7 +324,7 @@ void PropagateUploadFileNG::startNextChunk()
            device, SLOT(slotJobUploadProgress(qint64,qint64)));
    connect(job, SIGNAL(destroyed(QObject*)), this, SLOT(slotJobDestroyed(QObject*)));
    job->start();
-    propagator()->_activeJobList.append(this);
+    _propagator->_activeJobList.append(this);
    _currentChunk++;

    // FIXME! parallel chunk?
@@ -344,7 +343,7 @@ void PropagateUploadFileNG::slotPutFinished()
             << job->reply()->attribute(QNetworkRequest::HttpStatusCodeAttribute)
             << job->reply()->attribute(QNetworkRequest::HttpReasonPhraseAttribute);

-    propagator()->_activeJobList.removeOne(this);
+    _propagator->_activeJobList.removeOne(this);

    if (_finished) {
        // We have sent the finished signal already. We don't need to handle any remaining jobs
@@ -358,7 +357,7 @@ void PropagateUploadFileNG::slotPutFinished()
        // Abort the job and try again later.
        // This works around a bug in QNAM wich might reuse a non-empty buffer for the next request.
        qDebug() << "Forcing job abort on HTTP connection reset with Qt < 5.4.2.";
-        propagator()->_anotherSyncNeeded = true;
+        _propagator->_anotherSyncNeeded = true;
        abortWithError(SyncFileItem::SoftError, tr("Forcing job abort on HTTP connection reset with Qt < 5.4.2."));
        return;
    }
@@ -374,11 +373,16 @@ void PropagateUploadFileNG::slotPutFinished()
            errorString = job->reply()->rawHeader("OC-ErrorString");
        }

-        // Ensure errors that should eventually reset the chunked upload are tracked.
-        checkResettingErrors();
+        // FIXME!  can this happen for the chunks?
+        if (_item->_httpErrorCode == 412) {
+            // Precondition Failed:   Maybe the bad etag is in the database, we need to clear the
+            // parent folder etag so we won't read from DB next sync.
+            _propagator->_journal->avoidReadFromDbOnNextSync(_item->_file);
+            _propagator->_anotherSyncNeeded = true;
+        }

        SyncFileItem::Status status = classifyError(err, _item->_httpErrorCode,
-                                                    &propagator()->_anotherSyncNeeded);
+                                                    &_propagator->_anotherSyncNeeded);
        abortWithError(status, errorString);
        return;
    }
@@ -387,19 +391,19 @@ void PropagateUploadFileNG::slotPutFinished()
    bool finished = _sent == _item->_size;

    // Check if the file still exists
-    const QString fullFilePath(propagator()->getFilePath(_item->_file));
+    const QString fullFilePath(_propagator->getFilePath(_item->_file));
    if( !FileSystem::fileExists(fullFilePath) ) {
        if (!finished) {
            abortWithError(SyncFileItem::SoftError, tr("The local file was removed during sync."));
            return;
        } else {
-            propagator()->_anotherSyncNeeded = true;
+            _propagator->_anotherSyncNeeded = true;
        }
    }

    // Check whether the file changed since discovery.
    if (! FileSystem::verifyFileUnchanged(fullFilePath, _item->_size, _item->_modtime)) {
-        propagator()->_anotherSyncNeeded = true;
+        _propagator->_anotherSyncNeeded = true;
        if( !finished ) {
            abortWithError(SyncFileItem::SoftError, tr("Local file changed during sync."));
            return;
@@ -409,42 +413,24 @@ void PropagateUploadFileNG::slotPutFinished()
    if (!finished) {
        // Deletes an existing blacklist entry on successful chunk upload
        if (_item->_hasBlacklistEntry) {
-            propagator()->_journal->wipeErrorBlacklistEntry(_item->_file);
+            _propagator->_journal->wipeErrorBlacklistEntry(_item->_file);
            _item->_hasBlacklistEntry = false;
        }
-
-        // Reset the error count on successful chunk upload
-        auto uploadInfo = propagator()->_journal->getUploadInfo(_item->_file);
-        uploadInfo._errorCount = 0;
-        propagator()->_journal->setUploadInfo(_item->_file, uploadInfo);
-        propagator()->_journal->commit("Upload info");
    }
    startNextChunk();
 }

 void PropagateUploadFileNG::slotMoveJobFinished()
 {
-    propagator()->_activeJobList.removeOne(this);
+    _propagator->_activeJobList.removeOne(this);
    auto job = qobject_cast<MoveJob *>(sender());
    slotJobDestroyed(job); // remove it from the _jobs list
    QNetworkReply::NetworkError err = job->reply()->error();
    _item->_httpErrorCode = job->reply()->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();

    if (err != QNetworkReply::NoError) {
-        if (_item->_httpErrorCode == 412) {
-            // Precondition Failed: Either an etag or a checksum mismatch.
-
-            // Maybe the bad etag is in the database, we need to clear the
-            // parent folder etag so we won't read from DB next sync.
-            propagator()->_journal->avoidReadFromDbOnNextSync(_item->_file);
-            propagator()->_anotherSyncNeeded = true;
-        }
-
-        // Ensure errors that should eventually reset the chunked upload are tracked.
-        checkResettingErrors();
-
        SyncFileItem::Status status = classifyError(err, _item->_httpErrorCode,
-                                                    &propagator()->_anotherSyncNeeded);
+                                                    &_propagator->_anotherSyncNeeded);
        QString errorString = errorMessage(job->errorString(), job->reply()->readAll());
        abortWithError(status, errorString);
        return;
@@ -40,7 +40,7 @@ void PropagateUploadFileV1::doStartUpload()
    _startChunk = 0;
    _transferId = qrand() ^ _item->_modtime ^ (_item->_size << 16);

-    const SyncJournalDb::UploadInfo progressInfo = propagator()->_journal->getUploadInfo(_item->_file);
+    const SyncJournalDb::UploadInfo progressInfo = _propagator->_journal->getUploadInfo(_item->_file);

    if (progressInfo._valid && Utility::qDateTimeToTime_t(progressInfo._modtime) == _item->_modtime ) {
        _startChunk = progressInfo._chunk;
@@ -57,7 +57,7 @@ void PropagateUploadFileV1::doStartUpload()

 void PropagateUploadFileV1::startNextChunk()
 {
-    if (propagator()->_abortRequested.fetchAndAddRelaxed(0))
+    if (_propagator->_abortRequested.fetchAndAddRelaxed(0))
        return;

    if (! _jobs.isEmpty() &&  _currentChunk + _startChunk >= _chunkCount - 1) {
@@ -75,7 +75,7 @@ void PropagateUploadFileV1::startNextChunk()

    QString path = _item->_file;

-    UploadDevice *device = new UploadDevice(&propagator()->_bandwidthManager);
+    UploadDevice *device = new UploadDevice(&_propagator->_bandwidthManager);
    qint64 chunkStart = 0;
    qint64 currentChunkSize = fileSize;
    bool isFinalChunk = false;
@@ -101,21 +101,20 @@ void PropagateUploadFileV1::startNextChunk()
        // if there's only one chunk, it's the final one
        isFinalChunk = true;
    }
-    qDebug() << _chunkCount << isFinalChunk << chunkStart << currentChunkSize;

    if (isFinalChunk && !_transmissionChecksumType.isEmpty()) {
        headers[checkSumHeaderC] = makeChecksumHeader(
                _transmissionChecksumType, _transmissionChecksum);
    }

-    const QString fileName = propagator()->getFilePath(_item->_file);
+    const QString fileName = _propagator->getFilePath(_item->_file);
    if (! device->prepareAndOpen(fileName, chunkStart, currentChunkSize)) {
        qDebug() << "ERR: Could not prepare upload device: " << device->errorString();

        // If the file is currently locked, we want to retry the sync
        // when it becomes available again.
        if (FileSystem::isFileLocked(fileName)) {
-            emit propagator()->seenLockedFile(fileName);
+            emit _propagator->seenLockedFile(fileName);
        }
        // Soft error because this is likely caused by the user modifying his files while syncing
        abortWithError( SyncFileItem::SoftError, device->errorString() );
@@ -124,43 +123,36 @@ void PropagateUploadFileV1::startNextChunk()
    }

    // job takes ownership of device via a QScopedPointer. Job deletes itself when finishing
-    PUTFileJob* job = new PUTFileJob(propagator()->account(), propagator()->_remoteFolder + path, device, headers, _currentChunk, this);
+    PUTFileJob* job = new PUTFileJob(_propagator->account(), _propagator->_remoteFolder + path, device, headers, _currentChunk, this);
    _jobs.append(job);
    connect(job, SIGNAL(finishedSignal()), this, SLOT(slotPutFinished()));
    connect(job, SIGNAL(uploadProgress(qint64,qint64)), this, SLOT(slotUploadProgress(qint64,qint64)));
    connect(job, SIGNAL(uploadProgress(qint64,qint64)), device, SLOT(slotJobUploadProgress(qint64,qint64)));
    connect(job, SIGNAL(destroyed(QObject*)), this, SLOT(slotJobDestroyed(QObject*)));
    job->start();
-    propagator()->_activeJobList.append(this);
+    _propagator->_activeJobList.append(this);
    _currentChunk++;

    bool parallelChunkUpload = true;
-
-    if (propagator()->account()->capabilities().chunkingParallelUploadDisabled()) {
-        // Server may also disable parallel chunked upload for any higher version
-        parallelChunkUpload = false;
+    QByteArray env = qgetenv("OWNCLOUD_PARALLEL_CHUNK");
+    if (!env.isEmpty()) {
+        parallelChunkUpload = env != "false" && env != "0";
    } else {
-        QByteArray env = qgetenv("OWNCLOUD_PARALLEL_CHUNK");
-        if (!env.isEmpty()) {
-            parallelChunkUpload = env != "false" && env != "0";
-        } else {
-            int versionNum = propagator()->account()->serverVersionInt();
-            if (versionNum < 0x080003) {
-                // Disable parallel chunk upload severs older than 8.0.3 to avoid too many
-                // internal sever errors (#2743, #2938)
-                parallelChunkUpload = false;
-            }
+        int versionNum = _propagator->account()->serverVersionInt();
+        if (versionNum < 0x080003) {
+            // Disable parallel chunk upload severs older than 8.0.3 to avoid too many
+            // internal sever errors (#2743, #2938)
+            parallelChunkUpload = false;
        }
    }

-
    if (_currentChunk + _startChunk >= _chunkCount - 1) {
        // Don't do parallel upload of chunk if this might be the last chunk because the server cannot handle that
        // https://github.com/owncloud/core/issues/11106
        parallelChunkUpload = false;
    }

-    if (parallelChunkUpload && (propagator()->_activeJobList.count() < propagator()->maximumActiveJob())
+    if (parallelChunkUpload && (_propagator->_activeJobList.count() < _propagator->maximumActiveJob())
            && _currentChunk < _chunkCount ) {
        startNextChunk();
    }
@@ -181,7 +173,7 @@ void PropagateUploadFileV1::slotPutFinished()
             << job->reply()->attribute(QNetworkRequest::HttpStatusCodeAttribute)
             << job->reply()->attribute(QNetworkRequest::HttpReasonPhraseAttribute);

-    propagator()->_activeJobList.removeOne(this);
+    _propagator->_activeJobList.removeOne(this);

    if (_finished) {
        // We have sent the finished signal already. We don't need to handle any remaining jobs
@@ -194,7 +186,7 @@ void PropagateUploadFileV1::slotPutFinished()
    if (err == QNetworkReply::OperationCanceledError && job->reply()->property("owncloud-should-soft-cancel").isValid()) {        // Abort the job and try again later.
        // This works around a bug in QNAM wich might reuse a non-empty buffer for the next request.
        qDebug() << "Forcing job abort on HTTP connection reset with Qt < 5.4.2.";
-        propagator()->_anotherSyncNeeded = true;
+        _propagator->_anotherSyncNeeded = true;
        abortWithError(SyncFileItem::SoftError, tr("Forcing job abort on HTTP connection reset with Qt < 5.4.2."));
        return;
    }
@@ -216,19 +208,14 @@ void PropagateUploadFileV1::slotPutFinished()
        }

        if (_item->_httpErrorCode == 412) {
-            // Precondition Failed: Either an etag or a checksum mismatch.
-
-            // Maybe the bad etag is in the database, we need to clear the
+            // Precondition Failed:   Maybe the bad etag is in the database, we need to clear the
            // parent folder etag so we won't read from DB next sync.
-            propagator()->_journal->avoidReadFromDbOnNextSync(_item->_file);
-            propagator()->_anotherSyncNeeded = true;
+            _propagator->_journal->avoidReadFromDbOnNextSync(_item->_file);
+            _propagator->_anotherSyncNeeded = true;
        }

-        // Ensure errors that should eventually reset the chunked upload are tracked.
-        checkResettingErrors();
-
        SyncFileItem::Status status = classifyError(err, _item->_httpErrorCode,
-                                                    &propagator()->_anotherSyncNeeded);
+                                                    &_propagator->_anotherSyncNeeded);
        abortWithError(status, errorString);
        return;
    }
@@ -259,19 +246,19 @@ void PropagateUploadFileV1::slotPutFinished()
    bool finished = etag.length() > 0;

    // Check if the file still exists
-    const QString fullFilePath(propagator()->getFilePath(_item->_file));
+    const QString fullFilePath(_propagator->getFilePath(_item->_file));
    if( !FileSystem::fileExists(fullFilePath) ) {
        if (!finished) {
            abortWithError(SyncFileItem::SoftError, tr("The local file was removed during sync."));
            return;
        } else {
-            propagator()->_anotherSyncNeeded = true;
+            _propagator->_anotherSyncNeeded = true;
        }
    }

    // Check whether the file changed since discovery.
    if (! FileSystem::verifyFileUnchanged(fullFilePath, _item->_size, _item->_modtime)) {
-        propagator()->_anotherSyncNeeded = true;
+        _propagator->_anotherSyncNeeded = true;
        if( !finished ) {
            abortWithError(SyncFileItem::SoftError, tr("Local file changed during sync."));
            // FIXME:  the legacy code was retrying for a few seconds.
@@ -294,7 +281,7 @@ void PropagateUploadFileV1::slotPutFinished()

        // Deletes an existing blacklist entry on successful chunk upload
        if (_item->_hasBlacklistEntry) {
-            propagator()->_journal->wipeErrorBlacklistEntry(_item->_file);
+            _propagator->_journal->wipeErrorBlacklistEntry(_item->_file);
            _item->_hasBlacklistEntry = false;
        }

@@ -310,9 +297,8 @@ void PropagateUploadFileV1::slotPutFinished()
        pi._chunk = (currentChunk + _startChunk + 1) % _chunkCount ; // next chunk to start with
        pi._transferid = _transferId;
        pi._modtime =  Utility::qDateTimeFromTime_t(_item->_modtime);
-        pi._errorCount = 0; // successful chunk upload resets
-        propagator()->_journal->setUploadInfo(_item->_file, pi);
-        propagator()->_journal->commit("Upload info");
+        _propagator->_journal->setUploadInfo(_item->_file, pi);
+        _propagator->_journal->commit("Upload info");
        startNextChunk();
        return;
    }
@@ -46,12 +46,12 @@ namespace OCC {
 * in the database.  But in case of error, we need to remove the entries from the database of the files
 * that were deleted.
 *
- * \a path is relative to propagator()->_localDir + _item->_file and should start with a slash
+ * \a path is relative to _propagator->_localDir + _item->_file and should start with a slash
 */
 bool PropagateLocalRemove::removeRecursively(const QString& path)
 {
    bool success = true;
-    QString absolute = propagator()->_localDir + _item->_file + path;
+    QString absolute = _propagator->_localDir + _item->_file + path;
    QDirIterator di(absolute, QDir::AllEntries | QDir::Hidden | QDir::System | QDir::NoDotAndDotDot);

    QVector<QPair<QString, bool>> deleted;
@@ -77,7 +77,7 @@ bool PropagateLocalRemove::removeRecursively(const QString& path)
        if (success && !ok) {
            // We need to delete the entries from the database now from the deleted vector
            foreach(const auto &it, deleted) {
-                propagator()->_journal->deleteFileRecord(_item->_originalFile + path + QLatin1Char('/') + it.first,
+                _propagator->_journal->deleteFileRecord(_item->_originalFile + path + QLatin1Char('/') + it.first,
                                                        it.second);
            }
            success = false;
@@ -88,7 +88,7 @@ bool PropagateLocalRemove::removeRecursively(const QString& path)
        }
        if (!success && ok) {
            // This succeeded, so we need to delete it from the database now because the caller won't
-            propagator()->_journal->deleteFileRecord(_item->_originalFile + path + QLatin1Char('/') + di.fileName(),
+            _propagator->_journal->deleteFileRecord(_item->_originalFile + path + QLatin1Char('/') + di.fileName(),
                                                    isDir);
        }
    }
@@ -105,14 +105,14 @@ bool PropagateLocalRemove::removeRecursively(const QString& path)

 void PropagateLocalRemove::start()
 {
-    if (propagator()->_abortRequested.fetchAndAddRelaxed(0))
+    if (_propagator->_abortRequested.fetchAndAddRelaxed(0))
        return;

-    QString filename = propagator()->_localDir +  _item->_file;
+    QString filename = _propagator->_localDir +  _item->_file;

    qDebug() << filename;

-    if( propagator()->localFileNameClash(_item->_file)) {
+    if( _propagator->localFileNameClash(_item->_file)) {
        done(SyncFileItem::NormalError, tr("Could not remove %1 because of a local file name clash")
             .arg(QDir::toNativeSeparators(filename)));
        return;
@@ -132,17 +132,17 @@ void PropagateLocalRemove::start()
        }
    }
    emit progress(*_item, 0);
-    propagator()->_journal->deleteFileRecord(_item->_originalFile, _item->_isDirectory);
-    propagator()->_journal->commit("Local remove");
+    _propagator->_journal->deleteFileRecord(_item->_originalFile, _item->_isDirectory);
+    _propagator->_journal->commit("Local remove");
    done(SyncFileItem::Success);
 }

 void PropagateLocalMkdir::start()
 {
-    if (propagator()->_abortRequested.fetchAndAddRelaxed(0))
+    if (_propagator->_abortRequested.fetchAndAddRelaxed(0))
        return;

-    QDir newDir(propagator()->getFilePath(_item->_file));
+    QDir newDir(_propagator->getFilePath(_item->_file));
    QString newDirStr = QDir::toNativeSeparators(newDir.path());

    // When turning something that used to be a file into a directory
@@ -158,13 +158,13 @@ void PropagateLocalMkdir::start()
        }
    }

-    if( Utility::fsCasePreserving() && propagator()->localFileNameClash(_item->_file ) ) {
+    if( Utility::fsCasePreserving() && _propagator->localFileNameClash(_item->_file ) ) {
        qDebug() << "WARN: new folder to create locally already exists!";
        done( SyncFileItem::NormalError, tr("Attention, possible case sensitivity clash with %1").arg(newDirStr) );
        return;
    }
-    emit propagator()->touchedFile(newDirStr);
-    QDir localDir(propagator()->_localDir);
+    emit _propagator->touchedFile(newDirStr);
+    QDir localDir(_propagator->_localDir);
    if (!localDir.mkpath(_item->_file)) {
        done( SyncFileItem::NormalError, tr("could not create folder %1").arg(newDirStr) );
        return;
@@ -177,11 +177,11 @@ void PropagateLocalMkdir::start()
    // before the correct etag is stored.
    SyncJournalFileRecord record(*_item, newDirStr);
    record._etag = "_invalid_";
-    if (!propagator()->_journal->setFileRecord(record)) {
+    if (!_propagator->_journal->setFileRecord(record)) {
        done(SyncFileItem::FatalError, tr("Error writing metadata to the database"));
        return;
    }
-    propagator()->_journal->commit("localMkdir");
+    _propagator->_journal->commit("localMkdir");

    done(SyncFileItem::Success);
 }
@@ -193,11 +193,11 @@ void PropagateLocalMkdir::setDeleteExistingFile(bool enabled)

 void PropagateLocalRename::start()
 {
-    if (propagator()->_abortRequested.fetchAndAddRelaxed(0))
+    if (_propagator->_abortRequested.fetchAndAddRelaxed(0))
        return;

-    QString existingFile = propagator()->getFilePath(_item->_file);
-    QString targetFile = propagator()->getFilePath(_item->_renameTarget);
+    QString existingFile = _propagator->getFilePath(_item->_file);
+    QString targetFile = _propagator->getFilePath(_item->_renameTarget);

    // if the file is a file underneath a moved dir, the _item->file is equal
    // to _item->renameTarget and the file is not moved as a result.
@@ -206,7 +206,7 @@ void PropagateLocalRename::start()
        qDebug() << "MOVE " << existingFile << " => " << targetFile;

        if (QString::compare(_item->_file, _item->_renameTarget, Qt::CaseInsensitive) != 0
-                && propagator()->localFileNameClash(_item->_renameTarget)) {
+                && _propagator->localFileNameClash(_item->_renameTarget)) {
            // Only use localFileNameClash for the destination if we know that the source was not
            // the one conflicting  (renaming  A.txt -> a.txt is OK)

@@ -217,8 +217,8 @@ void PropagateLocalRename::start()
            return;
        }

-        emit propagator()->touchedFile(existingFile);
-        emit propagator()->touchedFile(targetFile);
+        emit _propagator->touchedFile(existingFile);
+        emit _propagator->touchedFile(targetFile);
        QString renameError;
        if (!FileSystem::rename(existingFile, targetFile, &renameError)) {
            done(SyncFileItem::NormalError, renameError);
@@ -227,8 +227,8 @@ void PropagateLocalRename::start()
    }

    SyncJournalFileRecord oldRecord =
-            propagator()->_journal->getFileRecord(_item->_originalFile);
-    propagator()->_journal->deleteFileRecord(_item->_originalFile);
+            _propagator->_journal->getFileRecord(_item->_originalFile);
+    _propagator->_journal->deleteFileRecord(_item->_originalFile);

    // store the rename file name in the item.
    const auto oldFile = _item->_file;
@@ -242,18 +242,18 @@ void PropagateLocalRename::start()
    }

    if (!_item->_isDirectory) { // Directories are saved at the end
-        if (!propagator()->_journal->setFileRecord(record)) {
+        if (!_propagator->_journal->setFileRecord(record)) {
            done(SyncFileItem::FatalError, tr("Error writing metadata to the database"));
            return;
        }
    } else {
-        if (!PropagateRemoteMove::adjustSelectiveSync(propagator()->_journal, oldFile, _item->_renameTarget)) {
+        if (!PropagateRemoteMove::adjustSelectiveSync(_propagator->_journal, oldFile, _item->_renameTarget)) {
            done(SyncFileItem::FatalError, tr("Error writing metadata to the database"));
            return;
        }
    }

-    propagator()->_journal->commit("localRename");
+    _propagator->_journal->commit("localRename");

    done(SyncFileItem::Success);
 }
--- a/Mostrar Mais
+++ b/Mostrar Mais