[webhooks] refactor retry condition

capcom6 · Jun 24, 2024 · 453772c · 453772c
1 parent 33c0319
commit 453772c
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/app/src/main/java/me/capcom/smsgateway/modules/webhooks/workers/SendWebhookWorker.kt b/app/src/main/java/me/capcom/smsgateway/modules/webhooks/workers/SendWebhookWorker.kt
@@ -39,6 +39,10 @@ class SendWebhookWorker(appContext: Context, params: WorkerParameters) :
 
     override suspend fun doWork(): Result {
         try {
+            if (runAttemptCount > MAX_RETRIES) {
+                return Result.failure()
+            }
+
             val url = inputData.getString(INPUT_URL) ?: return Result.failure()
             val data = inputData.getString(INPUT_DATA)
                 ?.let { gson.fromJson(it, JsonObject::class.java) }
@@ -59,10 +63,7 @@ class SendWebhookWorker(appContext: Context, params: WorkerParameters) :
             return Result.failure()
         } catch (e: Throwable) {
             e.printStackTrace()
-            return when (runAttemptCount >= MAX_RETRIES) {
-                false -> Result.retry()
-                else -> Result.failure()
-            }
+            return Result.retry()
         } finally {
             client.close()
         }