From 931af9c7e096b93be4b8e891b299d7651e49a619 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sat, 23 May 2020 18:05:48 +0200
Subject: [PATCH] remove blocked numbers from Recents at blocking

---
 .../dialer/adapters/RecentCallsAdapter.kt     | 37 ++++++++++++++++---
 app/src/main/res/menu/cab_recent_calls.xml    | 12 +++---
 2 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/RecentCallsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/RecentCallsAdapter.kt
index 392f3ebb..2ef46518 100644
--- a/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/RecentCallsAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/RecentCallsAdapter.kt
@@ -3,6 +3,7 @@ package com.simplemobiletools.dialer.adapters
 import android.content.Intent
 import android.graphics.drawable.Drawable
 import android.provider.CallLog.Calls
+import android.text.TextUtils
 import android.util.TypedValue
 import android.view.Menu
 import android.view.View
@@ -11,10 +12,7 @@ import com.bumptech.glide.Glide
 import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter
 import com.simplemobiletools.commons.dialogs.ConfirmationDialog
 import com.simplemobiletools.commons.extensions.*
-import com.simplemobiletools.commons.helpers.KEY_PHONE
-import com.simplemobiletools.commons.helpers.PERMISSION_WRITE_CALL_LOG
-import com.simplemobiletools.commons.helpers.SimpleContactsHelper
-import com.simplemobiletools.commons.helpers.isNougatPlus
+import com.simplemobiletools.commons.helpers.*
 import com.simplemobiletools.commons.views.MyRecyclerView
 import com.simplemobiletools.dialer.R
 import com.simplemobiletools.dialer.activities.SimpleActivity
@@ -55,7 +53,7 @@ class RecentCallsAdapter(activity: SimpleActivity, var recentCalls: ArrayList<Re
         }
 
         when (id) {
-            R.id.cab_block_number -> blockNumber()
+            R.id.cab_block_number -> askConfirmBlock()
             R.id.cab_add_number -> addNumberToContact()
             R.id.cab_remove -> askConfirmRemove()
         }
@@ -98,8 +96,35 @@ class RecentCallsAdapter(activity: SimpleActivity, var recentCalls: ArrayList<Re
         incomingMissedCallIcon = resources.getColoredDrawableWithColor(R.drawable.ic_incoming_call_vector, redColor)
     }
 
-    private fun blockNumber() {
+    private fun askConfirmBlock() {
+        val numbers = TextUtils.join(", ", getSelectedItems().distinctBy { it.phoneNumber }.map { it.phoneNumber })
+        val baseString = R.string.block_confirmation
+        val question = String.format(resources.getString(baseString), numbers)
 
+        ConfirmationDialog(activity, question) {
+            blockNumbers()
+        }
+    }
+
+    private fun blockNumbers() {
+        if (selectedKeys.isEmpty()) {
+            return
+        }
+
+        val callsToBlock = getSelectedItems()
+        val positions = getSelectedItemPositions()
+        recentCalls.removeAll(callsToBlock)
+
+        ensureBackgroundThread {
+            callsToBlock.map { it.phoneNumber }.forEach { number ->
+                activity.addBlockedNumber(number)
+            }
+
+            activity.runOnUiThread {
+                removeSelectedItems(positions)
+                finishActMode()
+            }
+        }
     }
 
     private fun addNumberToContact() {
diff --git a/app/src/main/res/menu/cab_recent_calls.xml b/app/src/main/res/menu/cab_recent_calls.xml
index a38917e3..6da1954b 100644
--- a/app/src/main/res/menu/cab_recent_calls.xml
+++ b/app/src/main/res/menu/cab_recent_calls.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item
-        android:id="@+id/cab_block_number"
-        android:icon="@drawable/ic_minus_circle_vector"
-        android:title="@string/block_number"
-        app:showAsAction="ifRoom" />
-
     <item
         android:id="@+id/cab_add_number"
         android:icon="@drawable/ic_add_person_vector"
         android:title="@string/add_number_to_contact"
         app:showAsAction="ifRoom" />
 
+    <item
+        android:id="@+id/cab_block_number"
+        android:icon="@drawable/ic_minus_circle_vector"
+        android:title="@string/block_number"
+        app:showAsAction="ifRoom" />
+
     <item
         android:id="@+id/cab_remove"
         android:icon="@drawable/ic_delete_vector"