Add 2 more features: block international calls and block hidden number calls

Author: adamff-dev

app/src/main/java/com/addev/listaspam/MainActivity.kt

@@ -117,8 +117,6 @@ class MainActivity : AppCompatActivity(), CallLogAdapter.OnItemChangedListener {
             positions.forEach { position ->
                 callLogAdapter?.notifyItemChanged(position)
             }
-        } else {
-            callLogAdapter?.notifyDataSetChanged()
         }
     }
 
@@ -192,6 +190,7 @@ class MainActivity : AppCompatActivity(), CallLogAdapter.OnItemChangedListener {
 
         permissionDeniedDialog = AlertDialog.Builder(this)
             .setCancelable(false)
+            .setIcon(android.R.drawable.ic_dialog_alert)
             .setTitle(R.string.permissions_required_title)
             .setMessage(message)
             .setPositiveButton(R.string.go_to_settings) { _, _ ->

app/src/main/java/com/addev/listaspam/adapter/CallLogAdapter.kt

@@ -7,6 +7,7 @@ import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.net.Uri
+import android.provider.CallLog
 import android.provider.ContactsContract
 import android.view.Gravity
 import android.view.LayoutInflater
@@ -63,6 +64,7 @@ class CallLogAdapter(
         private val numberTextView: TextView = itemView.findViewById(R.id.numberTextView)
         private val dateTextView: TextView = itemView.findViewById(R.id.dateTextView)
         private val durationTextView: TextView = itemView.findViewById(R.id.durationTextView)
+        private val actionTextView: TextView = itemView.findViewById(R.id.actionTextView)
         private val overflowMenuButton = itemView.findViewById<ImageButton>(R.id.overflowMenuButton)
 
         fun bind(callLog: CallLogEntry, isBlocked: Boolean, isWhitelisted: Boolean = false) {
@@ -79,7 +81,21 @@ class CallLogAdapter(
             dateTextView.text = formatter.format(callLog.date)
             durationTextView.text = context.getString(R.string.duration_label, callLog.duration)
 
+            val action = when (callLog.type) {
+                CallLog.Calls.INCOMING_TYPE -> context.getString(R.string.call_incoming)
+                CallLog.Calls.MISSED_TYPE -> context.getString(R.string.call_missed)
+                CallLog.Calls.REJECTED_TYPE -> context.getString(R.string.call_rejected)
+                CallLog.Calls.BLOCKED_TYPE -> context.getString(R.string.call_blocked)
+                else -> context.getString(R.string.call_unknown)
+            }
+
+            actionTextView.text = action
+
             when {
+                callLog.type == CallLog.Calls.BLOCKED_TYPE -> {
+                    numberTextView.setTextColor(ContextCompat.getColor(context, android.R.color.holo_red_light))
+                    actionTextView.setTextColor(ContextCompat.getColor(context, android.R.color.holo_red_light))
+                }
                 isBlocked -> numberTextView.setTextColor(ContextCompat.getColor(context, android.R.color.holo_red_light))
                 isWhitelisted -> numberTextView.setTextColor(ContextCompat.getColor(context, android.R.color.holo_blue_dark))
                 else -> numberTextView.setTextColor(ContextCompat.getColor(context, android.R.color.darker_gray))

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

@@ -12,6 +12,16 @@ fun isBlockingEnabled(context: Context): Boolean {
     return sharedPreferences.getBoolean("pref_enable_blocking", true)
 }
 
+fun shouldBlockHiddenNumbers(context: Context): Boolean {
+    val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
+    return sharedPreferences.getBoolean("pref_block_hidden_numbers", true)
+}
+
+fun shouldBlockInternationalNumbers(context: Context): Boolean {
+    val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
+    return sharedPreferences.getBoolean("pref_block_international_numbers", true)
+}
+
 fun shouldFilterWithListaSpam(context: Context): Boolean {
     val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
     return sharedPreferences.getBoolean("pref_filter_lista_spam", true)

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

@@ -10,6 +10,8 @@ import android.provider.ContactsContract
 import android.widget.Toast
 import androidx.core.content.ContextCompat
 import com.addev.listaspam.R
+import com.google.i18n.phonenumbers.PhoneNumberUtil
+import com.google.i18n.phonenumbers.Phonenumber
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -18,6 +20,7 @@ import okhttp3.OkHttpClient
 import okhttp3.Request
 import org.jsoup.Jsoup
 import java.io.IOException
+import java.util.Locale
 
 /**
  * Utility class for handling spam number checks and notifications.
@@ -27,8 +30,10 @@ 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 = ".data_top .phone_rating.result-3, .data_top .phone_rating.result-2, .data_top .phone_rating.result-1, .alert-icon-big"
         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"
     }
 
@@ -44,14 +49,28 @@ class SpamUtils {
     fun checkSpamNumber(context: Context, number: String, callback: (isSpam: Boolean) -> Unit) {
         CoroutineScope(Dispatchers.IO).launch {
             if (!isBlockingEnabled(context)) {
+                showToast(context, context.getString(R.string.blocking_disabled), Toast.LENGTH_LONG)
+                return@launch
+            }
+
+            if (number.isNullOrBlank() && shouldBlockHiddenNumbers(context)) {
+                showToast(context, context.getString(R.string.block_hidden_number), Toast.LENGTH_LONG)
+                handleSpamNumber(context, number, false, callback)
                 return@launch
             }
 
             if (isNumberWhitelisted(context, number)) {
                 return@launch
             }
 
+            if (isInternationalCall(number) && shouldBlockInternationalNumbers(context)) {
+                showToast(context, context.getString(R.string.block_international_call), Toast.LENGTH_LONG)
+                handleSpamNumber(context, number, false, callback)
+                return@launch
+            }
+
             if (isNumberBlocked(context, number)) {
+                showToast(context, context.getString(R.string.block_already_blocked_number), Toast.LENGTH_LONG)
                 handleSpamNumber(context, number, callback)
                 return@launch
             }
@@ -60,7 +79,9 @@ class SpamUtils {
                 if (isNumberInAgenda(context, number)) {
                     return@launch
                 } else if (shouldBlockNonContacts(context)) {
-                    handleSpamNumber(context, number, callback)
+                    showToast(context, context.getString(R.string.block_non_contact), Toast.LENGTH_LONG)
+                    handleSpamNumber(context, number, false, callback)
+                    return@launch
                 }
             }
 
@@ -81,13 +102,39 @@ class SpamUtils {
             }
 
             if (isSpam) {
+                showToast(context, context.getString(R.string.block_non_contact), Toast.LENGTH_LONG)
                 handleSpamNumber(context, number, callback)
             } else {
                 handleNonSpamNumber(context, number, callback)
             }
         }
     }
 
+
+    fun isInternationalCall(phoneNumber: String): Boolean {
+        // Get an instance of PhoneNumberUtil
+        val phoneNumberUtil = PhoneNumberUtil.getInstance()
+
+        try {
+            // Parse the phone number
+            val parsedNumber: Phonenumber.PhoneNumber = phoneNumberUtil.parse(phoneNumber, null)
+
+            // Get the country code of the parsed number
+            val phoneCountryCode = parsedNumber.countryCode
+
+            // Get the device's country code based on locale
+            val deviceCountryCode = PhoneNumberUtil.getInstance()
+                .getCountryCodeForRegion(Locale.getDefault().country)
+
+            // Check if the country codes are different
+            return phoneCountryCode != deviceCountryCode
+
+        } catch (e: Exception) {
+            e.printStackTrace()
+            return false
+        }
+    }
+
     /**
      * Normalizes a phone number by removing all non-digit characters.
      *
@@ -140,7 +187,7 @@ class SpamUtils {
         val url = LISTA_SPAM_URL_TEMPLATE.format(number)
         return checkUrlForSpam(
             url,
-            ".data_top .phone_rating.result-3, .data_top .phone_rating.result-2, .data_top .phone_rating.result-1, .alert-icon-big"
+            LISTA_SPAM_CSS_SELECTOR
         )
     }
 
@@ -152,7 +199,7 @@ class SpamUtils {
      */
     private suspend fun checkResponderono(number: String): Boolean {
         val url = RESPONDERONO_URL_TEMPLATE.format(number)
-        return checkUrlForSpam(url, ".scoreContainer .score.negative")
+        return checkUrlForSpam(url, RESPONDERONO_CSS_SELECTOR)
     }
 
     /**
@@ -191,7 +238,24 @@ class SpamUtils {
         number: String,
         callback: (isSpam: Boolean) -> Unit
     ) {
-        saveSpamNumber(context, number)
+        handleSpamNumber(context, number, true, callback)
+    }
+
+    /**
+     * Handles the scenario when a phone number is identified as spam.
+     * @param context Context for accessing resources.
+     * @param number Phone number identified as spam.
+     * @param callback Callback function to handle the result.
+     */
+    private fun handleSpamNumber(
+        context: Context,
+        number: String,
+        saveNumber: Boolean,
+        callback: (isSpam: Boolean) -> Unit
+    ) {
+        if (saveNumber) {
+            saveSpamNumber(context, number)
+        }
         sendNotification(context, number)
         callback(true)
     }

app/src/main/res/layout/item_call_log.xml

@@ -31,6 +31,15 @@
         android:layout_alignParentStart="true"
         android:layout_alignStart="@id/numberTextView" />
 
+    <TextView
+        android:id="@+id/actionTextView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="14sp"
+        android:layout_below="@id/durationTextView"
+        android:layout_alignParentStart="true"
+        android:layout_alignStart="@id/numberTextView" />
+
     <ImageButton
         android:id="@+id/overflowMenuButton"
         android:layout_width="wrap_content"

app/src/main/res/values-es/strings.xml

@@ -22,6 +22,13 @@
     <string name="notification_text_spam_blocked">Número de spam bloqueado: %1$s</string>
     <string name="number_copied_to_clipboard">Número copiado al portapapeles</string>
 
+    <!-- Call types -->
+    <string name="call_incoming">Llamada entrante</string>
+    <string name="call_missed">Llamada perdida</string>
+    <string name="call_rejected">Llamada rechazada</string>
+    <string name="call_blocked">Llamada bloqueada</string>
+    <string name="call_unknown">Desconocido</string>
+
     <!-- Preferences -->
     <string name="action_settings">Ajustes</string>
 
@@ -37,6 +44,12 @@
     <string name="pref_block_non_contacts_title">Bloquear números desconocidos</string>
     <string name="pref_block_non_contacts_summary">Bloquea todas las llamadas de números que no están en tu lista de contactos</string>
 
+    <string name="pref_block_hidden_numbers_title">Bloquear números ocultos</string>
+    <string name="pref_block_hidden_numbers_summary">Bloquea todas las llamadas de números ocultos</string>
+
+    <string name="pref_block_international_numbers_title">Bloquear números internacionales</string>
+    <string name="pref_block_international_numbers_summary">Bloquea todas las llamadas de un país diferente al tuyo</string>
+
     <string name="pref_show_notification_title">Mostrar notificación al bloquear llamadas</string>
     <string name="pref_show_notification_summary">Recibe una notificación cuando una llamada es bloqueada</string>
 
@@ -47,4 +60,12 @@
     <string name="add_to_whitelist">Añadir a lista blanca</string>
     <string name="unblock">Desbloquear</string>
     <string name="remove_from_whitelist">Eliminar de la lista blanca</string>
+
+    <!-- SpamUtils blocking reasons -->
+    <string name="blocking_disabled">El bloqueo de llamadas está desactivado en la configuración</string>
+    <string name="block_spam_number">Bloqueando llamada porque está reportada como spam</string>
+    <string name="block_hidden_number">Bloqueando llamada porque es de un número oculto</string>
+    <string name="block_international_call">Bloqueando llamada porque es una llamada internacional</string>
+    <string name="block_already_blocked_number">Bloqueando llamada porque es de un número ya bloqueado</string>
+    <string name="block_non_contact">Bloqueando llamada porque no es de un contacto en tu agenda</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -22,6 +22,13 @@
     <string name="notification_text_spam_blocked">Blocked spam number: %1$s</string>
     <string name="number_copied_to_clipboard">Phone number copied to clipboard</string>
 
+    <!-- Call types -->
+    <string name="call_incoming">Incoming call</string>
+    <string name="call_missed">Missed call</string>
+    <string name="call_rejected">Rejected call</string>
+    <string name="call_blocked">Blocked call</string>
+    <string name="call_unknown">Unknown</string>
+
     <!-- Preferences -->
     <string name="action_settings">Settings</string>
 
@@ -37,14 +44,29 @@
     <string name="pref_block_non_contacts_title">Block Unknown Numbers</string>
     <string name="pref_block_non_contacts_summary">Blocks all calls from numbers not in your contact list</string>
 
+    <string name="pref_block_hidden_numbers_title">Block Hidden Numbers</string>
+    <string name="pref_block_hidden_numbers_summary">Block all calls from hidden numbers</string>
+
+    <string name="pref_block_international_numbers_title">Block International Numbers</string>
+    <string name="pref_block_international_numbers_summary">Block all calls from a country different from yours</string>
+
     <string name="pref_show_notification_title">Show Notification on call blocking</string>
     <string name="pref_show_notification_summary">Receive a notification when a call is blocked</string>
 
+
     <!-- item_actions -->
     <string name="report_in_listaspam_com">Report in ListaSpam</string>
     <string name="search_in_google">Search in Google</string>
     <string name="block">Block</string>
     <string name="add_to_whitelist">Add to whitelist</string>
     <string name="unblock">Unblock</string>
     <string name="remove_from_whitelist">Remove from whitelist</string>
+
+    <!-- SpamUtils blocking reasons -->
+    <string name="blocking_disabled">Call blocking is disabled in settings</string>
+    <string name="block_hidden_number">Blocking call because it\'s from a hidden number</string>
+    <string name="block_spam_number">Blocking call because it\'s reported as spam</string>
+    <string name="block_international_call">Blocking call because it\'s an international call</string>
+    <string name="block_already_blocked_number">Blocking call because it\'s from an already blocked number</string>
+    <string name="block_non_contact">Blocking call because it\'s not from a contact in your agenda</string>
 </resources>

app/src/main/res/xml/preferences.xml

@@ -22,6 +22,18 @@
         android:summary="@string/pref_filter_responder_o_no_summary"
         android:defaultValue="true" />
 
+    <CheckBoxPreference
+        android:key="pref_block_hidden_numbers"
+        android:title="@string/pref_block_hidden_numbers_title"
+        android:summary="@string/pref_block_hidden_numbers_summary"
+        android:defaultValue="true" />
+
+    <CheckBoxPreference
+        android:key="pref_block_international_numbers"
+        android:title="@string/pref_block_international_numbers_title"
+        android:summary="@string/pref_block_international_numbers_summary"
+        android:defaultValue="false" />
+
     <!-- Bloquear todos los números que no sean contactos -->
     <CheckBoxPreference
         android:key="pref_block_non_contacts"

gradle/libs.versions.toml

@@ -1,26 +1,35 @@
 [versions]
 agp = "8.5.1"
+jsoup = "1.14.3"
 kotlin = "1.9.0"
 coreKtx = "1.13.1"
 junit = "4.13.2"
 junitVersion = "1.2.1"
 espressoCore = "3.6.1"
 appcompat = "1.7.0"
+kotlinxCoroutinesCore = "1.7.3"
+libphonenumber = "8.12.35"
 material = "1.12.0"
 activity = "1.9.1"
 constraintlayout = "2.1.4"
+okhttp = "4.9.3"
 preferenceKtx = "1.2.1"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
+jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }
 androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
 androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
 androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
+kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinxCoroutinesCore" }
+kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinxCoroutinesCore" }
+libphonenumber = { module = "com.googlecode.libphonenumber:libphonenumber", version.ref = "libphonenumber" }
 material = { group = "com.google.android.material", name = "material", version.ref = "material" }
 androidx-activity = { group = "androidx.activity", name = "activity", version.ref = "activity" }
 androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" }
 androidx-preference-ktx = { group = "androidx.preference", name = "preference-ktx", version.ref = "preferenceKtx" }
+okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }