Merge branch 'develop' into fix_instant_uploads_in_Samsung_4.x_devices

diff --cc src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
Simple merge

diff --cc src/com/owncloud/android/files/services/FileUploader.java
index 97b1922,0f1e9cd..05e2ffb
--- 1/src/com/owncloud/android/files/services/FileUploader.java
--- 2/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);