From 50ba13135039327d262081c6f8999fc67dc028ee Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 12 Jan 2021 16:18:29 +0100
Subject: [PATCH] More renaming

---
 .../sdk/internal/session/sync/job/SyncService.kt | 16 ++++++++++++----
 .../app/core/services/VectorSyncService.kt       | 12 ++++++++----
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncService.kt
index 01ab47a3b8..f3c2235dc9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncService.kt
@@ -120,7 +120,11 @@ abstract class SyncService : Service() {
         serviceScope.coroutineContext.cancelChildren()
         if (!preventReschedule && periodic && sessionId != null && backgroundDetectionObserver.isInBackground) {
             Timber.d("## Sync: Reschedule service in $syncDelaySeconds sec")
-            onRescheduleAsked(sessionId ?: "", syncTimeoutSeconds, syncDelaySeconds)
+            onRescheduleAsked(
+                    sessionId = sessionId ?: "",
+                    syncTimeoutSeconds = syncTimeoutSeconds,
+                    syncDelaySeconds = syncDelaySeconds
+            )
         }
         super.onDestroy()
     }
@@ -177,7 +181,11 @@ abstract class SyncService : Service() {
                 // Network might be off, no need to reschedule endless alarms :/
                 preventReschedule = true
                 // Instead start a work to restart background sync when network is on
-                onNetworkError(sessionId ?: "", syncTimeoutSeconds, syncDelaySeconds)
+                onNetworkError(
+                        sessionId = sessionId ?: "",
+                        syncTimeoutSeconds = syncTimeoutSeconds,
+                        syncDelaySeconds = syncDelaySeconds
+                )
             }
             // JobCancellation could be caught here when onDestroy cancels the coroutine context
             if (isRunning.get()) stopMe()
@@ -217,9 +225,9 @@ abstract class SyncService : Service() {
 
     abstract fun onStart(isInitialSync: Boolean)
 
-    abstract fun onRescheduleAsked(sessionId: String, timeout: Int, delay: Int)
+    abstract fun onRescheduleAsked(sessionId: String, syncTimeoutSeconds: Int, syncDelaySeconds: Int)
 
-    abstract fun onNetworkError(sessionId: String, timeout: Int, delay: Int)
+    abstract fun onNetworkError(sessionId: String, syncTimeoutSeconds: Int, syncDelaySeconds: Int)
 
     override fun onBind(intent: Intent?): IBinder? {
         return null
diff --git a/vector/src/main/java/im/vector/app/core/services/VectorSyncService.kt b/vector/src/main/java/im/vector/app/core/services/VectorSyncService.kt
index 5b732a5e3c..3f096376ff 100644
--- a/vector/src/main/java/im/vector/app/core/services/VectorSyncService.kt
+++ b/vector/src/main/java/im/vector/app/core/services/VectorSyncService.kt
@@ -92,15 +92,19 @@ class VectorSyncService : SyncService() {
         startForeground(NotificationUtils.NOTIFICATION_ID_FOREGROUND_SERVICE, notification)
     }
 
-    override fun onRescheduleAsked(sessionId: String, timeout: Int, delay: Int) {
-        rescheduleSyncService(sessionId, timeout, delay, false)
+    override fun onRescheduleAsked(sessionId: String,
+                                   syncTimeoutSeconds: Int,
+                                   syncDelaySeconds: Int) {
+        rescheduleSyncService(sessionId, syncTimeoutSeconds, syncDelaySeconds, false)
     }
 
-    override fun onNetworkError(sessionId: String, timeout: Int, delay: Int) {
+    override fun onNetworkError(sessionId: String,
+                                syncTimeoutSeconds: Int,
+                                syncDelaySeconds: Int) {
         Timber.d("## Sync: A network error occurred during sync")
         val rescheduleSyncWorkRequest: WorkRequest =
                 OneTimeWorkRequestBuilder<RestartWhenNetworkOn>()
-                        .setInputData(RestartWhenNetworkOn.createInputData(sessionId, timeout, delay))
+                        .setInputData(RestartWhenNetworkOn.createInputData(sessionId, syncTimeoutSeconds, syncDelaySeconds))
                         .setConstraints(Constraints.Builder()
                                 .setRequiredNetworkType(NetworkType.CONNECTED)
                                 .build()