[webhooks] require internet access option

Author: capcom6

app/src/main/java/me/capcom/smsgateway/modules/settings/Module.kt

@@ -8,6 +8,7 @@ import me.capcom.smsgateway.modules.localserver.LocalServerSettings
 import me.capcom.smsgateway.modules.logs.LogsSettings
 import me.capcom.smsgateway.modules.messages.MessagesSettings
 import me.capcom.smsgateway.modules.ping.PingSettings
+import me.capcom.smsgateway.modules.webhooks.WebhooksSettings
 import org.koin.dsl.module
 
 val settingsModule = module {
@@ -43,4 +44,9 @@ val settingsModule = module {
             PreferencesStorage(get(), "logs")
         )
     }
+    factory {
+        WebhooksSettings(
+            PreferencesStorage(get(), "webhooks")
+        )
+    }
 }

app/src/main/java/me/capcom/smsgateway/modules/webhooks/Module.kt

@@ -1,9 +1,10 @@
 package me.capcom.smsgateway.modules.webhooks
 
+import org.koin.core.module.dsl.singleOf
 import org.koin.dsl.module
 
 val webhooksModule = module {
-    single { WebHooksService(get(), get(), get()) }
+    singleOf(::WebHooksService)
 }
 
 val NAME = "webhooks"

app/src/main/java/me/capcom/smsgateway/modules/webhooks/WebHooksService.kt

@@ -19,6 +19,7 @@ class WebHooksService(
     private val webHooksDao: WebHooksDao,
     private val localServerSettings: LocalServerSettings,
     private val gatewaySettings: GatewaySettings,
+    private val webhooksSettings: WebhooksSettings,
 ) : KoinComponent {
     private val eventsReceiver by lazy { EventsReceiver() }
 
@@ -102,7 +103,8 @@ class WebHooksService(
                     event = event,
                     deviceId = deviceId,
                     payload = payload,
-                )
+                ),
+                webhooksSettings.internetRequired
             )
         }
     }

app/src/main/java/me/capcom/smsgateway/modules/webhooks/WebhooksSettings.kt

@@ -0,0 +1,15 @@
+package me.capcom.smsgateway.modules.webhooks
+
+import me.capcom.smsgateway.modules.settings.KeyValueStorage
+import me.capcom.smsgateway.modules.settings.get
+
+class WebhooksSettings(
+    private val storage: KeyValueStorage,
+) {
+    val internetRequired: Boolean
+        get() = storage.get<Boolean>(INTERNET_REQUIRED) ?: true
+
+    companion object {
+        const val INTERNET_REQUIRED = "internet_required"
+    }
+}

app/src/main/java/me/capcom/smsgateway/modules/webhooks/workers/SendWebhookWorker.kt

@@ -2,9 +2,11 @@ package me.capcom.smsgateway.modules.webhooks.workers
 
 import android.content.Context
 import androidx.work.BackoffPolicy
+import androidx.work.Constraints
 import androidx.work.CoroutineWorker
 import androidx.work.ForegroundInfo
 import androidx.work.ListenableWorker
+import androidx.work.NetworkType
 import androidx.work.OneTimeWorkRequestBuilder
 import androidx.work.OutOfQuotaPolicy
 import androidx.work.WorkManager
@@ -168,7 +170,8 @@ class SendWebhookWorker(appContext: Context, params: WorkerParameters) :
         fun start(
             context: Context,
             url: String,
-            data: WebHookEventDTO
+            data: WebHookEventDTO,
+            internetRequired: Boolean
         ) {
             val work = OneTimeWorkRequestBuilder<SendWebhookWorker>()
                 .setInputData(
@@ -183,11 +186,15 @@ class SendWebhookWorker(appContext: Context, params: WorkerParameters) :
                     WorkRequest.MIN_BACKOFF_MILLIS,
                     TimeUnit.MILLISECONDS
                 )
-                .setConstraints(
-                    androidx.work.Constraints.Builder()
-                        .setRequiredNetworkType(androidx.work.NetworkType.CONNECTED)
-                        .build()
-                )
+                .apply {
+                    if (internetRequired) {
+                        setConstraints(
+                            Constraints.Builder()
+                                .setRequiredNetworkType(NetworkType.CONNECTED)
+                                .build()
+                        )
+                    }
+                }
                 .build()
 
             WorkManager.getInstance(context)

app/src/main/res/values/strings.xml

@@ -60,4 +60,6 @@
     <string name="logs">Logs</string>
     <string name="view">View</string>
     <string name="list_of_last_50_log_entries">List of last 50 log entries</string>
+    <string name="webhooks">WebHooks</string>
+    <string name="the_webhook_request_will_wait_for_an_internet_connection">The webhook request will wait for an internet connection</string>
 </resources>

app/src/main/res/xml/root_preferences.xml

@@ -63,6 +63,14 @@
             app:useSimpleSummaryProvider="true" />
     </PreferenceCategory>
 
+    <PreferenceCategory app:title="@string/webhooks">
+        <SwitchPreference
+            android:key="webhooks.internet_required"
+            app:title="Require Internet connection"
+            app:summary="@string/the_webhook_request_will_wait_for_an_internet_connection"
+            android:defaultValue="true"/>
+    </PreferenceCategory>
+
     <PreferenceCategory
         android:summary="@string/online_status_at_the_cost_of_battery_life"
         app:title="@string/ping">