Skip to content

Commit c8818bf

Browse files
committed
lets lock number blocking
1 parent 3092253 commit c8818bf

File tree

4 files changed

+33
-4
lines changed

4 files changed

+33
-4
lines changed

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ android {
6363
}
6464

6565
dependencies {
66-
implementation 'com.github.SimpleMobileTools:Simple-Commons:9162225f33'
66+
implementation 'com.github.SimpleMobileTools:Simple-Commons:5b5a6b083f'
6767
implementation 'org.greenrobot:eventbus:3.3.1'
6868
implementation 'com.github.tibbi:IndicatorFastScroll:4524cd0b61'
6969
implementation 'com.github.tibbi:android-smsmms:3581774c39'

app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SettingsActivity.kt

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import android.os.Build
66
import android.os.Bundle
77
import com.simplemobiletools.commons.activities.ManageBlockedNumbersActivity
88
import com.simplemobiletools.commons.dialogs.ChangeDateTimeFormatDialog
9+
import com.simplemobiletools.commons.dialogs.FeatureLockedDialog
910
import com.simplemobiletools.commons.dialogs.RadioGroupDialog
1011
import com.simplemobiletools.commons.extensions.*
1112
import com.simplemobiletools.commons.helpers.*
@@ -128,9 +129,17 @@ class SettingsActivity : SimpleActivity() {
128129
// support for device-wise blocking came on Android 7, rely only on that
129130
@TargetApi(Build.VERSION_CODES.N)
130131
private fun setupManageBlockedNumbers() {
132+
settings_manage_blocked_numbers.text = addLockedLabelIfNeeded(R.string.manage_blocked_numbers)
131133
settings_manage_blocked_numbers_holder.beVisibleIf(isNougatPlus())
134+
132135
settings_manage_blocked_numbers_holder.setOnClickListener {
133-
startActivity(Intent(this, ManageBlockedNumbersActivity::class.java))
136+
if (isOrWasThankYouInstalled()) {
137+
Intent(this, ManageBlockedNumbersActivity::class.java).apply {
138+
startActivity(this)
139+
}
140+
} else {
141+
FeatureLockedDialog(this) { }
142+
}
134143
}
135144
}
136145

app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ import androidx.core.view.*
3939
import com.google.gson.Gson
4040
import com.google.gson.reflect.TypeToken
4141
import com.simplemobiletools.commons.dialogs.ConfirmationDialog
42+
import com.simplemobiletools.commons.dialogs.FeatureLockedDialog
4243
import com.simplemobiletools.commons.dialogs.RadioGroupDialog
4344
import com.simplemobiletools.commons.extensions.*
4445
import com.simplemobiletools.commons.helpers.*
@@ -182,6 +183,7 @@ class ThreadActivity : SimpleActivity() {
182183
val firstPhoneNumber = participants.firstOrNull()?.phoneNumbers?.firstOrNull()?.value
183184
thread_toolbar.menu.apply {
184185
findItem(R.id.delete).isVisible = threadItems.isNotEmpty()
186+
findItem(R.id.block_number).title = addLockedLabelIfNeeded(R.string.block_number)
185187
findItem(R.id.block_number).isVisible = isNougatPlus()
186188
findItem(R.id.dial_number).isVisible = participants.size == 1
187189
findItem(R.id.mark_as_unread).isVisible = threadItems.isNotEmpty()
@@ -200,7 +202,7 @@ class ThreadActivity : SimpleActivity() {
200202
}
201203

202204
when (menuItem.itemId) {
203-
R.id.block_number -> blockNumber()
205+
R.id.block_number -> tryBlocking()
204206
R.id.delete -> askConfirmDelete()
205207
R.id.add_number_to_contact -> addNumberToContact()
206208
R.id.dial_number -> dialNumber()
@@ -652,6 +654,14 @@ class ThreadActivity : SimpleActivity() {
652654
return userPreferredSimIdx ?: senderPreferredSimIdx ?: systemPreferredSimIdx ?: 0
653655
}
654656

657+
private fun tryBlocking() {
658+
if (isOrWasThankYouInstalled()) {
659+
blockNumber()
660+
} else {
661+
FeatureLockedDialog(this) { }
662+
}
663+
}
664+
655665
private fun blockNumber() {
656666
val numbers = participants.getAddresses()
657667
val numbersString = TextUtils.join(", ", numbers)

app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ConversationsAdapter.kt

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import com.bumptech.glide.Glide
1212
import com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller
1313
import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter
1414
import com.simplemobiletools.commons.dialogs.ConfirmationDialog
15+
import com.simplemobiletools.commons.dialogs.FeatureLockedDialog
1516
import com.simplemobiletools.commons.extensions.*
1617
import com.simplemobiletools.commons.helpers.KEY_PHONE
1718
import com.simplemobiletools.commons.helpers.SimpleContactsHelper
@@ -42,6 +43,7 @@ class ConversationsAdapter(
4243
val selectedItems = getSelectedItems()
4344

4445
menu.apply {
46+
findItem(R.id.cab_block_number).title = activity.addLockedLabelIfNeeded(R.string.block_number)
4547
findItem(R.id.cab_block_number).isVisible = isNougatPlus()
4648
findItem(R.id.cab_add_number_to_contact).isVisible = isOneItemSelected() && selectedItems.firstOrNull()?.isGroupConversation == false
4749
findItem(R.id.cab_dial_number).isVisible = isOneItemSelected() && selectedItems.firstOrNull()?.isGroupConversation == false
@@ -59,7 +61,7 @@ class ConversationsAdapter(
5961

6062
when (id) {
6163
R.id.cab_add_number_to_contact -> addNumberToContact()
62-
R.id.cab_block_number -> askConfirmBlock()
64+
R.id.cab_block_number -> tryBlocking()
6365
R.id.cab_dial_number -> dialNumber()
6466
R.id.cab_copy_number -> copyNumberToClipboard()
6567
R.id.cab_delete -> askConfirmDelete()
@@ -102,6 +104,14 @@ class ConversationsAdapter(
102104
}
103105
}
104106

107+
private fun tryBlocking() {
108+
if (activity.isOrWasThankYouInstalled()) {
109+
askConfirmBlock()
110+
} else {
111+
FeatureLockedDialog(activity) { }
112+
}
113+
}
114+
105115
private fun askConfirmBlock() {
106116
val numbers = getSelectedItems().distinctBy { it.phoneNumber }.map { it.phoneNumber }
107117
val numbersString = TextUtils.join(", ", numbers)

0 commit comments

Comments
 (0)