cover edge cases

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>

Author: alperozturk96

app/src/main/java/com/nextcloud/client/jobs/autoUpload/AutoUploadWorker.kt

@@ -24,6 +24,7 @@ import com.nextcloud.client.jobs.upload.FileUploadWorker
 import com.nextcloud.client.jobs.utils.UploadErrorNotificationManager
 import com.nextcloud.client.network.ConnectivityService
 import com.nextcloud.utils.extensions.isNonRetryable
+import com.nextcloud.utils.extensions.updateStatus
 import com.owncloud.android.R
 import com.owncloud.android.datamodel.ArbitraryDataProviderImpl
 import com.owncloud.android.datamodel.FileDataStorageManager
@@ -341,6 +342,10 @@ class AutoUploadWorker(
                             sendUploadFinishEvent(operation, result)
                         }
                     } catch (e: Exception) {
+                        uploadsStorageManager.updateStatus(
+                            uploadEntity,
+                            UploadsStorageManager.UploadStatus.UPLOAD_FAILED
+                        )
                         Log_OC.e(
                             TAG,
                             "Exception during upload file, localPath: $localPath, remotePath: $remotePath," +

app/src/main/java/com/nextcloud/client/jobs/autoUpload/FileSystemRepository.kt

@@ -183,14 +183,6 @@ class FileSystemRepository(
             val entity = dao.getFileByPathAndFolder(localPath, syncedFolder.id.toString())
 
             val fileModified = (lastModified ?: file.lastModified())
-            if (fileModified <= 0L) {
-                Log_OC.d(TAG, "file is deleted, skipping: $localPath")
-                entity?.let {
-                    deleteAutoUploadAndUploadEntity(syncedFolder, localPath, entity)
-                }
-                return
-            }
-
             val hasNotChanged = entity?.fileModified == fileModified
             val fileSentForUpload = entity?.fileSentForUpload == 1
 

app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadWorker.kt

@@ -24,6 +24,7 @@ import com.nextcloud.client.network.ConnectivityService
 import com.nextcloud.client.preferences.AppPreferences
 import com.nextcloud.utils.ForegroundServiceHelper
 import com.nextcloud.utils.extensions.getPercent
+import com.nextcloud.utils.extensions.updateStatus
 import com.owncloud.android.R
 import com.owncloud.android.datamodel.FileDataStorageManager
 import com.owncloud.android.datamodel.ForegroundServiceType
@@ -255,7 +256,7 @@ class FileUploadWorker(
             )
 
             val result = withContext(Dispatchers.IO) {
-                upload(operation, user, client)
+                upload(upload, operation, user, client)
             }
             currentUploadFileOperation = null
 
@@ -327,6 +328,7 @@ class FileUploadWorker(
 
     @Suppress("TooGenericExceptionCaught", "DEPRECATION")
     private suspend fun upload(
+        upload: OCUpload,
         operation: UploadFileOperation,
         user: User,
         client: OwnCloudClient
@@ -343,6 +345,14 @@ class FileUploadWorker(
             fileUploadBroadcastManager.sendStarted(operation, context)
         } catch (e: Exception) {
             Log_OC.e(TAG, "Error uploading", e)
+            uploadsStorageManager.run {
+                uploadDao.getUploadById(upload.uploadId, user.accountName)?.let { entity ->
+                    updateStatus(
+                        entity,
+                        UploadsStorageManager.UploadStatus.UPLOAD_FAILED
+                    )
+                }
+            }
             result = RemoteOperationResult(e)
         } finally {
             if (!isStopped) {

app/src/main/java/com/nextcloud/utils/extensions/UploadStorageManagerExtensions.kt

@@ -0,0 +1,28 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2025 Alper Ozturk <alper.ozturk@nextcloud.com>
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package com.nextcloud.utils.extensions
+
+import com.nextcloud.client.database.entity.UploadEntity
+import com.owncloud.android.datamodel.UploadsStorageManager
+
+fun UploadsStorageManager.updateStatus(entity: UploadEntity?, status: UploadsStorageManager.UploadStatus) {
+    entity ?: return
+    uploadDao.insertOrReplace(entity.withStatus(status))
+}
+
+fun UploadsStorageManager.updateStatus(entity: UploadEntity?, success: Boolean) {
+    entity ?: return
+    val newStatus = if (success) {
+        UploadsStorageManager.UploadStatus.UPLOAD_SUCCEEDED
+    } else {
+        UploadsStorageManager.UploadStatus.UPLOAD_FAILED
+    }
+    uploadDao.insertOrReplace(entity.withStatus(newStatus))
+}
+
+private fun UploadEntity.withStatus(newStatus: UploadsStorageManager.UploadStatus) = this.copy(status = newStatus.value)

app/src/main/java/com/owncloud/android/MainApp.java

@@ -392,7 +392,7 @@ public void disableDocumentsStorageProvider() {
                 FilesSyncHelper.startAutoUploadForEnabledSyncedFolders(syncedFolderProvider,
                                                                        backgroundJobManager,
                                                                        new String[]{},
-                                                                       true);
+                                                                       false);
                 preferences.setLastAutoUploadOnStartTime(System.currentTimeMillis());
             }
         } else if (event == Lifecycle.Event.ON_STOP) {

app/src/main/java/com/owncloud/android/datamodel/UploadsStorageManager.java

@@ -582,6 +582,8 @@ public void updateDatabaseUploadResult(RemoteOperationResult uploadResult, Uploa
                 result = UploadResult.SYNC_CONFLICT;
             }
         } else if (code == RemoteOperationResult.ResultCode.LOCAL_FILE_NOT_FOUND) {
+            // upload status is SUCCEEDED because user cannot take action about it, it will always fail
+            status =  UploadStatus.UPLOAD_SUCCEEDED;
             result = UploadResult.FILE_NOT_FOUND;
         }
 

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

@@ -1106,8 +1106,10 @@ private RemoteOperationResult normalUpload(OwnCloudClient client) {
                     throw new OperationCancelledException();
                 }
 
-                // Execute
-                result = mUploadOperation.execute(client);
+                // execute
+                if (result.isSuccess() && mUploadOperation != null) {
+                    result = mUploadOperation.execute(client);
+                }
 
                 // move local temporal file or original file to its corresponding
                 // location in the Nextcloud local folder
@@ -1129,11 +1131,20 @@ private RemoteOperationResult normalUpload(OwnCloudClient client) {
         } finally {
             mUploadStarted.set(false);
 
-            // Clean up temporal file if it exists
-            if (temporalFile != null && !temporalFile.delete() && temporalFile.exists()) {
-                Log_OC.e(TAG, "Could not delete temporal file");
+            // clean up temporal file if it exists
+            try {
+                if (temporalFile != null) {
+                    if (temporalFile.exists() && !temporalFile.delete()) {
+                        Log_OC.e(TAG, "Could not delete temporal file");
+                    }
+                } else {
+                    Log_OC.e(TAG, "temporal file is null, cannot delete it");
+                }
+            } catch (Exception e) {
+                Log_OC.e(TAG, "an exception occurred during deletion of temporal file: ", e);
             }
 
+
             if (result == null) {
                 result = new RemoteOperationResult<>(ResultCode.UNKNOWN_ERROR);
             }