refactor(notifications): move the Not spam action into its own function

09e0cef4 gave onReceive a seventh return, one past detekt's ReturnCount
limit. The Not spam branch now calls allowFromAlert, which does the same
work: cancel the alert, confirm, allow the number for 24 hours, and report
it not spam when the shared data blocked it. The test file only picks up
ktlint's formatting.

Author: SysAdminDoc

app/src/main/java/com/sysadmindoc/callshield/service/SpamActionReceiver.kt

@@ -62,22 +62,8 @@ class SpamActionReceiver : BroadcastReceiver() {
                 }
 
                 NotificationHelper.ACTION_NOT_SPAM -> {
-                    val number = intent.getStringExtra(NotificationHelper.EXTRA_NUMBER) ?: return
-                    val notifId = intent.getIntExtra(NotificationHelper.EXTRA_NOTIF_ID, -1)
-                    val reasonCode = BlockReasonCode.fromStored(intent.getStringExtra(NotificationHelper.EXTRA_REASON_CODE))
-                    if (notifId >= 0) {
-                        notificationManager.cancel(notifId)
-                    }
-                    Toast.makeText(appContext, appContext.getString(R.string.notif_not_spam_allowed), Toast.LENGTH_SHORT).show()
-                    suspend {
-                        repo.temporaryAllowNumber(
-                            number,
-                            System.currentTimeMillis() + NotificationHelper.NOT_SPAM_ALLOW_MS,
-                            appContext.getString(R.string.desc_allowed_from_notification),
-                        )
-                        if (NotificationHelper.notSpamReachesCommunity(reasonCode)) {
-                            CommunityContributor.reportNotSpam(appContext, repo.normalizeNumber(number))
-                        }
+                    intent.getStringExtra(NotificationHelper.EXTRA_NUMBER)?.let { number ->
+                        allowFromAlert(appContext, notificationManager, repo, intent, number)
                     }
                 }
 
@@ -144,6 +130,32 @@ class SpamActionReceiver : BroadcastReceiver() {
         }
     }
 
+    /** "Not spam" on a blocked-call alert: let the number ring for a day, and tell the community when its data was wrong. */
+    private fun allowFromAlert(
+        appContext: Context,
+        notificationManager: NotificationManager,
+        repo: SpamRepository,
+        intent: Intent,
+        number: String,
+    ): suspend () -> Unit {
+        val notifId = intent.getIntExtra(NotificationHelper.EXTRA_NOTIF_ID, -1)
+        val reasonCode = BlockReasonCode.fromStored(intent.getStringExtra(NotificationHelper.EXTRA_REASON_CODE))
+        if (notifId >= 0) {
+            notificationManager.cancel(notifId)
+        }
+        Toast.makeText(appContext, appContext.getString(R.string.notif_not_spam_allowed), Toast.LENGTH_SHORT).show()
+        return {
+            repo.temporaryAllowNumber(
+                number,
+                System.currentTimeMillis() + NotificationHelper.NOT_SPAM_ALLOW_MS,
+                appContext.getString(R.string.desc_allowed_from_notification),
+            )
+            if (NotificationHelper.notSpamReachesCommunity(reasonCode)) {
+                CommunityContributor.reportNotSpam(appContext, repo.normalizeNumber(number))
+            }
+        }
+    }
+
     private fun Intent.reportType(): String =
         if (getBooleanExtra(NotificationHelper.EXTRA_IS_CALL, true)) {
             "spam"

app/src/test/java/com/sysadmindoc/callshield/service/BlockedAlertActionsTest.kt

@@ -43,8 +43,7 @@ class BlockedAlertActionsTest {
         notificationManager.cancelAll()
     }
 
-    private fun postedAlert(): Notification =
-        shadowOf(notificationManager).allNotifications.single { it.flags and Notification.FLAG_GROUP_SUMMARY == 0 }
+    private fun postedAlert(): Notification = shadowOf(notificationManager).allNotifications.single { it.flags and Notification.FLAG_GROUP_SUMMARY == 0 }
 
     @Test
     fun `a blocked call's alert offers Not spam instead of Block forever`() {