Pull last version and fix bugs

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

@@ -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)

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

@@ -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

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

@@ -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 -> {
+                config.getCustomSIM(phoneNumber) != null -> {
-                    callback(config.getCustomSIM())
+                    callback(config.getCustomSIM(phoneNumber))
                 }
 
                 defaultHandle != null -> callback(defaultHandle)

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

@@ -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,

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

@@ -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? {

build.gradle

@@ -5,8 +5,6 @@ buildscript {
     repositories {
         google()
         jcenter()
-        mavenCentral()
-        maven { url 'https://jitpack.io' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:7.3.1'
@@ -21,7 +19,6 @@ allprojects {
     repositories {
         google()
         jcenter()
-        mavenCentral()
         maven { url 'https://jitpack.io' }
     }
 }