forked from upstream-mirrors/quik
Stricter check for phone number equality
This commit is contained in:
+6
-6
@@ -18,14 +18,15 @@
|
||||
*/
|
||||
package com.moez.QKSMS.feature.blocking.numbers
|
||||
|
||||
import android.telephony.PhoneNumberUtils
|
||||
import android.text.Editable
|
||||
import android.text.TextWatcher
|
||||
import android.widget.EditText
|
||||
import timber.log.Timber
|
||||
import java.util.*
|
||||
import com.moez.QKSMS.util.PhoneNumberUtils
|
||||
|
||||
class BlockedNumberTextWatcher(private val editText: EditText) : TextWatcher {
|
||||
class BlockedNumberTextWatcher(
|
||||
private val editText: EditText,
|
||||
private val phoneNumberUtils: PhoneNumberUtils
|
||||
) : TextWatcher {
|
||||
|
||||
init {
|
||||
editText.addTextChangedListener(this)
|
||||
@@ -36,8 +37,7 @@ class BlockedNumberTextWatcher(private val editText: EditText) : TextWatcher {
|
||||
override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) = Unit
|
||||
|
||||
override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
|
||||
val formatted = PhoneNumberUtils.formatNumber(s?.toString(), Locale.getDefault().country)
|
||||
Timber.v("onTextChanged=$s, formatted=$formatted")
|
||||
val formatted = s?.let(phoneNumberUtils::formatNumber)
|
||||
if (s?.toString() != formatted && formatted != null) {
|
||||
editText.setText(formatted)
|
||||
editText.setSelection(formatted.length)
|
||||
|
||||
+3
-1
@@ -28,6 +28,7 @@ import com.moez.QKSMS.common.util.Colors
|
||||
import com.moez.QKSMS.common.util.extensions.setBackgroundTint
|
||||
import com.moez.QKSMS.common.util.extensions.setTint
|
||||
import com.moez.QKSMS.injection.appComponent
|
||||
import com.moez.QKSMS.util.PhoneNumberUtils
|
||||
import io.reactivex.Observable
|
||||
import io.reactivex.subjects.PublishSubject
|
||||
import io.reactivex.subjects.Subject
|
||||
@@ -40,6 +41,7 @@ class BlockedNumbersController : QkController<BlockedNumbersView, BlockedNumbers
|
||||
|
||||
@Inject override lateinit var presenter: BlockedNumbersPresenter
|
||||
@Inject lateinit var colors: Colors
|
||||
@Inject lateinit var phoneNumberUtils: PhoneNumberUtils
|
||||
|
||||
private val adapter = BlockedNumbersAdapter()
|
||||
private val saveAddressSubject: Subject<String> = PublishSubject.create()
|
||||
@@ -75,7 +77,7 @@ class BlockedNumbersController : QkController<BlockedNumbersView, BlockedNumbers
|
||||
|
||||
override fun showAddDialog() {
|
||||
val layout = LayoutInflater.from(activity).inflate(R.layout.blocked_numbers_add_dialog, null)
|
||||
val textWatcher = BlockedNumberTextWatcher(layout.input)
|
||||
val textWatcher = BlockedNumberTextWatcher(layout.input, phoneNumberUtils)
|
||||
val dialog = AlertDialog.Builder(activity!!)
|
||||
.setView(layout)
|
||||
.setPositiveButton(R.string.blocked_numbers_dialog_block) { _, _ ->
|
||||
|
||||
Reference in New Issue
Block a user