SpamUtils.kt: Refactor spam number checking logic to improve contact handling

Author: adamff-dev

app/src/main/java/com/addev/listaspam/util/SpamUtils.kt

@@ -125,6 +125,24 @@ class SpamUtils {
                 }
             }
 
+            val isNumberInAgenda = isNumberInAgenda(context, number)
+
+            // Don't check number if is in contacts
+            if (isNumberInAgenda) {
+                return@launch
+            }
+            
+            if (shouldBlockNonContacts(context)) {
+                handleSpamNumber(
+                    context,
+                    number,
+                    false,
+                    context.getString(R.string.block_non_contact),
+                    callback
+                )
+                return@launch
+            }
+
             // End call if the number is already blocked
             if (blockedNumbers?.contains(number) == true) {
                 handleSpamNumber(
@@ -152,13 +170,6 @@ class SpamUtils {
                 return@launch
             }
 
-            if (isNumberWhitelisted(context, number) ||
-                isNumberBlocked(context, number) ||
-                isContactOrShouldBlockNonContacts(context, number)
-            ) {
-                return@launch
-            }
-
             if (isInternationalCall(number) && shouldBlockInternationalNumbers(context)) {
                 handleSpamNumber(
                     context,
@@ -221,26 +232,6 @@ class SpamUtils {
         return@coroutineScope isSpam
     }
 
-    private fun isContactOrShouldBlockNonContacts(context: Context, number: String): Boolean {
-        if (ContextCompat.checkSelfPermission(
-                context,
-                Manifest.permission.READ_CONTACTS
-            ) == PackageManager.PERMISSION_GRANTED
-        ) {
-            if (isNumberInAgenda(context, number)) return true
-            if (shouldBlockNonContacts(context)) {
-                handleSpamNumber(
-                    context,
-                    number,
-                    false,
-                    context.getString(R.string.block_non_contact),
-                    {})
-                return true
-            }
-        }
-        return false
-    }
-
     private fun buildSpamCheckers(context: Context): List<suspend (String) -> Boolean> {
         val spamCheckers = mutableListOf<suspend (String) -> Boolean>()