From a63cfada65b42e226cb515cb27d5fa929e8d03ab Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Thu, 14 May 2020 13:36:28 +0300
Subject: [PATCH] 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<EditText>(R.id.et_json_import)
             val btnImportJson = parent.findViewById<Button>(R.id.btn_import_json)
             btnImportJson.setOnClickListener {
-                presetManager.importJsonConfig(tvJsonImport.text.toString().trim())
+                presetManager.importJsonConfig(tvJsonImport.text.toString())
             }
         }
 
@@ -255,8 +255,7 @@ class PersonalizationFragment : BaseCardActionFragment(), PersonalizationPresetV
         dlg.setButton(DialogInterface.BUTTON_POSITIVE, getString(R.string.btn_ok)) { dialog, which ->
             val tvName = dlgController.view?.findViewById<EditText>(R.id.et_item) ?: return@setButton
             val name = tvName.text.toString()
-            if (name.isEmpty()) showSnackbar(R.string.error_nothing_to_import)
-            else presetManager.importJsonConfig(name)
+            presetManager.importJsonConfig(name)
         }
         dlgController.onShowCallback = {
             dlgController.view?.findViewById<TextView>(R.id.et_item)?.let {
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 734729c22b..dc7240819e 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
@@ -48,14 +48,17 @@ class PersonalizationPresetManager(
     }
 
     fun importJsonConfig(jsonString: String) {
-        if (jsonString.isEmpty()) return
+        if (jsonString.isEmpty()) {
+            view.showSnackbar(R.string.error_nothing_to_import)
+            return
+        }
 
         val jsonDto = try {
-            PersonalizationJson.getJsonConverter().fromJson(jsonString, PersonalizationJson::class.java)
+            val preparedJson = PersonalizationJson.clarifyJson(jsonString)
+            PersonalizationJson.getJsonConverter().fromJson(preparedJson, PersonalizationJson::class.java)
         } catch (ex: Exception) {
-            val message = "Can't convert imported string to Json object"
-            view.showSnackbar(message)
-            Log.e(this, "$message. $ex")
+            view.showSnackbar(R.string.error_cant_convert_json)
+            Log.e(this, ex)
             return
         }
 
diff --git a/tangem-devkit/src/main/res/values/strings_personalization.xml b/tangem-devkit/src/main/res/values/strings_personalization.xml
index 0b629f65f7..b858b91cdd 100644
--- a/tangem-devkit/src/main/res/values/strings_personalization.xml
+++ b/tangem-devkit/src/main/res/values/strings_personalization.xml
@@ -10,6 +10,7 @@
     <string name="hint_paste">Paste</string>
 
     <string name="error_nothing_to_import">Nothing to import</string>
+    <string name="error_cant_convert_json">Can\'t convert imported string to Json object</string>
     <string name="error_not_saved">Not saved</string>
 
     <string name="personalize">Personalize</string>