From c2953cf149891dc181d785f1d5804ec6f12d5ca1 Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 14 May 2020 12:22:02 +0300 Subject: [PATCH 1/3] Updated on 2026-08-14 --- .../personalize/ui/presets/PersonalizationPresetManager.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/personalize/ui/presets/PersonalizationPresetManager.kt b/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/personalize/ui/presets/PersonalizationPresetManager.kt index 0888540ba4..734729c22b 100644 --- a/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/personalize/ui/presets/PersonalizationPresetManager.kt +++ b/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/personalize/ui/presets/PersonalizationPresetManager.kt @@ -7,6 +7,7 @@ import com.tangem.devkit.ucase.variants.personalize.converter.PersonalizationCon import com.tangem.devkit.ucase.variants.personalize.converter.PersonalizationJsonConverter import com.tangem.devkit.ucase.variants.personalize.dto.PersonalizationConfig import com.tangem.devkit.ucase.variants.personalize.dto.PersonalizationJson +import ru.dev.gbixahue.eu4d.lib.android.global.log.Log class PersonalizationPresetManager( private val itemsManager: ItemsManager, @@ -52,7 +53,9 @@ class PersonalizationPresetManager( val jsonDto = try { PersonalizationJson.getJsonConverter().fromJson(jsonString, PersonalizationJson::class.java) } catch (ex: Exception) { - view.showSnackbar("Can't convert imported string to Json object. Error: $ex") + val message = "Can't convert imported string to Json object" + view.showSnackbar(message) + Log.e(this, "$message. $ex") return } From a63cfada65b42e226cb515cb27d5fa929e8d03ab Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 14 May 2020 13:36:28 +0300 Subject: [PATCH 2/3] Updated on 2026-08-14 --- .../variants/personalize/dto/PersonalizationJson.kt | 10 ++++++++++ .../personalize/ui/PersonalizationFragment.kt | 5 ++--- .../ui/presets/PersonalizationPresetManager.kt | 13 ++++++++----- .../src/main/res/values/strings_personalization.xml | 1 + 4 files changed, 21 insertions(+), 8 deletions(-) diff --git a/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/personalize/dto/PersonalizationJson.kt b/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/personalize/dto/PersonalizationJson.kt index 58831014a8..a024383090 100644 --- a/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/personalize/dto/PersonalizationJson.kt +++ b/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/personalize/dto/PersonalizationJson.kt @@ -65,6 +65,16 @@ class PersonalizationJson { val builder = GsonBuilder().setPrettyPrinting() return builder.create() } + + fun clarifyJson(json: String): String { + val unsupportedQuotes = mutableListOf("“", "”", "«", "»") + var clearedJson = json + unsupportedQuotes.forEach { + if (clearedJson.contains(it)) clearedJson = clearedJson.replace(it, "\"") + } + // 160 is 00A0 symbol (No-Break Space) + return clearedJson.replace(160.toChar().toString(), "").trim() + } } } diff --git a/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/personalize/ui/PersonalizationFragment.kt b/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/personalize/ui/PersonalizationFragment.kt index bb5b708b86..9e2d3ad01a 100644 --- a/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/personalize/ui/PersonalizationFragment.kt +++ b/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/personalize/ui/PersonalizationFragment.kt @@ -148,7 +148,7 @@ class PersonalizationFragment : BaseCardActionFragment(), PersonalizationPresetV val tvJsonImport = parent.findViewById(R.id.et_json_import) val btnImportJson = parent.findViewById