fenix/Simple-Dialer
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Dialer.git synced 2025-06-05 21:49:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix #41, fix a glitch with wrong SIM ID being shown at Recents

Browse Source
This commit is contained in:
tibbi
2022-02-06 16:19:14 +01:00
parent 74265436ea
commit 97c2a84cd7
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/kotlin/com/simplemobiletools/dialer/adapters/RecentCallsAdapter.kt
View File

@ -282,9 +282,9 @@ class RecentCallsAdapter(
setTextSize(TypedValue.COMPLEX_UNIT_PX, fontSize * 0.8f) setTextSize(TypedValue.COMPLEX_UNIT_PX, fontSize * 0.8f)
} }
item_recents_sim_image.beVisibleIf(areMultipleSIMsAvailable) item_recents_sim_image.beVisibleIf(areMultipleSIMsAvailable && call.simID != -1)
item_recents_sim_id.beVisibleIf(areMultipleSIMsAvailable) item_recents_sim_id.beVisibleIf(areMultipleSIMsAvailable && call.simID != -1)
if (areMultipleSIMsAvailable) { if (areMultipleSIMsAvailable && call.simID != -1) {
item_recents_sim_image.applyColorFilter(textColor) item_recents_sim_image.applyColorFilter(textColor)
item_recents_sim_id.setTextColor(textColor.getContrastColor()) item_recents_sim_id.setTextColor(textColor.getContrastColor())
item_recents_sim_id.text = call.simID.toString() item_recents_sim_id.text = call.simID.toString()

10
app/src/main/kotlin/com/simplemobiletools/dialer/helpers/RecentsHelper.kt
View File

@ -53,12 +53,12 @@ class RecentsHelper(private val context: Context) {
Calls.DATE, Calls.DATE,
Calls.DURATION, Calls.DURATION,
Calls.TYPE, Calls.TYPE,
"phone_account_address" Calls.PHONE_ACCOUNT_ID
) )
val numberToSimIDMap = HashMap<String, Int>() val accountIdToSimIDMap = HashMap<String, Int>()
context.getAvailableSIMCardLabels().forEach { context.getAvailableSIMCardLabels().forEach {
numberToSimIDMap[it.phoneNumber] = it.id accountIdToSimIDMap[it.handle.id] = it.id
} }
val cursor = if (isRPlus()) { val cursor = if (isRPlus()) {
@ -138,8 +138,8 @@ class RecentsHelper(private val context: Context) {
val duration = cursor.getIntValue(Calls.DURATION) val duration = cursor.getIntValue(Calls.DURATION)
val type = cursor.getIntValue(Calls.TYPE) val type = cursor.getIntValue(Calls.TYPE)
val accountAddress = cursor.getStringValue("phone_account_address") val accountId = cursor.getStringValue(Calls.PHONE_ACCOUNT_ID)
val simID = numberToSimIDMap[accountAddress] ?: 1 val simID = accountIdToSimIDMap[accountId] ?: -1
val neighbourIDs = ArrayList<Int>() val neighbourIDs = ArrayList<Int>()
var specificNumber = "" var specificNumber = ""
var specificType = "" var specificType = ""