Deleted keySuffix parameter from putIfAbsent method, wich was corrupting the path

src/com/owncloud/android/files/services/FileDownloader.java

@@ -172,8 +172,7 @@ public class FileDownloader extends Service
                 newDownload.addDatatransferProgressListener(this);
                 newDownload.addDatatransferProgressListener((FileDownloaderBinder) mBinder);
                 Pair<String, String> putResult = mPendingDownloads.putIfAbsent(
-                        account.name, file.getRemotePath(), newDownload, null
-                );
+                        account.name, file.getRemotePath(), newDownload);
                 if (putResult != null) {
                     String downloadKey = putResult.first;
                     requestedDownloads.add(downloadKey);

src/com/owncloud/android/files/services/FileUploader.java

@@ -515,8 +515,7 @@ public class FileUploader extends Service
                     Pair<String, String> putResult = mPendingUploads.putIfAbsent(
                             account.name,
                             files[i].getRemotePath(),
-                            newUpload,
-                            /*String.valueOf(id)*/ null
+                            newUpload
                     );
                     if (putResult != null) {
                         uploadKey = putResult.first;
@@ -566,9 +565,8 @@ public class FileUploader extends Service
             Pair<String, String> putResult = mPendingUploads.putIfAbsent(
                     account.name,
                     upload.getRemotePath(),
-                    newUpload,
-                    String.valueOf(upload.getUploadId()
-                    ));
+                    newUpload
+                    );
             if (putResult != null) {
                 String uploadKey = putResult.first;
                 requestedUploads.add(uploadKey);

src/com/owncloud/android/files/services/IndexedForest.java

@@ -97,12 +97,9 @@ public class IndexedForest<V> {
     }
 
 
-    public /* synchronized */ Pair<String, String> putIfAbsent(String accountName, String remotePath, V value,
-                                                               String keySufix) {
+    public /* synchronized */ Pair<String, String> putIfAbsent(String accountName, String remotePath, V value) {
         String targetKey = buildKey(accountName, remotePath);
-        if (keySufix != null){
-            targetKey = targetKey + keySufix;
-        }
+
         Node<V> valuedNode = new Node(targetKey, value);
         Node<V> previousValue = mMap.putIfAbsent(
             targetKey,

src/com/owncloud/android/services/SyncFolderHandler.java

@@ -139,7 +139,7 @@ class SyncFolderHandler extends Handler {
     public void add(Account account, String remotePath,
                     SynchronizeFolderOperation syncFolderOperation){
         Pair<String, String> putResult =
-                mPendingOperations.putIfAbsent(account.name, remotePath, syncFolderOperation, null);
+                mPendingOperations.putIfAbsent(account.name, remotePath, syncFolderOperation);
         if (putResult != null) {
             sendBroadcastNewSyncFolder(account, remotePath);    // TODO upgrade!
         }