Add retry logic for received messages

Author: AchoArnold

android/app/src/main/java/com/httpsms/Constants.kt

@@ -3,9 +3,16 @@ package com.httpsms
 class Constants {
     companion object {
         const val KEY_MESSAGE_ID = "KEY_MESSAGE_ID"
+        const val KEY_MESSAGE_FROM = "KEY_MESSAGE_FROM"
+        const val KEY_MESSAGE_TO = "KEY_MESSAGE_TO"
+        const val KEY_MESSAGE_SIM = "KEY_MESSAGE_SIM"
+        const val KEY_MESSAGE_CONTENT = "KEY_MESSAGE_CONTENT"
+        const val KEY_MESSAGE_TIMESTAMP = "KEY_MESSAGE_TIMESTAMP"
         const val KEY_HEARTBEAT_ID = "KEY_HEARTBEAT_ID"
 
         const val SIM1 = "SIM1"
         const val SIM2 = "SIM2"
+
+        const val TIMESTAMP_PATTERN = "yyyy-MM-dd'T'HH:mm:ss.SSS'000000'ZZZZZ"
     }
 }

android/app/src/main/java/com/httpsms/HttpSmsApiService.kt

@@ -71,17 +71,13 @@ class HttpSmsApiService(private val apiKey: String, private val baseURL: URI) {
         sendEvent(messageId, "FAILED", timestamp, reason)
     }
 
-    fun receive(sim: String, from: String, to: String, content: String, timestamp: ZonedDateTime) {
-        val formatter  = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSS'000000'ZZZZZ")
-        val timestampString = formatter.format(timestamp).replace("+", "Z")
-
-
+    fun receive(sim: String, from: String, to: String, content: String, timestamp: String): Boolean {
         val body = """
             {
               "content": "${StringEscapeUtils.escapeJson(content)}",
               "sim": "$sim",
               "from": "$from",
-              "timestamp": "$timestampString",
+              "timestamp": "$timestamp",
               "to": "$to"
             }
         """.trimIndent()
@@ -97,12 +93,13 @@ class HttpSmsApiService(private val apiKey: String, private val baseURL: URI) {
         if (!response.isSuccessful) {
             Timber.e("error response [${response.body?.string()}] with code [${response.code}] while receiving message [${body}]")
             response.close()
-            return
+            return false
         }
 
         val message = ResponseMessage.fromJson(response.body!!.string())
         response.close()
         Timber.i("received message stored successfully for message with ID [${message?.data?.id}]" )
+        return true;
     }
 
     fun storeHeartbeat(phoneNumber: String, charging: Boolean) {

android/app/src/main/java/com/httpsms/ReceivedReceiver.kt

@@ -4,9 +4,20 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.provider.Telephony
+import androidx.work.BackoffPolicy
+import androidx.work.Constraints
+import androidx.work.Data
+import androidx.work.NetworkType
+import androidx.work.OneTimeWorkRequest
+import androidx.work.WorkManager
+import androidx.work.Worker
+import androidx.work.WorkerParameters
+import androidx.work.workDataOf
 import timber.log.Timber
 import java.time.ZoneOffset
 import java.time.ZonedDateTime
+import java.time.format.DateTimeFormatter
+import java.util.concurrent.TimeUnit
 
 class ReceivedReceiver: BroadcastReceiver()
 {
@@ -58,9 +69,46 @@ class ReceivedReceiver: BroadcastReceiver()
             return
         }
 
-        Thread {
-            Timber.i("[${sim}] forwarding received message from [${from}]")
-            HttpSmsApiService.create(context).receive(sim, from, to, content, timestamp)
-        }.start()
+        val constraints = Constraints.Builder()
+            .setRequiredNetworkType(NetworkType.CONNECTED)
+            .build()
+
+        val inputData: Data = workDataOf(
+            Constants.KEY_MESSAGE_FROM to from,
+            Constants.KEY_MESSAGE_TO to to,
+            Constants.KEY_MESSAGE_SIM to sim,
+            Constants.KEY_MESSAGE_CONTENT to content,
+            Constants.KEY_MESSAGE_TIMESTAMP to DateTimeFormatter.ofPattern(Constants.TIMESTAMP_PATTERN).format(timestamp).replace("+", "Z")
+        )
+
+        val work = OneTimeWorkRequest
+            .Builder(ReceivedSmsWorker::class.java)
+            .setConstraints(constraints)
+            .setInputData(inputData)
+            .build()
+
+        WorkManager
+            .getInstance(context)
+            .enqueue(work)
+
+        Timber.d("work enqueued with ID [${work.id}] for received message from [${from}] to [${to}]")
+    }
+
+    internal class ReceivedSmsWorker(appContext: Context, workerParams: WorkerParameters) : Worker(appContext, workerParams) {
+        override fun doWork(): Result {
+            Timber.i("[${this.inputData.getString(Constants.KEY_MESSAGE_SIM)}] forwarding received message from [${this.inputData.getString(Constants.KEY_MESSAGE_FROM)}] to [${this.inputData.getString(Constants.KEY_MESSAGE_TO)}]")
+
+            if (HttpSmsApiService.create(applicationContext).receive(
+                this.inputData.getString(Constants.KEY_MESSAGE_SIM)!!,
+                this.inputData.getString(Constants.KEY_MESSAGE_FROM)!!,
+                this.inputData.getString(Constants.KEY_MESSAGE_TO)!!,
+                this.inputData.getString(Constants.KEY_MESSAGE_CONTENT)!!,
+                this.inputData.getString(Constants.KEY_MESSAGE_TIMESTAMP)!!,
+            )) {
+                return Result.success()
+            }
+
+            return Result.retry()
+        }
     }
 }