From 6c69a6055da7fa45f4a7702696a76c7366b64707 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Thu, 25 Feb 2021 00:17:27 +0100
Subject: [PATCH] Support retry after M_LIMIT_EXCEEDED

---
 .../sdk/internal/task/ConfigurableTask.kt     |  6 +++--
 .../matrix/android/sdk/internal/task/Task.kt  | 22 +++++++++++++++++++
 .../android/sdk/internal/task/TaskExecutor.kt |  6 ++---
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/ConfigurableTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/ConfigurableTask.kt
index 97f9a0dd51..bc80cf7ee8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/ConfigurableTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/ConfigurableTask.kt
@@ -37,7 +37,8 @@ internal data class ConfigurableTask<PARAMS, RESULT>(
         val id: UUID,
         val callbackThread: TaskThread,
         val executionThread: TaskThread,
-        val callback: MatrixCallback<RESULT>
+        val callback: MatrixCallback<RESULT>,
+        val maxRetryCount: Int = 0
 
 ) : Task<PARAMS, RESULT> by task {
 
@@ -57,7 +58,8 @@ internal data class ConfigurableTask<PARAMS, RESULT>(
                 id = id,
                 callbackThread = callbackThread,
                 executionThread = executionThread,
-                callback = callback
+                callback = callback,
+                maxRetryCount = retryCount
         )
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/Task.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/Task.kt
index a6c80a0b1a..a5d031e02a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/Task.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/Task.kt
@@ -16,7 +16,29 @@
 
 package org.matrix.android.sdk.internal.task
 
+import kotlinx.coroutines.delay
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.failure.shouldBeRetried
+import timber.log.Timber
+
 internal interface Task<PARAMS, RESULT> {
 
     suspend fun execute(params: PARAMS): RESULT
+
+    suspend fun executeRetry(params: PARAMS, remainingRetry: Int) : RESULT {
+        return try {
+            execute(params)
+        } catch (failure: Throwable) {
+            if (failure.shouldBeRetried() && remainingRetry > 0) {
+                Timber.d(failure, "## TASK: Retriable error")
+                if (failure is Failure.ServerError) {
+                    val waitTime = failure.error.retryAfterMillis ?: 0L
+                    Timber.d(failure, "## TASK: Quota wait time $waitTime")
+                    delay(waitTime + 100)
+                }
+                return executeRetry(params, remainingRetry - 1)
+            }
+            throw failure
+        }
+    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/TaskExecutor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/TaskExecutor.kt
index 478a356432..4da16eff22 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/TaskExecutor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/TaskExecutor.kt
@@ -40,9 +40,9 @@ internal class TaskExecutor @Inject constructor(private val coroutineDispatchers
                 .launch(task.callbackThread.toDispatcher()) {
                     val resultOrFailure = runCatching {
                         withContext(task.executionThread.toDispatcher()) {
-                            Timber.v("Enqueue task $task")
-                            Timber.v("Execute task $task on ${Thread.currentThread().name}")
-                            task.execute(task.params)
+                            Timber.v("## TASK: Enqueue task $task")
+                            Timber.v("## TASK: Execute task $task on ${Thread.currentThread().name}")
+                            task.executeRetry(task.params, task.maxRetryCount)
                         }
                     }
                     resultOrFailure