fenix/Simple-Dialer
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Dialer.git synced 2025-02-12 09:30:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Pull last version and fix bugs

Browse Source
This commit is contained in:
am.yazdanmanesh 2023-04-26 09:37:14 +03:30
parent 515590c69d
commit 2e0e658ef0
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/kotlin/com/simplemobiletools/dialer/adapters/ContactsAdapter.kt
View File

@ -81,7 +81,7 @@ class ContactsAdapter(
menu.apply {
findItem(R.id.cab_call_sim_1).isVisible = hasMultipleSIMs && isOneItemSelected
findItem(R.id.cab_call_sim_2).isVisible = hasMultipleSIMs && isOneItemSelected
findItem(R.id.cab_remove_default_sim).isVisible = isOneItemSelected && activity.config.getCustomSIM(selectedNumber) != ""
findItem(R.id.cab_remove_default_sim).isVisible = isOneItemSelected && (activity.config.getCustomSIM(selectedNumber) ?: "") != ""
findItem(R.id.cab_delete).isVisible = showDeleteButton
findItem(R.id.cab_create_shortcut).title = activity.addLockedLabelIfNeeded(R.string.create_shortcut)

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

@ -60,7 +60,7 @@ class RecentCallsAdapter(
menu.apply {
findItem(R.id.cab_call_sim_1).isVisible = hasMultipleSIMs && isOneItemSelected
findItem(R.id.cab_call_sim_2).isVisible = hasMultipleSIMs && isOneItemSelected
findItem(R.id.cab_remove_default_sim).isVisible = isOneItemSelected && activity.config.getCustomSIM(selectedNumber) != ""
findItem(R.id.cab_remove_default_sim).isVisible = isOneItemSelected && (activity.config.getCustomSIM(selectedNumber) ?: "") != ""
findItem(R.id.cab_block_number).title = activity.addLockedLabelIfNeeded(R.string.block_number)
findItem(R.id.cab_block_number).isVisible = isNougatPlus()
@ -364,7 +364,7 @@ class RecentCallsAdapter(
findItem(R.id.cab_view_details).isVisible = contact != null
findItem(R.id.cab_block_number).title = activity.addLockedLabelIfNeeded(R.string.block_number)
findItem(R.id.cab_block_number).isVisible = isNougatPlus()
findItem(R.id.cab_remove_default_sim).isVisible = activity.config.getCustomSIM(selectedNumber) != ""
findItem(R.id.cab_remove_default_sim).isVisible = (activity.config.getCustomSIM(selectedNumber) ?: "") != ""
}
setOnMenuItemClickListener { item ->
val callId = call.id

4
app/src/main/kotlin/com/simplemobiletools/dialer/extensions/Activity.kt
View File

@ -76,8 +76,8 @@ fun SimpleActivity.getHandleToUse(intent: Intent?, phoneNumber: String, callback
val defaultHandle = telecomManager.getDefaultOutgoingPhoneAccount(PhoneAccount.SCHEME_TEL)
when {
intent?.hasExtra(TelecomManager.EXTRA_PHONE_ACCOUNT_HANDLE) == true -> callback(intent.getParcelableExtra(TelecomManager.EXTRA_PHONE_ACCOUNT_HANDLE)!!)
config.getCustomSIM() != null -> {
callback(config.getCustomSIM())
config.getCustomSIM(phoneNumber) != null -> {
callback(config.getCustomSIM(phoneNumber))
}
defaultHandle != null -> callback(defaultHandle)

1
app/src/main/kotlin/com/simplemobiletools/dialer/extensions/SharedPreferences.kt
View File

@ -4,6 +4,7 @@ import android.content.SharedPreferences
import android.telecom.PhoneAccountHandle
import com.simplemobiletools.dialer.models.PhoneAccountHandleModel
import com.google.gson.Gson
import com.google.gson.JsonSyntaxException
fun SharedPreferences.Editor.putPhoneAccountHandle(
key: String,

5
app/src/main/kotlin/com/simplemobiletools/dialer/helpers/Config.kt
View File

@ -2,11 +2,12 @@ package com.simplemobiletools.dialer.helpers
import android.content.ComponentName
import android.content.Context
import android.net.Uri
import android.telecom.PhoneAccountHandle
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
import com.simplemobiletools.commons.helpers.BaseConfig
import com.simplemobiletools.dialer.extensions.getPhoneAccountHandleModel
import com.simplemobiletools.dialer.extensions.putPhoneAccountHandle
import com.simplemobiletools.dialer.models.SpeedDial
class Config(context: Context) : BaseConfig(context) {
@ -28,7 +29,7 @@ class Config(context: Context) : BaseConfig(context) {
}
fun saveCustomSIM(number: String, handle: PhoneAccountHandle) {
prefs.edit().putPhoneAccountHandle(REMEMBER_SIM_PREFIX + number,handle).apply()
prefs.edit().putPhoneAccountHandle(REMEMBER_SIM_PREFIX + number, handle).apply()
}
fun getCustomSIM(number: String): PhoneAccountHandle? {