new: CallEvent + ModifyNumber

Author: aj3423

app/src/main/java/spam/blocker/db/BotTable.kt

@@ -12,6 +12,7 @@ import androidx.core.database.getStringOrNull
 import kotlinx.serialization.Serializable
 import spam.blocker.R
 import spam.blocker.service.bot.CalendarEvent
+import spam.blocker.service.bot.CallEvent
 import spam.blocker.service.bot.IAction
 import spam.blocker.service.bot.ISchedule
 import spam.blocker.service.bot.MyWorkManager
@@ -37,8 +38,10 @@ data class Bot(
     val lastLogTime: Long = 0,
 ) {
 
+    // TODO: refactor this ..
+
     // This is shown as the Bot summary on main UI
-    // 3 types: Scheduled / Manual / CalendarEvent / SmsEvent
+    // 3 types: Scheduled / Manual / CalendarEvent / SmsEvent / Call_or_SMS
     @Composable
     fun TriggerType(modifier: Modifier) {
         val ctx = LocalContext.current
@@ -58,6 +61,8 @@ data class Bot(
                 firstAction.TriggerType(modifier)
             } else if (firstAction is SmsEvent) {
                 firstAction.TriggerType(modifier)
+            } else if (firstAction is CallEvent) {
+                firstAction.TriggerType(modifier)
             } else {
                 // Manual
                 GreyLabel(
@@ -78,6 +83,8 @@ data class Bot(
             return firstAction.isActivated()
         } else if (firstAction is SmsEvent) {
             return firstAction.isActivated()
+        } else if (firstAction is CallEvent) {
+            return firstAction.isActivated()
         }
         return false // manually trigger
     }

app/src/main/java/spam/blocker/service/SmsReceiver.kt

@@ -6,12 +6,8 @@ import android.content.Context
 import android.content.Intent
 import android.provider.Telephony
 import spam.blocker.Events
-import spam.blocker.db.BotTable
 import spam.blocker.db.HistoryRecord
 import spam.blocker.db.SmsTable
-import spam.blocker.service.bot.ActionContext
-import spam.blocker.service.bot.SmsEvent
-import spam.blocker.service.bot.executeAll
 import spam.blocker.service.checker.Checker
 import spam.blocker.service.checker.ICheckResult
 import spam.blocker.ui.NotificationTrampolineActivity
@@ -50,41 +46,17 @@ open class SmsReceiver : BroadcastReceiver() {
         processSms(ctx, logger = null, rawNumber, messageBody)
     }
 
-    // Run all workflows that have `SMS Event` as the first action
-    fun triggerSmsEventWorkflows(
-        ctx: Context,
-        logger: ILogger?,
-        rawNumber: String,
-        messageBody: String,
-    ) {
-        BotTable.listAll(ctx)
-            .filter {
-                val firstAction = it.actions.firstOrNull()
-                firstAction is SmsEvent && firstAction.isActivated()
-            }
-            .forEach {
-                val aCtx = ActionContext(
-                    logger = logger,
-                    rawNumber = rawNumber,
-                    smsContent = messageBody,
-                )
-                it.actions.executeAll(ctx, aCtx)
-            }
-    }
-
     fun processSms(
         ctx: Context,
         logger: ILogger?,
         rawNumber: String,
         messageBody: String
     ): ICheckResult {
 
-        triggerSmsEventWorkflows(ctx, logger, rawNumber, messageBody)
-
         val r = Checker.checkSms(ctx, logger, rawNumber, messageBody)
 
         run {
-            // 1. log to db
+            // 1. log to history db
             val spf = spf.HistoryOptions(ctx)
             val isLogEnabled = spf.isLoggingEnabled()
             val recordId = if (isLogEnabled)

app/src/main/java/spam/blocker/service/bot/Action.kt

@@ -13,6 +13,7 @@ import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.yield
 import kotlinx.serialization.PolymorphicSerializer
 import kotlinx.serialization.builtins.ListSerializer
+import spam.blocker.service.checker.CheckContext
 import spam.blocker.util.ILogger
 import spam.blocker.util.Permission
 import spam.blocker.util.PermissionWrapper
@@ -24,13 +25,15 @@ import spam.blocker.util.PermissionWrapper
 
 val botActions = listOf(
     HttpDownload(),
-    CalendarEvent(),
     SmsEvent(),
+    CallEvent(),
+    CalendarEvent(),
     ImportToSpamDB(),
     CleanupSpamDB(),
     ImportAsRegexRule(),
     FindRules(),
     ModifyRules(),
+    ModifyNumber(),
     ReadFile(),
     WriteFile(),
     ParseCSV(),
@@ -100,6 +103,12 @@ data class ActionContext(
     //  to simulate the "priority" of positive/negative identifiers.
     //  (e.g.: add two `ParseQueryResult` actions, one for positive, one for negative)
     var lastParsedQueryData: ByteArray? = null,
+
+    // For altering rules on the fly, e.g. temporarily enable a rule for some ongoing calendar event.
+    // Changes happens in memory and won't persist to the configuration.
+    var cCtx: CheckContext? = null,
+    var isInMemory: Boolean = false,
+
 )
 
 interface IAction {