Format code

adamff-dev · adamff-dev · commit 3b519aa74199 · 2024-08-04T13:44:49.000+02:00
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -14,8 +14,10 @@
     <!-- for contacts -->
     <uses-permission android:name="android.permission.READ_CONTACTS" />
 
-    <uses-permission android:name="android.permission.INTERNET"/>
+    <!-- for internet access -->
+    <uses-permission android:name="android.permission.INTERNET" />
 
+    <!-- for posting notifications -->
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <application
@@ -48,7 +50,7 @@
 
         <receiver
             android:name=".MyCallReceiver"
-            android:exported="true" >
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.PHONE_STATE" />
                 <action android:name="android.permission.READ_CALL_LOG" />
diff --git a/app/src/main/java/com/addev/listaspam/MainActivity.kt b/app/src/main/java/com/addev/listaspam/MainActivity.kt
@@ -47,13 +47,14 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun setupIntentLauncher() {
-        intentLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-            if (it.resultCode == Activity.RESULT_OK) {
-                showToast(this, "Success requesting ROLE_CALL_SCREENING!")
-            } else {
-                showToast(this, "Failed requesting ROLE_CALL_SCREENING")
+        intentLauncher =
+            registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
+                if (it.resultCode == Activity.RESULT_OK) {
+                    showToast(this, "Success requesting ROLE_CALL_SCREENING!")
+                } else {
+                    showToast(this, "Failed requesting ROLE_CALL_SCREENING")
+                }
             }
-        }
     }
 
     private fun showToast(context: Context, message: String, duration: Int = Toast.LENGTH_SHORT) {
diff --git a/app/src/main/java/com/addev/listaspam/MyCallReceiver.kt b/app/src/main/java/com/addev/listaspam/MyCallReceiver.kt
@@ -29,7 +29,8 @@ class MyCallReceiver : BroadcastReceiver() {
     override fun onReceive(context: Context, intent: Intent) {
         if (intent.action == "android.intent.action.PHONE_STATE") {
             val state = intent.getStringExtra(TelephonyManager.EXTRA_STATE)
-            val incomingNumber = intent.getStringExtra(TelephonyManager.EXTRA_INCOMING_NUMBER) ?: return
+            val incomingNumber =
+                intent.getStringExtra(TelephonyManager.EXTRA_INCOMING_NUMBER) ?: return
 
             if (state == TelephonyManager.EXTRA_STATE_RINGING) {
                 handleIncomingCall(context, incomingNumber)
diff --git a/app/src/main/java/com/addev/listaspam/MyCallScreeningService.kt b/app/src/main/java/com/addev/listaspam/MyCallScreeningService.kt
@@ -63,12 +63,15 @@ class MyCallScreeningService : CallScreeningService() {
             details.handle != null -> details.handle.schemeSpecificPart
             details.gatewayInfo?.originalAddress != null -> details.gatewayInfo.originalAddress.schemeSpecificPart
             details.intentExtras != null -> {
-                var uri = details.intentExtras.getParcelable<Uri>(TelecomManager.EXTRA_INCOMING_CALL_ADDRESS)
+                var uri =
+                    details.intentExtras.getParcelable<Uri>(TelecomManager.EXTRA_INCOMING_CALL_ADDRESS)
                 if (uri == null) {
-                    uri = details.intentExtras.getParcelable<Uri>(TelephonyManager.EXTRA_INCOMING_NUMBER)
+                    uri =
+                        details.intentExtras.getParcelable<Uri>(TelephonyManager.EXTRA_INCOMING_NUMBER)
                 }
                 uri?.schemeSpecificPart
             }
+
             else -> null
         }
     }
diff --git a/app/src/main/java/com/addev/listaspam/SpamUtils.kt b/app/src/main/java/com/addev/listaspam/SpamUtils.kt
@@ -29,7 +29,8 @@ class SpamUtils {
         private const val SPAM_PREFS = "SPAM_PREFS"
         private const val BLOCK_NUMBERS_KEY = "BLOCK_NUMBERS"
         private const val SPAM_URL_TEMPLATE = "https://www.listaspam.com/busca.php?Telefono=%s"
-        private const val RESPONDERONO_URL_TEMPLATE = "https://www.responderono.es/numero-de-telefono/%s"
+        private const val RESPONDERONO_URL_TEMPLATE =
+            "https://www.responderono.es/numero-de-telefono/%s"
         private const val NOTIFICATION_CHANNEL_ID = "NOTIFICATION_CHANNEL"
         private const val NOTIFICATION_ID = 1
         private const val SPAM_REPORT_THRESHOLD = 1
@@ -47,7 +48,12 @@ class SpamUtils {
 
         OkHttpClient().newCall(request).enqueue(object : Callback {
             override fun onFailure(call: Call, e: IOException) {
-                handleNetworkFailure(context, "Failed to check number in www.listaspam.com", e, callback)
+                handleNetworkFailure(
+                    context,
+                    "Failed to check number in www.listaspam.com",
+                    e,
+                    callback
+                )
             }
 
             override fun onResponse(call: Call, response: Response) {
@@ -64,7 +70,12 @@ class SpamUtils {
                             }
                         }
                     }
-                } ?: handleNetworkFailure(context, "Empty response from www.listaspam.com", null, callback)
+                } ?: handleNetworkFailure(
+                    context,
+                    "Empty response from www.listaspam.com",
+                    null,
+                    callback
+                )
             }
         })
     }
@@ -75,20 +86,34 @@ class SpamUtils {
      * @param number Phone number to check.
      * @param callback Callback function to handle the result.
      */
-    private fun checkResponderono(context: Context, number: String, callback: (isNegative: Boolean) -> Unit) {
+    private fun checkResponderono(
+        context: Context,
+        number: String,
+        callback: (isNegative: Boolean) -> Unit
+    ) {
         val url = RESPONDERONO_URL_TEMPLATE.format(number)
         val request = Request.Builder().url(url).build()
 
         OkHttpClient().newCall(request).enqueue(object : Callback {
             override fun onFailure(call: Call, e: IOException) {
-                handleNetworkFailure(context, "Failed to check number in www.responderono.es", e, callback)
+                handleNetworkFailure(
+                    context,
+                    "Failed to check number in www.responderono.es",
+                    e,
+                    callback
+                )
             }
 
             override fun onResponse(call: Call, response: Response) {
                 response.body?.string()?.let { body ->
                     val isResponderONoNegative = body.contains(".scoreContainer .score.negative")
                     callback(isResponderONoNegative)
-                } ?: handleNetworkFailure(context, "Empty response from www.responderono.es", null, callback)
+                } ?: handleNetworkFailure(
+                    context,
+                    "Empty response from www.responderono.es",
+                    null,
+                    callback
+                )
             }
         })
     }
@@ -99,7 +124,11 @@ class SpamUtils {
      * @param number Phone number identified as spam.
      * @param callback Callback function to handle the result.
      */
-    private fun handleSpamNumber(context: Context, number: String, callback: (isSpam: Boolean) -> Unit) {
+    private fun handleSpamNumber(
+        context: Context,
+        number: String,
+        callback: (isSpam: Boolean) -> Unit
+    ) {
         saveSpamNumber(context, number)
         sendNotification(context, number)
         callback(true)
@@ -111,7 +140,11 @@ class SpamUtils {
      * @param number Phone number identified as not spam.
      * @param callback Callback function to handle the result.
      */
-    private fun handleNonSpamNumber(context: Context, number: String, callback: (isSpam: Boolean) -> Unit) {
+    private fun handleNonSpamNumber(
+        context: Context,
+        number: String,
+        callback: (isSpam: Boolean) -> Unit
+    ) {
         Handler(Looper.getMainLooper()).post {
             showToast(context, "Incoming call is not spam", Toast.LENGTH_LONG)
         }
@@ -126,7 +159,12 @@ class SpamUtils {
      * @param e Exception that occurred (optional).
      * @param callback Callback function to handle the result.
      */
-    private fun handleNetworkFailure(context: Context, message: String, e: IOException?, callback: (Boolean) -> Unit) {
+    private fun handleNetworkFailure(
+        context: Context,
+        message: String,
+        e: IOException?,
+        callback: (Boolean) -> Unit
+    ) {
         Handler(Looper.getMainLooper()).post {
             showToast(context, message, Toast.LENGTH_LONG)
         }
@@ -141,7 +179,8 @@ class SpamUtils {
      */
     private fun saveSpamNumber(context: Context, number: String) {
         val sharedPreferences = context.getSharedPreferences(SPAM_PREFS, Context.MODE_PRIVATE)
-        val blockedNumbers = sharedPreferences.getStringSet(BLOCK_NUMBERS_KEY, mutableSetOf())?.toMutableSet()
+        val blockedNumbers =
+            sharedPreferences.getStringSet(BLOCK_NUMBERS_KEY, mutableSetOf())?.toMutableSet()
         blockedNumbers?.add(number)
         with(sharedPreferences.edit()) {
             putStringSet(BLOCK_NUMBERS_KEY, blockedNumbers)
@@ -156,7 +195,8 @@ class SpamUtils {
      */
     private fun removeSpamNumber(context: Context, number: String) {
         val sharedPreferences = context.getSharedPreferences(SPAM_PREFS, Context.MODE_PRIVATE)
-        val blockedNumbers = sharedPreferences.getStringSet(BLOCK_NUMBERS_KEY, mutableSetOf())?.toMutableSet()
+        val blockedNumbers =
+            sharedPreferences.getStringSet(BLOCK_NUMBERS_KEY, mutableSetOf())?.toMutableSet()
         blockedNumbers?.remove(number)
         with(sharedPreferences.edit()) {
             putStringSet(BLOCK_NUMBERS_KEY, blockedNumbers)

Original file line number	Diff line number	Diff line change
`@@ -47,13 +47,14 @@ class MainActivity : AppCompatActivity() {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`private fun setupIntentLauncher() {`
`50`		`- intentLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {`
`51`		`- if (it.resultCode == Activity.RESULT_OK) {`
`52`		`- showToast(this, "Success requesting ROLE_CALL_SCREENING!")`
`53`		`- } else {`
`54`		`- showToast(this, "Failed requesting ROLE_CALL_SCREENING")`
	`50`	`+ intentLauncher =`
	`51`	`+ registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {`
	`52`	`+ if (it.resultCode == Activity.RESULT_OK) {`
	`53`	`+ showToast(this, "Success requesting ROLE_CALL_SCREENING!")`
	`54`	`+ } else {`
	`55`	`+ showToast(this, "Failed requesting ROLE_CALL_SCREENING")`
	`56`	`+ }`
`55`	`57`	`}`
`56`		`- }`
`57`	`58`	`}`
`58`	`59`
`59`	`60`	`private fun showToast(context: Context, message: String, duration: Int = Toast.LENGTH_SHORT) {`
Original file line number	Diff line number	Diff line change
`@@ -63,12 +63,15 @@ class MyCallScreeningService : CallScreeningService() {`
`63`	`63`	`details.handle != null -> details.handle.schemeSpecificPart`
`64`	`64`	`details.gatewayInfo?.originalAddress != null -> details.gatewayInfo.originalAddress.schemeSpecificPart`
`65`	`65`	`details.intentExtras != null -> {`
`66`		`- var uri = details.intentExtras.getParcelable<Uri>(TelecomManager.EXTRA_INCOMING_CALL_ADDRESS)`
	`66`	`+ var uri =`
	`67`	`+ details.intentExtras.getParcelable<Uri>(TelecomManager.EXTRA_INCOMING_CALL_ADDRESS)`
`67`	`68`	`if (uri == null) {`
`68`		`- uri = details.intentExtras.getParcelable<Uri>(TelephonyManager.EXTRA_INCOMING_NUMBER)`
	`69`	`+ uri =`
	`70`	`+ details.intentExtras.getParcelable<Uri>(TelephonyManager.EXTRA_INCOMING_NUMBER)`
`69`	`71`	`}`
`70`	`72`	`uri?.schemeSpecificPart`
`71`	`73`	`}`
	`74`	`+`
`72`	`75`	`else -> null`
`73`	`76`	`}`
`74`	`77`	`}`