Merge pull request #955 from owncloud/thumbnailOOM

[pub/Android/ownCloud.git] / src / com / owncloud / android / files / services / FileUploader.java

diff --git a/src/com/owncloud/android/files/services/FileUploader.java b/src/com/owncloud/android/files/services/FileUploader.java
index 83d8ffd..8beff92 100644 (file)
--- a/src/com/owncloud/android/files/services/FileUploader.java
+++ b/src/com/owncloud/android/files/services/FileUploader.java
@@ -587,8 +587,7 @@ public class FileUploader extends Service
                     if (grantResult.isSuccess()) {
                         OCFile parent = mStorageManager.getFileByPath(remoteParentPath);
                         mCurrentUpload.getFile().setParentId(parent.getFileId());
                     if (grantResult.isSuccess()) {
                         OCFile parent = mStorageManager.getFileByPath(remoteParentPath);
                         mCurrentUpload.getFile().setParentId(parent.getFileId());

-                        uploadResult = mCurrentUpload.execute(mUploadClient,
-                                MainApp.getUserAgent());
+                        uploadResult = mCurrentUpload.execute(mUploadClient);

                         if (uploadResult.isSuccess()) {
                             saveUploadedFile();
                         }
                         if (uploadResult.isSuccess()) {
                             saveUploadedFile();
                         }


@@ -647,7 +646,7 @@ public class FileUploader extends Service
      */
     private RemoteOperationResult grantFolderExistence(String pathToGrant) {
         RemoteOperation operation = new ExistenceCheckRemoteOperation(pathToGrant, this, false);
      */
     private RemoteOperationResult grantFolderExistence(String pathToGrant) {
         RemoteOperation operation = new ExistenceCheckRemoteOperation(pathToGrant, this, false);

-        RemoteOperationResult result = operation.execute(mUploadClient, MainApp.getUserAgent());
+        RemoteOperationResult result = operation.execute(mUploadClient);

         if (!result.isSuccess() && result.getCode() == ResultCode.FILE_NOT_FOUND &&
                 mCurrentUpload.isRemoteFolderToBeCreated()) {
             SyncOperation syncOp = new CreateFolderOperation( pathToGrant, true);
         if (!result.isSuccess() && result.getCode() == ResultCode.FILE_NOT_FOUND &&
                 mCurrentUpload.isRemoteFolderToBeCreated()) {
             SyncOperation syncOp = new CreateFolderOperation( pathToGrant, true);


@@ -708,7 +707,7 @@ public class FileUploader extends Service
         // in theory, should return the same we already have
         ReadRemoteFileOperation operation =
                 new ReadRemoteFileOperation(mCurrentUpload.getRemotePath());
         // in theory, should return the same we already have
         ReadRemoteFileOperation operation =
                 new ReadRemoteFileOperation(mCurrentUpload.getRemotePath());

-        RemoteOperationResult result = operation.execute(mUploadClient, MainApp.getUserAgent());
+        RemoteOperationResult result = operation.execute(mUploadClient);

         if (result.isSuccess()) {
             updateOCFile(file, (RemoteFile) result.getData().get(0));
             file.setLastSyncDateForProperties(syncDate);
         if (result.isSuccess()) {
             updateOCFile(file, (RemoteFile) result.getData().get(0));
             file.setLastSyncDateForProperties(syncDate);