From 11f32af2958883831306d99b6676c4f090bf7d42 Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 15 Aug 2024 15:06:34 +0300 Subject: [PATCH] Updated on 2026-08-14 --- .../utils/SharedPreferencesKeyMigration.kt | 27 +++---------------- .../core/ui/utils/BigDecimalFormatter.kt | 5 ---- .../tangem/data/visa/utils/CurrencyUtils.kt | 14 +++------- gradle/dependencies.toml | 4 +-- .../plugin/configuration/model/AppConfig.kt | 2 +- 5 files changed, 10 insertions(+), 42 deletions(-) diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/preferences/utils/SharedPreferencesKeyMigration.kt b/core/datasource/src/main/java/com/tangem/datasource/local/preferences/utils/SharedPreferencesKeyMigration.kt index f9c11e6471..a049816e5c 100644 --- a/core/datasource/src/main/java/com/tangem/datasource/local/preferences/utils/SharedPreferencesKeyMigration.kt +++ b/core/datasource/src/main/java/com/tangem/datasource/local/preferences/utils/SharedPreferencesKeyMigration.kt @@ -1,9 +1,6 @@ package com.tangem.datasource.local.preferences.utils import android.content.Context -import android.os.Build -import androidx.annotation.DoNotInline -import androidx.annotation.RequiresApi import androidx.datastore.core.DataMigration import androidx.datastore.preferences.core.* import java.io.File @@ -72,27 +69,11 @@ internal class SharedPreferencesKeyMigration( } private fun deleteSharedPreferences(context: Context, name: String) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { - if (!Api24Impl.deleteSharedPreferences(context, name)) { - throw IOException("Unable to delete SharedPreferences: $name") - } - } else { - val prefsFile = getSharedPrefsFile(context, name) - val prefsBackup = getSharedPrefsBackup(prefsFile) + val prefsFile = getSharedPrefsFile(context, name) + val prefsBackup = getSharedPrefsBackup(prefsFile) - prefsFile.delete() - prefsBackup.delete() - } - } - - @RequiresApi(Build.VERSION_CODES.N) - private object Api24Impl { - - @JvmStatic - @DoNotInline - fun deleteSharedPreferences(context: Context, name: String): Boolean { - return context.deleteSharedPreferences(name) - } + prefsFile.delete() + prefsBackup.delete() } private fun getSharedPrefsFile(context: Context, name: String): File { diff --git a/core/ui/src/main/java/com/tangem/core/ui/utils/BigDecimalFormatter.kt b/core/ui/src/main/java/com/tangem/core/ui/utils/BigDecimalFormatter.kt index b0c1a83fed..91ef672575 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/utils/BigDecimalFormatter.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/utils/BigDecimalFormatter.kt @@ -1,7 +1,6 @@ package com.tangem.core.ui.utils import android.icu.text.CompactDecimalFormat -import android.os.Build import com.tangem.domain.tokens.model.CryptoCurrency import com.tangem.utils.StringsSigns.DASH_SIGN import com.tangem.utils.StringsSigns.LOWER_SIGN @@ -366,10 +365,6 @@ object BigDecimalFormatter { threeDigitsMethod: Boolean = false, scale: Int = 0, ): String { - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) { - return BigDecimalFormatterCompat.formatCompactAmountNoLocaleContext(amount = amount) - } - if (threeDigitsMethod) { val scaledAmount = amount.setScale(scale, RoundingMode.HALF_UP) val digitsCount = scaledAmount.longValueExact().toString().count() diff --git a/data/visa/src/debug/kotlin/com/tangem/data/visa/utils/CurrencyUtils.kt b/data/visa/src/debug/kotlin/com/tangem/data/visa/utils/CurrencyUtils.kt index bcc9aeb311..405d55d6a8 100644 --- a/data/visa/src/debug/kotlin/com/tangem/data/visa/utils/CurrencyUtils.kt +++ b/data/visa/src/debug/kotlin/com/tangem/data/visa/utils/CurrencyUtils.kt @@ -1,15 +1,7 @@ package com.tangem.data.visa.utils -import android.os.Build -import timber.log.Timber import java.util.Currency -internal fun findCurrencyByNumericCode(code: Int): Currency { - return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { - Currency.getAvailableCurrencies().firstOrNull { it.numericCode == code } - ?: Currency.getInstance(VisaConstants.fiatCurrency.code) - } else { - Timber.w("Unable to get currency by numeric code on API level ${Build.VERSION.SDK_INT}") - Currency.getInstance(VisaConstants.fiatCurrency.code) - } -} \ No newline at end of file +internal fun findCurrencyByNumericCode(code: Int) = + Currency.getAvailableCurrencies().firstOrNull { it.numericCode == code } + ?: Currency.getInstance(VisaConstants.fiatCurrency.code) \ No newline at end of file diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml index 6201894fe4..74b8993062 100644 --- a/gradle/dependencies.toml +++ b/gradle/dependencies.toml @@ -88,9 +88,9 @@ markdown = "0.7.2" # endregion Other libraries # region Tangem -tangemBlockchainSdk = "develop-734" +tangemBlockchainSdk = "develop-736" #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds -tangemCardSdk = "develop-375" +tangemCardSdk = "develop-378" #tangemCardSdk = "0.0.1" # Keep it! - used for local builds ^ tangemVico = "2.0.0-alpha.25-tangem16" #tangemVico = "0.0.1" # Keep it! - used for local builds ^ diff --git a/plugins/configuration/src/main/kotlin/com/tangem/plugin/configuration/model/AppConfig.kt b/plugins/configuration/src/main/kotlin/com/tangem/plugin/configuration/model/AppConfig.kt index c8bfbff0f1..ad8aa17560 100644 --- a/plugins/configuration/src/main/kotlin/com/tangem/plugin/configuration/model/AppConfig.kt +++ b/plugins/configuration/src/main/kotlin/com/tangem/plugin/configuration/model/AppConfig.kt @@ -4,7 +4,7 @@ internal object AppConfig { const val packageName = "com.tangem.wallet" const val versionCode = 1 const val versionName = "1.0.0-SNAPSHOT" - const val minSdkVersion = 23 + const val minSdkVersion = 24 const val targetSdkVersion = 34 const val compileSdkVersion = 34 } \ No newline at end of file