Pārlūkot izejas kodu

Restart uploads after app restart

Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
Jonas Mayer 1 gadu atpakaļ
vecāks
revīzija
878052991c

+ 5 - 1
app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadWorker.kt

@@ -148,7 +148,11 @@ class FileUploadWorker(
                 uploadsStorageManager.getCurrentAndPendingUploadsForAccountPageAscById(lastId, accountName)
         }
 
-        Log_OC.d(TAG, "No more pending uploads for account $accountName, stopping work")
+        if(isStopped){
+            Log_OC.d(TAG, "FileUploadWorker for account $accountName was stopped")
+        }else{
+            Log_OC.d(TAG, "No more pending uploads for account $accountName, stopping work")
+        }
         return Result.success()
     }
 

+ 4 - 2
app/src/main/java/com/owncloud/android/utils/FilesSyncHelper.java

@@ -44,6 +44,7 @@ import com.owncloud.android.datamodel.SyncedFolder;
 import com.owncloud.android.datamodel.SyncedFolderProvider;
 import com.owncloud.android.datamodel.UploadsStorageManager;
 import com.owncloud.android.db.OCUpload;
+import com.owncloud.android.db.UploadResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
 import org.lukhnos.nnio.file.FileVisitResult;
@@ -173,13 +174,14 @@ public final class FilesSyncHelper {
                                            final UserAccountManager accountManager,
                                            final ConnectivityService connectivityService,
                                            final PowerManagementService powerManagementService) {
-        final Context context = MainApp.getAppContext();
-
         boolean accountExists;
 
         boolean whileChargingOnly = true;
         boolean useWifiOnly = true;
 
+        // Make all in progress downloads failed to restart upload worker
+        uploadsStorageManager.failInProgressUploads(UploadResult.SERVICE_INTERRUPTED);
+
         OCUpload[] failedUploads = uploadsStorageManager.getFailedUploads();
 
         for (OCUpload failedUpload : failedUploads) {