From: David A. Velasco <dvelasco@solidgear.es>
Date: Mon, 30 Sep 2013 11:49:50 +0000 (+0200)
Subject: Merge branch 'develop' into fix_instant_uploads_in_Samsung_4.x_devices
X-Git-Tag: oc-android-1.4.6~9^2~2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/01a4676beb60c24a0f7aeb85624200fee4b6b6a5?ds=inline

Merge branch 'develop' into fix_instant_uploads_in_Samsung_4.x_devices
---

01a4676beb60c24a0f7aeb85624200fee4b6b6a5
diff --cc src/com/owncloud/android/files/services/FileUploader.java
index 97b1922f,0f1e9cdb..05e2ffbf
--- a/src/com/owncloud/android/files/services/FileUploader.java
+++ b/src/com/owncloud/android/files/services/FileUploader.java
@@@ -277,11 -269,10 +269,11 @@@ public class FileUploader extends Servi
                  } else {
                      newUpload = new UploadFileOperation(account, files[i], isInstant, forceOverwrite, localAction);
                  }
-                 if (fixed && i == 0) {
+                 if (isInstant) {
                      newUpload.setRemoteFolderToBeCreated();
                  }
 -                mPendingUploads.putIfAbsent(uploadKey, newUpload);
 +                mPendingUploads.putIfAbsent(uploadKey, newUpload); // Grants that the file only upload once time
 +                Log_OC.d(TAG, "Trying to update "+ uploadKey);
                  newUpload.addDatatransferProgressListener(this);
                  newUpload.addDatatransferProgressListener((FileUploaderBinder)mBinder);
                  requestedUploads.add(uploadKey);