From de096cb8c862c3cca99de1950850c3fedaa0372f Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Fri, 30 Nov 2018 14:37:52 +0100
Subject: [PATCH] allow blocking numbers directly from Recents screen

---
 .../pro/adapters/RecentCallsAdapter.kt        |  20 +++++++++++++++++-
 .../contacts/pro/extensions/Context.kt        |  10 +++++++++
 app/src/main/res/drawable-hdpi/ic_block.png   | Bin 0 -> 495 bytes
 app/src/main/res/drawable-xhdpi/ic_block.png  | Bin 0 -> 624 bytes
 app/src/main/res/drawable-xxhdpi/ic_block.png | Bin 0 -> 928 bytes
 .../main/res/drawable-xxxhdpi/ic_block.png    | Bin 0 -> 1240 bytes
 app/src/main/res/menu/cab_recent_calls.xml    |   5 +++++
 7 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/drawable-hdpi/ic_block.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_block.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_block.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_block.png

diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/RecentCallsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/RecentCallsAdapter.kt
index 5a871563..a6479f67 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/RecentCallsAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/RecentCallsAdapter.kt
@@ -10,6 +10,7 @@ import com.simplemobiletools.commons.views.FastScroller
 import com.simplemobiletools.commons.views.MyRecyclerView
 import com.simplemobiletools.contacts.pro.R
 import com.simplemobiletools.contacts.pro.activities.SimpleActivity
+import com.simplemobiletools.contacts.pro.extensions.addBlockedNumber
 import com.simplemobiletools.contacts.pro.extensions.config
 import com.simplemobiletools.contacts.pro.helpers.ContactsHelper
 import com.simplemobiletools.contacts.pro.helpers.RECENTS_TAB_MASK
@@ -28,7 +29,11 @@ class RecentCallsAdapter(activity: SimpleActivity, var recentCalls: ArrayList<Re
 
     override fun getActionMenuId() = R.menu.cab_recent_calls
 
-    override fun prepareActionMode(menu: Menu) {}
+    override fun prepareActionMode(menu: Menu) {
+        menu.apply {
+            findItem(R.id.cab_block_number).title = activity.getString(if (isOneItemSelected()) R.string.block_number else R.string.block_numbers)
+        }
+    }
 
     override fun actionItemPressed(id: Int) {
         if (selectedKeys.isEmpty()) {
@@ -38,6 +43,7 @@ class RecentCallsAdapter(activity: SimpleActivity, var recentCalls: ArrayList<Re
         when (id) {
             R.id.cab_select_all -> selectAll()
             R.id.cab_delete -> askConfirmDelete()
+            R.id.cab_block_number -> blockNumber()
         }
     }
 
@@ -92,6 +98,18 @@ class RecentCallsAdapter(activity: SimpleActivity, var recentCalls: ArrayList<Re
         }
     }
 
+    private fun blockNumber() {
+        Thread {
+            getSelectedItems().forEach {
+                activity.addBlockedNumber(it.number)
+            }
+            refreshListener?.refreshContacts(RECENTS_TAB_MASK)
+            activity.runOnUiThread {
+                finishActMode()
+            }
+        }.start()
+    }
+
     private fun getSelectedItems() = recentCalls.filter { selectedKeys.contains(it.id) } as ArrayList<RecentCall>
 
     private fun setupView(view: View, recentCall: RecentCall) {
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Context.kt
index 0926d25d..6f590ccc 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Context.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Context.kt
@@ -1,9 +1,11 @@
 package com.simplemobiletools.contacts.pro.extensions
 
+import android.content.ContentValues
 import android.content.Context
 import android.content.Intent
 import android.database.Cursor
 import android.net.Uri
+import android.provider.BlockedNumberContract.BlockedNumbers
 import android.provider.ContactsContract
 import android.telecom.TelecomManager
 import androidx.core.content.FileProvider
@@ -25,6 +27,7 @@ import com.simplemobiletools.contacts.pro.models.ContactSource
 import com.simplemobiletools.contacts.pro.models.Organization
 import java.io.File
 
+
 val Context.config: Config get() = Config.newInstance(applicationContext)
 
 val Context.contactsDB: ContactsDao get() = ContactsDatabase.getInstance(applicationContext).ContactsDao()
@@ -283,3 +286,10 @@ fun Context.getVisibleContactSources(): ArrayList<String> {
     sourceNames.removeAll(config.ignoredContactSources)
     return sourceNames
 }
+
+fun Context.addBlockedNumber(number: String) {
+    ContentValues().apply {
+        put(BlockedNumbers.COLUMN_ORIGINAL_NUMBER, number)
+        contentResolver.insert(BlockedNumbers.CONTENT_URI, this)
+    }
+}
diff --git a/app/src/main/res/drawable-hdpi/ic_block.png b/app/src/main/res/drawable-hdpi/ic_block.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c541fe50a9571c3f2e2d9e84919cf5ec57ec132
GIT binary patch
literal 495
zcmV<L0TBL)P)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0005DNkl<Zcmd_s
zHEb4P9DwnwyUeiQFu_=vac9Ndojr8H-E~4IoCRm^p5U%^Z?_+Q$>qBX*SXL1%0JKR
z5)4SxI;q|}eY(9<?}Xa^DhjRlMjUT!P?%P;Km(F#upo_QJAh{AO*KZT3S-T8Q9FRT
z|7lJG-dim%qqfL;4S>@@GIjxOCeMRP-vPUlLY4v!2Z_jW6#z@)SE>ozk(I1*9nb+9
z6=eo(1D_P9(A+gh3)q$!_7yBhrO6E^;%g8^HF%R!^AiQSKy@^54>*)c^B3p9o@nS3
zFe!y5#2oM>8vFu`iqYhXYC;SJ&!geppgcx%7jRu}v`z`=iWYW)(qxUCj7Ca9XWY<6
zq|k&I1zto8pMu#bG$AH{r_sW_;9Lq#h=Xy<Ukln4{LbY?GzoYEYNCZ%zJMjaHTP3!
z=7BF6N8DD>U~s6pDp^zHGuRqe)d)I5P4ab;<xb=piDDT<GzmBiSe6v96Yx!C@>As|
zU}unwlYj<mGP^C`Y99fo(mzM-E}CzgN@Yfy?z|QNb?F|+Z%F2w1?ivc4PJ}mwG9e_
l{-GxPMD+aqMAQTWksmHt3wANp)z$z2002ovPDHLkV1iu3)Y||6

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_block.png b/app/src/main/res/drawable-xhdpi/ic_block.png
new file mode 100644
index 0000000000000000000000000000000000000000..ae3856fe1de9c05fb1299922de2e8e4e4197a9f6
GIT binary patch
literal 624
zcmV-$0+0QPP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0006vNkl<ZcmZM<
z8ekLvNUdjfyP_zJ!Ye+EZ6{@H^|wzS8%=E6YGYU7ABa=MY+_v7cLZN_p6!*lozEJF
zd+$kSrf{5h2)yM4lj&^!AKlo`3%tBwAKmQZF*Z>_kP0>tv&m=imayKE74^LzN2H94
zOk^NkiIJoy<5|HiY7sde`g72N`~1OIrjqdZ={J(iAKa&9n0#YyBT&s&lEw#d)>4kZ
zEt;4h97iCJQ6>bo@dw9@Kc*n?n(m?U3&}Lqc%wN*NH(3U@=!zz<AsArIfEkR>)1{m
za>%%&HI>NX$oa{}a0IEOjr)Pk$QNQE^0PAX-;p94*=(GsPYyC8dR|zKWK-XHWE4_K
zJbGSeK^ZdAd1yIu-7YU&MwU5`T}0+s=k>$O1?R!X$OOB*FdTX09OWSW?eanoB*!_b
zLz>y;g)~y@991ESz&y&kA%#>qM|nv1!2B%ZiM~jlbMz1yVV4&sAP>F&rt|Ic!c63%
zbF>V(Y%(x8Twb`2EOm}XBc-&+$k&C>6Q>dx<s8=M1F|xDUYL%2q`upD6Ov8JDj(yE
z$L(5ZLnU%JT3%R+RMI-=ky*#?$oWB(BZvG}t|Ekp`EFzfJoJSrR{8F{3bD2br}%>{
zq4J~1L*TRtLKAKwP{tbn1%M<QsSdq53N162UpCRvxFEq)zGg1Jw(EN>H(AbDdXXYQ
z7Y6cek-)O+J9_h-)*TS~ccCcn1l|I50%_BYT?7=7VHgr%6aWC&PAEc#xltwn0000<
KMNUMnLSTZCeH~H&

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_block.png b/app/src/main/res/drawable-xxhdpi/ic_block.png
new file mode 100644
index 0000000000000000000000000000000000000000..d6dc2222fb8f1e31088e5cc19e554a6f40e5ae32
GIT binary patch
literal 928
zcmV;R17G}!P)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj000ALNkl<ZcmeF$
zL$n=R6h`57?fY!owrzGVdTBq~w$0eKlTK{gw(S|`KdMtWJI>c1HD<YLZ9C?eV-8iE
zO%1-IE?pVS3^uTinGB&bb@`qeoNWgV*YFLK@H3Hbxx)4@a;Rh|VGN;)Y}-GmVj59Q
zqsm;PoR(ywCFSN04={^N&Ef%9$EFUcO`#z#atHag0|lJQrQAw2wU|w6buvCqoWv-S
zZKM{LSsGl%H>@MsNKUfoID^R~TEh>V7I0_2U=@ibai&E>Nz&0-%Qu{8A#e)yNHmfX
z3y*BN6K?|NSp?k66ykLw+rr{&;<cy5BB7YxB>LLI;VI(%Nw$+5dB%d{WR@fFznSA4
zSjNc~6m=2k==A7FT?>Xg5ST!zvz!)8N8nBif`P~eE_asGoE+{&puhR!Ap}0QNGMFo
zX-kgnz&{8)WPa#|%%&h>PS2#AT-$|G79ia%J<ens@|x3}J$Mh<=JT=3+sJCl+~o)-
zunu|K(xD&nr`sIiSEOJ1&22_*aGN9Cj%=pTyznTp#C494%X;Kd^TJz53->ufH{>nz
zLT%)A_c<PST5a<}f8+@ZjQn6Z!ZU%M*Gxk$4w2J^cwJKG2)7~A%nM79lQYQ4Hy>OO
z==Nb7Qsh2IC_%QG7d9a!?sJ5EWRrPe8FHcf9N{EnnR#Ira)<jI;UZ*~d7&@zy!#yC
zNu-Z?p%(JC`yAnQq*kz3M;G@wLbG76j)##AUN6R^oSr^8ez(uVK|eokPnpv;DW}jv
z;yRzt51~Kui`yLGPo!V)PuO*wuwQb@SnYEK31_nndDmTz@EWqscUnYuWC5kla|)P+
z^e{g>jKE)Ra)gf%c*y+GAA!4_=3K@Gq`w8hoe0dJrL&w;CWII^2z3yg<z&+lfjZF#
zR?=HJVevl#D>&JL<8hCi;>btmU*bJ#;qZ;aoDw<^@0%$5)QxykxYr`!JSJo?78Xhv
zN1}S1Vj*xc->^2r!MSh-lSs6Z&x1|#Ig=k)L!wEXVbO6CBT2S~Z@JXc;3{gd$$#<1
z?ef$t>QK#XT*he>?0HY!#>+Hh3aQnl++5%RW|OJeJaA+#aSBz;B#N0-+5SNe)eIwy
zp;WVd%(R}p*ZJQ?#6p5wpoIj(eyIiJU=)mkQ2+qZQ#c3ie=sWm0000<MNUMnLSTYX
C$hpk`

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_block.png b/app/src/main/res/drawable-xxxhdpi/ic_block.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f1191c9b7829e6d5f8a7cf6f777edada485d0b0
GIT binary patch
literal 1240
zcmV;}1Sk86P)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@000D^Nkl<ZcmeI(
z1CT6N6oBC~seQI>+qP|6h1e-RyA;fBY}+iwwv%VuT0Q(RPH*q@bkFVk)L&Us|Fm_)
zoJb@Ri9~3?Sgt3|D}2VU?B*2N>|qU`@d|OSXDs#PTtsoEaz9&0#%3O1G9~0(K`ZX$
z1b!XkZd%LPMFFPpF{${NsT7d2fif&)4<_tl5oN?CV$9_LChcP$F|mW@d`1{Pqq&5S
zv1AgKOvXx>xP%pW$>Brp;W~!Uh8h(9dy}ijIF|D|JMprTn1qAEyh<W#Sxg@aNkY`)
zTHYa%*C;IJQGqYW&p}qw+~*lP&T;bd1!cu7>arPko4AZ35&#v+;3V$WQ&-HP3R`h=
zh78~F3iWvjcU!4yZsS>to6YnR1L(_6+^nIZnO*lA+&oWlgJ<>kaPy6U-I)yXI>j6@
zh}ImzU52EF{^WIn{$davocYQ?36ApY!zq(?hVze+$X?1zP&`UrBW>g>k4P}|Ca-0-
z@|8Z~A8BmF=?!9`=jZY@P8%p7esMWYYbb6Ze}L<rce(%NzZ2~Yjcw%1@92lqCep+Y
z=HPT^==s?UkiYR1PP4@i)}S4tbm;lL)zw!f+8Rk7y>MD+AzvXKr=F559zi=saSQnh
zbvPaHd_Xa>(N^2ecij)NC??5Z98PsD<tuc<X`Cd3bhNL<0J?hTJMkS_x+H@i&~7r4
zpXr_N!~(P*#2aOCYGE;7p%qSL#S8t=4q47uIE>cM|25FFmh%<f@_kLjZD@-v=PN8n
zyUqW9o@zN?VLIAd;)U<gIvCE+^vGA}jP|{FVKZ7C!}(ps2dblO7B3t`D{nbpp$ytV
z@xmFj!j|(D3Zb1AFXW&Vu$-?@5G_Z%uph0A_(Ja#^A*aY?H4a>LaX63KRd;Ig*s@P
z{2xZUSk71IfcCxr6WL75`3lp}-V`sy(N<W_S6J%*QsPRqH!bHYJd1XPcwr#gVaxdn
zhtLLy7s}z(@~q{z#HqM=<2$s40rHOp%vZP(?K?>ZakTFP<aZDQ_!2E1^s!2pvyxvo
z=wp>)WT8D}DPLhVS~kTbIXr}RnrhbbOLGkEAxRcJA@K=>0p{~H7UR?-mB;IuR8jf4
zA?KIoFxr|_UvNAfa=yZyIL#41NMi?1{jKG<<P6$Q(!?LG#A!F>tmGHxC!DSnzbL@3
zIDKOwKgL@){YsknM^`+U&DR&uN*4)+N37?MOZ8I&h4Snrkt2rlJCKdjKFUjQ3{05c
zS`4B;N6D+dq=pPj`Lj7?>VqeR!hDUJ_bDxgP?AS*^EHJfb(CWbZg$a644@~QakGYU
zVg^;&in|x6D=DBDan6MN*`>#aueqdCK?0yCm$4alo2h5>)8pgZLId%E=B(x*`T2qh
zXXE4Vcesu^p1;wXC9EZpS1ByvAjS&3?BsQpF`oLw<aZRI2CW&&b==K|<l<!oF$ohB
zIAL`F!aSOWHiFVr5{ZU@6w0v3@)(wR6kr;kkcv;3MgcjyXwBUm4>XF{Le3SGU@G@n
z7zVXAj{EAr<G4BOVGW=2D(PI$SQ<zq5{X12#{33>u2Jy$vXFED0000<MNUMnLSTYv
C%3qfN

literal 0
HcmV?d00001

diff --git a/app/src/main/res/menu/cab_recent_calls.xml b/app/src/main/res/menu/cab_recent_calls.xml
index 128e6362..f5e7c4ba 100644
--- a/app/src/main/res/menu/cab_recent_calls.xml
+++ b/app/src/main/res/menu/cab_recent_calls.xml
@@ -11,4 +11,9 @@
         android:icon="@drawable/ic_select_all"
         android:title="@string/select_all"
         app:showAsAction="ifRoom"/>
+    <item
+        android:id="@+id/cab_block_number"
+        android:icon="@drawable/ic_block"
+        android:title="@string/block_number"
+        app:showAsAction="ifRoom"/>
 </menu>