Use overwrite when updating file

Signed-off-by: Mario Danic <mario@lovelyhq.com>

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

@@ -206,6 +206,7 @@ public class FileUploader extends Service
      */
     public static class UploadRequester {
 
+
         /**
          * Call to upload several new files
          */
@@ -237,6 +238,57 @@ public class FileUploader extends Service
             context.startService(intent);
         }
 
+        public void uploadFileWithOverwrite(
+                Context context,
+                Account account,
+                String[] localPaths,
+                String[] remotePaths,
+                String[] mimeTypes,
+                Integer behaviour,
+                Boolean createRemoteFolder,
+                int createdBy,
+                boolean requiresWifi,
+                boolean requiresCharging,
+                boolean overwrite
+        ) {
+            Intent intent = new Intent(context, FileUploader.class);
+
+            intent.putExtra(FileUploader.KEY_ACCOUNT, account);
+            intent.putExtra(FileUploader.KEY_LOCAL_FILE, localPaths);
+            intent.putExtra(FileUploader.KEY_REMOTE_FILE, remotePaths);
+            intent.putExtra(FileUploader.KEY_MIME_TYPE, mimeTypes);
+            intent.putExtra(FileUploader.KEY_LOCAL_BEHAVIOUR, behaviour);
+            intent.putExtra(FileUploader.KEY_CREATE_REMOTE_FOLDER, createRemoteFolder);
+            intent.putExtra(FileUploader.KEY_CREATED_BY, createdBy);
+            intent.putExtra(FileUploader.KEY_WHILE_ON_WIFI_ONLY, requiresWifi);
+            intent.putExtra(FileUploader.KEY_WHILE_CHARGING_ONLY, requiresCharging);
+            intent.putExtra(FileUploader.KEY_FORCE_OVERWRITE, overwrite);
+
+            context.startService(intent);
+        }
+
+        /**
+         * Call to upload a file
+         */
+        public void uploadFileWithOverwrite(Context context, Account account, String localPath, String remotePath, int
+                behaviour, String mimeType, boolean createRemoteFile, int createdBy, boolean requiresWifi,
+                                  boolean requiresCharging, boolean overwrite) {
+
+            uploadFileWithOverwrite(
+                    context,
+                    account,
+                    new String[]{localPath},
+                    new String[]{remotePath},
+                    new String[]{mimeType},
+                    behaviour,
+                    createRemoteFile,
+                    createdBy,
+                    requiresWifi,
+                    requiresCharging,
+                    overwrite
+            );
+        }
+
         /**
          * Call to upload a new single file
          */

src/main/java/com/owncloud/android/jobs/AutoUploadJob.java

@@ -89,7 +89,7 @@ public class AutoUploadJob extends Job {
                 channel = new RandomAccessFile(file, "rw").getChannel();
                 lock = channel.tryLock();
 
-                requester.uploadNewFile(
+                requester.uploadFileWithOverwrite(
                         context,
                         account,
                         filePath,
@@ -99,7 +99,8 @@ public class AutoUploadJob extends Job {
                         true,           // create parent folder if not existent
                         UploadFileOperation.CREATED_AS_INSTANT_PICTURE,
                         requiresWifi,
-                        requiresCharging
+                        requiresCharging,
+                        true
                 );
 
                 lock.release();

src/main/java/com/owncloud/android/jobs/FilesSyncJob.java

@@ -52,15 +52,6 @@ import java.util.TimeZone;
 public class FilesSyncJob extends Job {
     public static final String TAG = "FilesSyncJob";
 
-    /*
-    Known limitations of the current system:
-        - changed files will be detected and uploaded, but they will get a number suffix instead of updating the
-        existing file
-        - there are cases where we could upload the file twice, like: upload starts and fails. file gets changed,
-        and gets uploaded. we manually restart the failed upload.
-        - we need to handle upload directly in a job rather than via service to properly handle failures etc
-     */
-
     @NonNull
     @Override
     protected Result onRunJob(Params params) {

src/main/java/com/owncloud/android/utils/FilesSyncHelper.java

@@ -193,39 +193,56 @@ public class FilesSyncHelper {
 
         FileUploader.UploadRequester uploadRequester = new FileUploader.UploadRequester();
 
+        boolean accountExists;
+        boolean fileExists;
+
         for (JobRequest jobRequest : JobManager.instance().getAllJobRequestsForTag(AutoUploadJob.TAG)) {
             restartedInCurrentIteration = false;
-            // Handle case of charging
-            if (jobRequest.requiresCharging() && Device.isCharging(context)) {
-                if (jobRequest.requiredNetworkType().equals(JobRequest.NetworkType.CONNECTED) &&
-                        !Device.getNetworkType(context).equals(JobRequest.NetworkType.ANY)) {
-                    jobRequest.cancelAndEdit().build().schedule();
-                    restartedInCurrentIteration = true;
-                } else if (jobRequest.requiredNetworkType().equals(JobRequest.NetworkType.UNMETERED) &&
-                        Device.getNetworkType(context).equals(JobRequest.NetworkType.UNMETERED)) {
-                    jobRequest.cancelAndEdit().build().schedule();
-                    restartedInCurrentIteration = true;
+
+            accountExists = false;
+            fileExists = new File(jobRequest.getExtras().getString(AutoUploadJob.LOCAL_PATH, "")).exists();
+
+            // check if accounts still exists
+            for (Account account : AccountUtils.getAccounts(context)) {
+                if (account.name.equals(jobRequest.getExtras().getString(AutoUploadJob.ACCOUNT, ""))) {
+                    accountExists = true;
+                    break;
                 }
             }
 
-            // Handle case of wifi
+            if (accountExists && fileExists) {
+                // Handle case of charging
+                if (jobRequest.requiresCharging() && Device.isCharging(context)) {
+                    if (jobRequest.requiredNetworkType().equals(JobRequest.NetworkType.CONNECTED) &&
+                            !Device.getNetworkType(context).equals(JobRequest.NetworkType.ANY)) {
+                        jobRequest.cancelAndEdit().build().schedule();
+                        restartedInCurrentIteration = true;
+                    } else if (jobRequest.requiredNetworkType().equals(JobRequest.NetworkType.UNMETERED) &&
+                            Device.getNetworkType(context).equals(JobRequest.NetworkType.UNMETERED)) {
+                        jobRequest.cancelAndEdit().build().schedule();
+                        restartedInCurrentIteration = true;
+                    }
+                }
+
+                // Handle case of wifi
 
-            if (!restartedInCurrentIteration) {
-                if (jobRequest.requiredNetworkType().equals(JobRequest.NetworkType.CONNECTED) &&
-                        !Device.getNetworkType(context).equals(JobRequest.NetworkType.ANY)) {
-                    jobRequest.cancelAndEdit().build().schedule();
-                } else if (jobRequest.requiredNetworkType().equals(JobRequest.NetworkType.UNMETERED) &&
-                        Device.getNetworkType(context).equals(JobRequest.NetworkType.UNMETERED)) {
-                    jobRequest.cancelAndEdit().build().schedule();
+                if (!restartedInCurrentIteration) {
+                    if (jobRequest.requiredNetworkType().equals(JobRequest.NetworkType.CONNECTED) &&
+                            !Device.getNetworkType(context).equals(JobRequest.NetworkType.ANY)) {
+                        jobRequest.cancelAndEdit().build().schedule();
+                    } else if (jobRequest.requiredNetworkType().equals(JobRequest.NetworkType.UNMETERED) &&
+                            Device.getNetworkType(context).equals(JobRequest.NetworkType.UNMETERED)) {
+                        jobRequest.cancelAndEdit().build().schedule();
+                    }
                 }
+            } else {
+                JobManager.instance().cancel(jobRequest.getJobId());
             }
         }
 
         UploadsStorageManager uploadsStorageManager = new UploadsStorageManager(context.getContentResolver(), context);
         OCUpload[] failedUploads = uploadsStorageManager.getFailedUploads();
 
-        boolean accountExists;
-        boolean fileExists;
         for (OCUpload failedUpload: failedUploads) {
             accountExists = false;
             fileExists = new File(failedUpload.getLocalPath()).exists();