rei-forks/element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More renaming

Browse Source
This commit is contained in:
Benoit Marty 2021-01-12 16:18:29 +01:00
parent b2df107f17
commit 50ba131350
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncService.kt
View File

@ -120,7 +120,11 @@ abstract class SyncService : Service() {
serviceScope.coroutineContext.cancelChildren() serviceScope.coroutineContext.cancelChildren()
if (!preventReschedule && periodic && sessionId != null && backgroundDetectionObserver.isInBackground) { if (!preventReschedule && periodic && sessionId != null && backgroundDetectionObserver.isInBackground) {
Timber.d("## Sync: Reschedule service in $syncDelaySeconds sec") Timber.d("## Sync: Reschedule service in $syncDelaySeconds sec")
onRescheduleAsked(sessionId ?: "", syncTimeoutSeconds, syncDelaySeconds) onRescheduleAsked(
sessionId = sessionId ?: "",
syncTimeoutSeconds = syncTimeoutSeconds,
syncDelaySeconds = syncDelaySeconds
)
} }
super.onDestroy() super.onDestroy()
} }
@ -177,7 +181,11 @@ abstract class SyncService : Service() {
// Network might be off, no need to reschedule endless alarms :/ // Network might be off, no need to reschedule endless alarms :/
preventReschedule = true preventReschedule = true
// Instead start a work to restart background sync when network is on // 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 // JobCancellation could be caught here when onDestroy cancels the coroutine context
if (isRunning.get()) stopMe() if (isRunning.get()) stopMe()
@ -217,9 +225,9 @@ abstract class SyncService : Service() {
abstract fun onStart(isInitialSync: Boolean) 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? { override fun onBind(intent: Intent?): IBinder? {
return null return null

12
vector/src/main/java/im/vector/app/core/services/VectorSyncService.kt
View File

@ -92,15 +92,19 @@ class VectorSyncService : SyncService() {
startForeground(NotificationUtils.NOTIFICATION_ID_FOREGROUND_SERVICE, notification) startForeground(NotificationUtils.NOTIFICATION_ID_FOREGROUND_SERVICE, notification)
} }
override fun onRescheduleAsked(sessionId: String, timeout: Int, delay: Int) { override fun onRescheduleAsked(sessionId: String,
rescheduleSyncService(sessionId, timeout, delay, false) 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") Timber.d("## Sync: A network error occurred during sync")
val rescheduleSyncWorkRequest: WorkRequest = val rescheduleSyncWorkRequest: WorkRequest =
OneTimeWorkRequestBuilder<RestartWhenNetworkOn>() OneTimeWorkRequestBuilder<RestartWhenNetworkOn>()
.setInputData(RestartWhenNetworkOn.createInputData(sessionId, timeout, delay)) .setInputData(RestartWhenNetworkOn.createInputData(sessionId, syncTimeoutSeconds, syncDelaySeconds))
.setConstraints(Constraints.Builder() .setConstraints(Constraints.Builder()
.setRequiredNetworkType(NetworkType.CONNECTED) .setRequiredNetworkType(NetworkType.CONNECTED)
.build() .build()