Jelajahi Sumber

OfflineSyncWork: do not proactively ping server for connectivity unless sync fails

Co-authored-by: obel1x <obel1x@web.de>
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
Álvaro Brey 2 tahun lalu
induk
melakukan
b7cf2a5d67

+ 8 - 2
app/src/main/java/com/nextcloud/client/jobs/OfflineSyncWork.kt

@@ -57,7 +57,7 @@ class OfflineSyncWork constructor(
 
     override fun doWork(): Result {
         val wakeLock: WakeLock? = null
-        if (!powerManagementService.isPowerSavingEnabled && !connectivityService.isInternetWalled) {
+        if (!powerManagementService.isPowerSavingEnabled) {
             val users = userAccountManager.allUsers
             for (user in users) {
                 val storageManager = FileDataStorageManager(user, contentResolver)
@@ -102,7 +102,13 @@ class OfflineSyncWork constructor(
                 return
             }
             ResultCode.ETAG_CHANGED -> Log_OC.d(TAG, "$folderName: eTag changed")
-            else -> Log_OC.d(TAG, "$folderName: eTag changed")
+            else -> {
+                if (connectivityService.isInternetWalled) {
+                    Log_OC.d(TAG, "No connectivity, skipping sync")
+                    return
+                }
+                Log_OC.d(TAG, "$folderName: eTag changed")
+            }
         }
         // iterate over downloaded files
         val files = folder.listFiles { obj: File -> obj.isFile }