Merge pull request #1673 from owncloud/favorite_edited_file

Fixed: favorite setting not remembered when modifying a local file

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

@@ -493,6 +493,7 @@ public class FileUploader extends Service
 
                     newUpload = new UploadFileOperation(
                             account,
+                            files[i],
                             ocUpload,
                             chunked,
                             forceOverwrite,
@@ -546,6 +547,7 @@ public class FileUploader extends Service
 
             UploadFileOperation newUpload = new UploadFileOperation(
                     account,
+                    null,
                     upload,
                     chunked,
                     upload.isForceOverwrite(),  // TODO should be read from DB?

src/com/owncloud/android/operations/UploadFileOperation.java

@@ -138,6 +138,7 @@ public class UploadFileOperation extends SyncOperation {
     protected RequestEntity mEntity = null;
 
     public UploadFileOperation(Account account,
+                               OCFile file,
                                OCUpload upload,
                                boolean chunked,
                                boolean forceOverwrite,
@@ -156,11 +157,15 @@ public class UploadFileOperation extends SyncOperation {
         }
 
         mAccount = account;
-        mFile = obtainNewOCFileToUpload(
-            upload.getRemotePath(),
-            upload.getLocalPath(),
-            upload.getMimeType()
-        );
+        if (file == null) {
+            mFile = obtainNewOCFileToUpload(
+                    upload.getRemotePath(),
+                    upload.getLocalPath(),
+                    upload.getMimeType()
+            );
+        } else {
+            mFile = file;
+        }
         mRemotePath = upload.getRemotePath();
         mChunked = chunked;
         mForceOverwrite = forceOverwrite;