From ab5cd206c73a5b27f931321ab0e04c6c7eb5cc70 Mon Sep 17 00:00:00 2001 From: "am.yazdanmanesh" Date: Wed, 26 Apr 2023 09:37:14 +0330 Subject: [PATCH] Pull last version and fix bugs --- .../com/simplemobiletools/dialer/adapters/ContactsAdapter.kt | 2 +- .../simplemobiletools/dialer/adapters/RecentCallsAdapter.kt | 4 ++-- .../com/simplemobiletools/dialer/extensions/Activity.kt | 4 ++-- .../simplemobiletools/dialer/extensions/SharedPreferences.kt | 1 + .../kotlin/com/simplemobiletools/dialer/helpers/Config.kt | 5 +++-- build.gradle | 3 --- 6 files changed, 9 insertions(+), 10 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/ContactsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/ContactsAdapter.kt index c2ee834d..6d017deb 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/ContactsAdapter.kt +++ b/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) diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/RecentCallsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/RecentCallsAdapter.kt index 71c91dd9..785bcb2f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/RecentCallsAdapter.kt +++ b/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 diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/extensions/Activity.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/extensions/Activity.kt index 479d5ed4..beae752c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/extensions/Activity.kt +++ b/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 -> { - callback(config.getCustomSIM()) + config.getCustomSIM(phoneNumber) != null -> { + callback(config.getCustomSIM(phoneNumber)) } defaultHandle != null -> callback(defaultHandle) diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/extensions/SharedPreferences.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/extensions/SharedPreferences.kt index 138a4a1e..44f13903 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/extensions/SharedPreferences.kt +++ b/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, diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/Config.kt index 3b84c086..3da85f89 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/Config.kt +++ b/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? { diff --git a/build.gradle b/build.gradle index ad5f0288..09fe7980 100644 --- a/build.gradle +++ b/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' } } }