Stricter check for phone number equality

This commit is contained in:
moezbhatti
2019-10-05 19:42:05 -04:00
parent c2bcf56925
commit 56d13dfe3e
19 changed files with 151 additions and 62 deletions
@@ -29,14 +29,12 @@ import android.graphics.Color
import android.net.Uri
import android.os.Build
import android.provider.ContactsContract
import android.telephony.PhoneNumberUtils
import androidx.core.app.NotificationCompat
import androidx.core.app.NotificationManagerCompat
import androidx.core.app.Person
import androidx.core.app.RemoteInput
import androidx.core.app.TaskStackBuilder
import androidx.core.graphics.drawable.IconCompat
import androidx.core.graphics.get
import com.moez.QKSMS.R
import com.moez.QKSMS.common.util.extensions.dpToPx
import com.moez.QKSMS.extensions.isImage
@@ -48,10 +46,10 @@ import com.moez.QKSMS.receiver.DeleteMessagesReceiver
import com.moez.QKSMS.receiver.MarkReadReceiver
import com.moez.QKSMS.receiver.MarkSeenReceiver
import com.moez.QKSMS.receiver.RemoteMessagingReceiver
import com.moez.QKSMS.repository.ContactRepository
import com.moez.QKSMS.repository.ConversationRepository
import com.moez.QKSMS.repository.MessageRepository
import com.moez.QKSMS.util.GlideApp
import com.moez.QKSMS.util.PhoneNumberUtils
import com.moez.QKSMS.util.Preferences
import com.moez.QKSMS.util.tryOrNull
import javax.inject.Inject
@@ -64,7 +62,8 @@ class NotificationManagerImpl @Inject constructor(
private val conversationRepo: ConversationRepository,
private val prefs: Preferences,
private val messageRepo: MessageRepository,
private val permissions: PermissionManager
private val permissions: PermissionManager,
private val phoneNumberUtils: PhoneNumberUtils
) : com.moez.QKSMS.manager.NotificationManager {
companion object {
@@ -151,14 +150,14 @@ class NotificationManagerImpl @Inject constructor(
if (!message.isMe()) {
val recipient = conversation.recipients
.firstOrNull { PhoneNumberUtils.compare(it.address, message.address) }
.firstOrNull { phoneNumberUtils.compare(it.address, message.address) }
person.setName(recipient?.getDisplayName() ?: message.address)
person.setIcon(GlideApp.with(context)
.asBitmap()
.circleCrop()
.load(PhoneNumberUtils.stripSeparators(message.address))
.load(message.address)
.submit(64.dpToPx(context), 64.dpToPx(context))
.let { futureGet -> tryOrNull(false) { futureGet.get() } }
?.let(IconCompat::createWithBitmap))
@@ -183,7 +182,7 @@ class NotificationManagerImpl @Inject constructor(
GlideApp.with(context)
.asBitmap()
.circleCrop()
.load(PhoneNumberUtils.stripSeparators(address))
.load(address)
.submit(64.dpToPx(context), 64.dpToPx(context))
}
?.let { futureGet -> tryOrNull(false) { futureGet.get() } }
@@ -24,7 +24,6 @@ import android.graphics.drawable.Icon
import android.os.Build
import android.service.chooser.ChooserTarget
import android.service.chooser.ChooserTargetService
import android.telephony.PhoneNumberUtils
import androidx.annotation.RequiresApi
import androidx.core.os.bundleOf
import com.moez.QKSMS.R
@@ -59,7 +58,7 @@ class QkChooserTargetService : ChooserTargetService() {
val request = GlideApp.with(this)
.asBitmap()
.circleCrop()
.load(PhoneNumberUtils.stripSeparators(address))
.load(address)
.submit()
val bitmap = tryOrNull(false) { request.get() }
@@ -25,7 +25,6 @@ import android.content.pm.ShortcutInfo
import android.content.pm.ShortcutManager
import android.graphics.drawable.Icon
import android.os.Build
import android.telephony.PhoneNumberUtils
import com.moez.QKSMS.R
import com.moez.QKSMS.feature.compose.ComposeActivity
import com.moez.QKSMS.model.Conversation
@@ -66,7 +65,7 @@ class ShortcutManagerImpl @Inject constructor(
val request = GlideApp.with(context)
.asBitmap()
.circleCrop()
.load(PhoneNumberUtils.stripSeparators(address))
.load(address)
.submit(shortcutManager.iconMaxWidth, shortcutManager.iconMaxHeight)
val bitmap = tryOrNull(false) { request.get() }
@@ -19,7 +19,6 @@
package com.moez.QKSMS.common.widget
import android.content.Context
import android.telephony.PhoneNumberUtils
import android.util.AttributeSet
import android.view.View
import android.widget.FrameLayout
@@ -127,7 +126,7 @@ class AvatarView @JvmOverloads constructor(context: Context, attrs: AttributeSet
photo.setImageDrawable(null)
address?.let { address ->
GlideApp.with(photo)
.load(PhoneNumberUtils.stripSeparators(address))
.load(address)
.signature(ObjectKey(lastUpdated ?: 0L))
.into(photo)
}