remove scrapers

adamff-dev · adamff-dev · commit e063dd58db24 · 2025-07-31T18:23:45.000+02:00
diff --git a/app/src/main/java/com/addev/listaspam/util/SharedPreferencesUtils.kt b/app/src/main/java/com/addev/listaspam/util/SharedPreferencesUtils.kt
@@ -56,14 +56,7 @@ fun getTruecallerApiCountry(context: Context): String? =
 fun setTruecallerApiCountry(context: Context, countryCode: String) =
     setStringPref(context, "pref_truecaller_country", countryCode.uppercase())
 
-fun shouldFilterWithListaSpamScraper(context: Context): Boolean =
-    getBooleanPref(context, "pref_filter_lista_spam_scraper", false)
-
-fun shouldFilterWithResponderONo(context: Context): Boolean =
-    getBooleanPref(context, "pref_filter_responder_o_no", false)
-
-fun shouldFilterWithCleverdialer(context: Context): Boolean =
-    getBooleanPref(context, "pref_filter_cleverdialer", false)
+// ...scraper-related preferences removed...
 
 fun shouldBlockNonContacts(context: Context): Boolean =
     getBooleanPref(context, "pref_block_non_contacts", false)
@@ -178,11 +171,65 @@ fun getWhitelistNumbers(context: Context): Set<String> {
  * @param number The phone number to check.
  * @return True if the number is blocked locally, false otherwise.
  */
+
+/**
+ * Checks if a number is blocked locally in shared preferences, supporting wildcards.
+ *
+ * Wildcard rules:
+ *   - '*' at the end: matches prefix (e.g., +33162*)
+ *   - '*' at the start: matches suffix (e.g., *98)
+ *   - '*' in the middle: matches infix (e.g., 213*134)
+ *   - No '*': exact match
+ *   - If pattern does not start with '+', also check with user's country prefix
+ *
+ * @param context The application context.
+ * @param number The phone number to check.
+ * @return True if the number is blocked locally, false otherwise.
+ */
 fun isNumberBlocked(context: Context, number: String): Boolean {
     val sharedPreferences = context.getSharedPreferences(SPAM_PREFS, Context.MODE_PRIVATE)
-    val blockedNumbers = sharedPreferences.getStringSet(BLOCK_NUMBERS_KEY, emptySet())
-    if (blockedNumbers != null) {
-        return blockedNumbers.contains(number)
+    val blockedNumbers = sharedPreferences.getStringSet(BLOCK_NUMBERS_KEY, emptySet()) ?: emptySet()
+    val normalizedNumber = number.replace("\\D".toRegex(), "")
+
+    // Helper to get user's country prefix (e.g., "+33")
+    fun getUserCountryPrefix(): String? {
+        return try {
+            val telephonyManager = context.getSystemService(Context.TELEPHONY_SERVICE) as? android.telephony.TelephonyManager
+            val countryIso = telephonyManager?.networkCountryIso?.uppercase()
+            if (countryIso != null) {
+                val phoneUtil = com.google.i18n.phonenumbers.PhoneNumberUtil.getInstance()
+                val code = phoneUtil.getCountryCodeForRegion(countryIso)
+                if (code > 0) "+$code" else null
+            } else null
+        } catch (e: Exception) { null }
+    }
+    val userPrefix = getUserCountryPrefix()
+
+    fun matchesPattern(pattern: String, num: String): Boolean {
+        return when {
+            pattern == "*" -> true
+            pattern.startsWith("*") && pattern.endsWith("*") && pattern.length > 2 -> num.contains(pattern.substring(1, pattern.length-1))
+            pattern.startsWith("*") -> num.endsWith(pattern.substring(1))
+            pattern.endsWith("*") -> num.startsWith(pattern.substring(0, pattern.length-1))
+            pattern.contains("*") -> {
+                val parts = pattern.split("*")
+                if (parts.size == 2) num.startsWith(parts[0]) && num.endsWith(parts[1])
+                else false
+            }
+            else -> num == pattern
+        }
+    }
+
+    for (pattern in blockedNumbers) {
+        if (pattern.isNullOrBlank()) continue
+        val normalizedPattern = pattern.replace("\\D".toRegex(), "")
+        // Try direct match
+        if (matchesPattern(normalizedPattern, normalizedNumber)) return true
+        // If pattern does not start with '+', try with user prefix
+        if (!pattern.startsWith("+") && userPrefix != null) {
+            val withPrefix = (userPrefix + normalizedPattern).replace("\\D".toRegex(), "")
+            if (matchesPattern(withPrefix, normalizedNumber)) return true
+        }
     }
     return false
 }
diff --git a/app/src/main/java/com/addev/listaspam/util/SpamUtils.kt b/app/src/main/java/com/addev/listaspam/util/SpamUtils.kt
@@ -38,16 +38,7 @@ import java.util.logging.Logger
 class SpamUtils {
 
     companion object {
-        // URLs
-        const val LISTA_SPAM_URL_TEMPLATE = "https://www.listaspam.com/busca.php?Telefono=%s"
-        const val LISTA_SPAM_CSS_SELECTOR =
-            ".rate-and-owner .phone_rating:not(.result-4):not(.result-5)"
-        private const val RESPONDERONO_URL_TEMPLATE =
-            "https://www.responderono.es/numero-de-telefono/%s"
-        private const val RESPONDERONO_CSS_SELECTOR = ".scoreContainer .score.negative"
-        private const val CLEVER_DIALER_URL_TEMPLATE = "https://www.cleverdialer.es/numero/%s"
-        private const val CLEVER_DIALER_CSS_SELECTOR =
-            "body:has(#comments):has(.front-stars:not(.star-rating .stars-4, .star-rating .stars-5)), .circle-spam"
+        // ...existing code...
 
         private const val SPAM_PREFS = "SPAM_PREFS"
         private const val BLOCK_NUMBERS_KEY = "BLOCK_NUMBERS"
@@ -240,35 +231,25 @@ class SpamUtils {
 
     private fun buildSpamCheckers(context: Context): List<suspend (String) -> Boolean> {
         val spamCheckers = mutableListOf<suspend (String) -> Boolean>()
-
-        // ListaSpam
+        // ...existing code for API-based checkers only...
         val listaSpamApi = shouldFilterWithListaSpamApi(context)
         if (listaSpamApi) {
             spamCheckers.add { number ->
                 ApiUtils.checkListaSpamApi(number, getListaSpamApiLang(context) ?: "EN")
             }
         }
-
-        // Tellows
         val tellowsApi = shouldFilterWithTellowsApi(context)
         if (tellowsApi) {
             spamCheckers.add { number ->
                 ApiUtils.checkTellowsSpamApi(number, getTellowsApiCountry(context) ?: "us")
             }
         }
-
-        // Truecaller
         val truecallerApi = shouldFilterWithTruecallerApi(context)
         if (truecallerApi) {
             spamCheckers.add { number ->
                 ApiUtils.checkTruecallerSpamApi(number, getTruecallerApiCountry(context) ?: "US")
             }
         }
-
-        if (shouldFilterWithListaSpamScraper(context) && !listaSpamApi) spamCheckers.add(::checkListaSpam)
-
-        if (shouldFilterWithResponderONo(context)) spamCheckers.add(::checkResponderono)
-        if (shouldFilterWithCleverdialer(context)) spamCheckers.add(::checkCleverdialer)
         return spamCheckers
     }
 
@@ -356,69 +337,7 @@ class SpamUtils {
         }
     }
 
-    /**
-     * Checks if a number is marked as spam on ListaSpam.
-     *
-     * @param number The phone number to check.
-     * @return True if the number is marked as spam, false otherwise.
-     */
-    private suspend fun checkListaSpam(number: String): Boolean {
-        val url = LISTA_SPAM_URL_TEMPLATE.format(number)
-        return checkUrlForSpam(
-            url,
-            LISTA_SPAM_CSS_SELECTOR
-        )
-    }
-
-    /**
-     * Checks if a number is marked as spam on Responderono.
-     *
-     * @param number The phone number to check.
-     * @return True if the number is marked as spam, false otherwise.
-     */
-    private suspend fun checkResponderono(number: String): Boolean {
-        val url = RESPONDERONO_URL_TEMPLATE.format(number)
-        return checkUrlForSpam(url, RESPONDERONO_CSS_SELECTOR)
-    }
-
-    /**
-     * Checks if a number is marked as spam on Cleverdialer.
-     *
-     * @param number The phone number to check.
-     * @return True if the number is marked as spam, false otherwise.
-     */
-    private suspend fun checkCleverdialer(number: String): Boolean {
-        val url = CLEVER_DIALER_URL_TEMPLATE.format(number)
-        return checkUrlForSpam(url, CLEVER_DIALER_CSS_SELECTOR)
-    }
-
-    /**
-     * Checks a URL for spam indicators using a CSS selector.
-     *
-     * @param url The URL to check.
-     * @param cssSelector The CSS selector to use for finding spam indicators.
-     * @return True if spam indicators are found, false otherwise.
-     */
-    private suspend fun checkUrlForSpam(url: String, cssSelector: String): Boolean {
-        val request = Request.Builder()
-            .header("User-Agent", USER_AGENT)
-            .url(url)
-            .build()
-
-        return withContext(Dispatchers.IO) {
-            try {
-                client.newCall(request).execute().use { response ->
-                    val body = response.body?.string() ?: return@withContext false
-                    val doc = Jsoup.parse(body)
-                    doc.select(cssSelector).isNotEmpty()
-                }
-            } catch (e: IOException) {
-                Logger.getLogger("checkUrlForSpam")
-                    .warning("Error checking URL: $url with error ${e.message}")
-                false
-            }
-        }
-    }
+    // ...scraper logic removed...
 
     /**
      * Handles the scenario when a phone number is identified as spam.
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
@@ -80,34 +80,6 @@
 
     </PreferenceCategory>
 
-    <!-- Spam Number Filters -->
-    <PreferenceCategory
-        android:title="@string/pref_category_scrapers_es"
-        app:iconSpaceReserved="false">
-
-        <CheckBoxPreference
-            android:defaultValue="false"
-            android:key="pref_filter_lista_spam_scraper"
-            android:summary="@string/pref_filter_lista_spam_scraper_summary"
-            android:title="@string/pref_filter_lista_spam_scraper_title"
-            app:iconSpaceReserved="false" />
-
-        <CheckBoxPreference
-            android:defaultValue="false"
-            android:key="pref_filter_responder_o_no"
-            android:summary="@string/pref_filter_responder_o_no_summary"
-            android:title="@string/pref_filter_responder_o_no_title"
-            app:iconSpaceReserved="false" />
-
-        <CheckBoxPreference
-            android:defaultValue="false"
-            android:key="pref_filter_cleverdialer"
-            android:summary="@string/pref_filter_cleverdialer_summary"
-            android:title="@string/pref_filter_cleverdialer_title"
-            app:iconSpaceReserved="false" />
-
-    </PreferenceCategory>
-
     <!-- Other Blocking Options -->
     <PreferenceCategory
         android:title="@string/pref_category_other_options"
