-     * Created with the Looper of a new thread, started in {@link OperationsService#onCreate()}.
-     */
-    private static class SyncFolderHandler extends Handler {
-
-        // don't make it a final class, and don't remove the static ; lint will warn about a possible memory leak
-
-        OperationsService mService;
-
-        private ConcurrentMap<String,SynchronizeFolderOperation> mPendingOperations =
-                new ConcurrentHashMap<String,SynchronizeFolderOperation>();
-        private OwnCloudClient mOwnCloudClient = null;
-        private FileDataStorageManager mStorageManager;
-        private SynchronizeFolderOperation mCurrentSyncOperation;
-
-
-        public SyncFolderHandler(Looper looper, OperationsService service) {
-            super(looper);
-            if (service == null) {
-                throw new IllegalArgumentException("Received invalid NULL in parameter 'service'");
-            }
-            mService = service;
-        }
-
-        
-        public boolean isSynchronizing(Account account, String remotePath) {
-            if (account == null || remotePath == null) return false;
-            String targetKey = buildRemoteName(account, remotePath);
-            synchronized (mPendingOperations) {
-                // TODO - this can be slow when synchronizing a big tree - need a better data structure
-                Iterator<String> it = mPendingOperations.keySet().iterator();
-                boolean found = false;
-                while (it.hasNext() && !found) {
-                    found = it.next().startsWith(targetKey);
-                }
-                return found;
-            }
-        }
-        
-
-        @Override
-        public void handleMessage(Message msg) {
-            Pair<Account, String> itemSyncKey = (Pair<Account, String>) msg.obj;
-            doOperation(itemSyncKey.first, itemSyncKey.second);
-            mService.stopSelf(msg.arg1);
-        }
-
-
-        /**
-         * Performs the next operation in the queue
-         */
-        private void doOperation(Account account, String remotePath) {
-
-            String syncKey = buildRemoteName(account,remotePath);
-
-            synchronized(mPendingOperations) {
-                mCurrentSyncOperation = mPendingOperations.get(syncKey);
-            }
-
-            if (mCurrentSyncOperation != null) {
-                RemoteOperationResult result = null;
-
-                try {
-
-                    OwnCloudAccount ocAccount = new OwnCloudAccount(account, mService);
-                    mOwnCloudClient = OwnCloudClientManagerFactory.getDefaultSingleton().
-                            getClientFor(ocAccount, mService);
-                    mStorageManager = new FileDataStorageManager(
-                            account,
-                            mService.getContentResolver()
-                    );
-
-                    result = mCurrentSyncOperation.execute(mOwnCloudClient, mStorageManager);
-
-                } catch (AccountsException e) {
-                    Log_OC.e(TAG, "Error while trying to get autorization", e);
-                } catch (IOException e) {
-                    Log_OC.e(TAG, "Error while trying to get autorization", e);
-                } finally {
-                    synchronized(mPendingOperations) {
-                        mPendingOperations.remove(syncKey);
-                    }
-
-                    mService.dispatchResultToOperationListeners(null, mCurrentSyncOperation, result);
-                    
-                    sendBroadcastFinishedSyncFolder(account, remotePath, result.isSuccess());
-                }
-            }
-        }
-
-        public void add(Account account, String remotePath, SynchronizeFolderOperation syncFolderOperation){
-            String syncKey = buildRemoteName(account,remotePath);
-            mPendingOperations.putIfAbsent(syncKey,syncFolderOperation);
-        }
-
-        /**
-         * Cancels sync operations.
-         * @param account       Owncloud account where the remote file is stored.
-         * @param file          File OCFile
-         */
-        public void cancel(Account account, OCFile file){
-            SynchronizeFolderOperation syncOperation = null;
-            String targetKey = buildRemoteName(account, file.getRemotePath());
-            ArrayList<String> keyItems = new ArrayList<String>();
-            synchronized (mPendingOperations) {
-                if (file.isFolder()) {
-                    Log_OC.d(TAG, "Canceling pending sync operations");
-                    Iterator<String> it = mPendingOperations.keySet().iterator();
-                    boolean found = false;
-                    while (it.hasNext()) {
-                        String keySyncOperation = it.next();
-                        found = keySyncOperation.startsWith(targetKey);
-                        if (found) {
-                            keyItems.add(keySyncOperation);
-                        }
-                    }
-                    
-                } else {
-                    // this is not really expected...
-                    Log_OC.d(TAG, "Canceling sync operation");
-                    keyItems.add(buildRemoteName(account, file.getRemotePath()));
-                }
-                for (String item: keyItems) {
-                    syncOperation = mPendingOperations.remove(item);
-                    if (syncOperation != null) {
-                        syncOperation.cancel();
-                    }
-                }
-            }
-
-            //sendBroadcastFinishedSyncFolder(account, file.getRemotePath());
-            
-            /// cancellation of download needs to be done separately in any case; a SynchronizeFolderOperation
-            //  may finish much sooner than the real download of the files in the folder
-            Intent intent = new Intent(mService, FileDownloader.class);
-            intent.setAction(FileDownloader.ACTION_CANCEL_FILE_DOWNLOAD);
-            intent.putExtra(FileDownloader.EXTRA_ACCOUNT, account);
-            intent.putExtra(FileDownloader.EXTRA_FILE, file);
-            mService.startService(intent);
-        }
-
-        /**
-         * Builds a key from the account and file to download
-         *
-         * @param account   Account where the file to download is stored
-         * @param path      File path
-         */
-        private String buildRemoteName(Account account, String path) {
-            return account.name + path;
-        }
-        
-        
-        /**
-         * TODO review this method when "folder synchronization" replaces "folder download"; this is a fast and ugly 
-         * patch. 
-         */
-        private void sendBroadcastNewSyncFolder(Account account, String remotePath) {
-            Intent added = new Intent(FileDownloader.getDownloadAddedMessage());
-            added.putExtra(FileDownloader.ACCOUNT_NAME, account.name);
-            added.putExtra(FileDownloader.EXTRA_REMOTE_PATH, remotePath);
-            added.putExtra(FileDownloader.EXTRA_FILE_PATH, FileStorageUtils.getSavePath(account.name) + remotePath);
-            mService.sendStickyBroadcast(added);
-        }
-
-        /**
-         * TODO review this method when "folder synchronization" replaces "folder download"; this is a fast and ugly 
-         * patch. 
-         */
-        private void sendBroadcastFinishedSyncFolder(Account account, String remotePath, boolean success) {
-            Intent finished = new Intent(FileDownloader.getDownloadFinishMessage());
-            finished.putExtra(FileDownloader.ACCOUNT_NAME, account.name);
-            finished.putExtra(FileDownloader.EXTRA_REMOTE_PATH, remotePath);
-            finished.putExtra(FileDownloader.EXTRA_FILE_PATH, FileStorageUtils.getSavePath(account.name) + remotePath);
-            finished.putExtra(FileDownloader.EXTRA_DOWNLOAD_RESULT, success);
-            mService.sendStickyBroadcast(finished);
-        }
-
-
-    }
-
-
-    /** 
-     * Operations worker. Performs the pending operations in the order they were requested. 
-     *