support legacy keys

tonkeeper · Nov 6, 2024 · 0a26887 · 0a26887
1 parent 818430e
commit 0a26887
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 3 deletions.
diff --git a/apps/wallet/data/rn/src/main/java/com/tonapps/wallet/data/rn/RNSeedStorage.kt b/apps/wallet/data/rn/src/main/java/com/tonapps/wallet/data/rn/RNSeedStorage.kt
@@ -115,7 +115,7 @@ internal class RNSeedStorage(context: Context) {
     private suspend fun readState(): SeedState? {
         val chunks = kv.getItemImpl("${walletsKey}_chunks")?.toIntOrNull() ?: 0
         if (0 >= chunks) {
-            return null
+            return readStateLegacy()
         }
         var encryptedString = ""
         for (i in 0 until chunks) {
@@ -126,6 +126,20 @@ internal class RNSeedStorage(context: Context) {
         return SeedState(json)
     }
 
+    private suspend fun readStateLegacy(): SeedState? {
+        val chunks = kv.getItemImpl("key_v1-${walletsKey}_chunks")?.toIntOrNull() ?: 0
+        if (0 >= chunks) {
+            return null
+        }
+        var encryptedString = ""
+        for (i in 0 until chunks) {
+            val chunk = kv.getItemImpl("key_v1-${walletsKey}_chunk_$i") ?: throw Exception("Chunk $i is null")
+            encryptedString += chunk
+        }
+        val json = JSONObject(encryptedString)
+        return SeedState(json)
+    }
+
     suspend fun getWithThrow(passcode: String): RNVaultState = withContext(Dispatchers.IO) {
         val state = readStateWithThrow()
         val decrypted = ScryptBox.decrypt(passcode, state)
@@ -136,7 +150,7 @@ internal class RNSeedStorage(context: Context) {
     private suspend fun readStateWithThrow(): SeedState {
         val chunks = kv.getItemImpl("${walletsKey}_chunks")?.toIntOrNull() ?: 0
         if (0 >= chunks) {
-            throw RNException.EmptyChunks
+            return readStateLegacyWithThrow()
         }
         val builder = StringBuilder()
         for (i in 0 until chunks) {
@@ -146,4 +160,18 @@ internal class RNSeedStorage(context: Context) {
         val json = JSONObject(builder.toString())
         return SeedState(json)
     }
+
+    private suspend fun readStateLegacyWithThrow(): SeedState {
+        val chunks = kv.getItemImpl("key_v1-${walletsKey}_chunks")?.toIntOrNull() ?: 0
+        if (0 >= chunks) {
+            throw RNException.EmptyChunks
+        }
+        val builder = StringBuilder()
+        for (i in 0 until chunks) {
+            val chunk = kv.getItemImpl("key_v1-${walletsKey}_chunk_$i") ?: throw RNException.NotFoundChunk(i)
+            builder.append(chunk)
+        }
+        val json = JSONObject(builder.toString())
+        return SeedState(json)
+    }
 }
diff --git a/apps/wallet/instance/app/src/main/res/layout/fragment_dev.xml b/apps/wallet/instance/app/src/main/res/layout/fragment_dev.xml
@@ -66,7 +66,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="@dimen/offsetMedium"
-                    android:text="Import DApps from RN biometry"
+                    android:text="Import DApps from RN"
                     app:position="middle"/>
 
                 <uikit.widget.item.ItemTextView