SpamUtils.kt: Blocked numbers take priority over contacts

Author: adamff-dev

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

@@ -164,31 +164,31 @@ class SpamUtils {
                 return@launch
             }
 
-            // Don't check number if is in contacts
-            val isNumberInAgenda = isNumberInAgenda(context, number)
-            if (isNumberInAgenda) {
-                callback(false)
-                return@launch
-            }
-
-            if (shouldBlockNonContacts(context)) {
+            // End call if the number is already blocked
+            if (blockedNumbers?.contains(number) == true) {
                 handleSpamNumber(
                     context,
                     number,
                     false,
-                    context.getString(R.string.block_non_contact),
+                    context.getString(R.string.block_already_blocked_number),
                     callback
                 )
                 return@launch
             }
 
-            // End call if the number is already blocked
-            if (blockedNumbers?.contains(number) == true) {
+            // Don't check number if is in contacts
+            val isNumberInAgenda = isNumberInAgenda(context, number)
+            if (isNumberInAgenda) {
+                callback(false)
+                return@launch
+            }
+
+            if (shouldBlockNonContacts(context)) {
                 handleSpamNumber(
                     context,
                     number,
                     false,
-                    context.getString(R.string.block_already_blocked_number),
+                    context.getString(R.string.block_non_contact),
                     callback
                 )
                 return@launch