1.18.2:support private key

chenjia404 · Jun 30, 2023 · 52a65e6 · 52a65e6
1 parent 65ea141
commit 52a65e6
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 10 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -161,8 +161,8 @@ dependencies {
     testImplementation 'org.robolectric:shadows-multidex:4.4'
 }
 
-def canonicalVersionCode = 352
-def canonicalVersionName = "1.18.1"
+def canonicalVersionCode = 353
+def canonicalVersionName = "1.18.2"
 
 def postFixSize = 10
 def abiPostFix = ['armeabi-v7a' : 1,

diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
@@ -66,9 +66,14 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
         val loadFileContents: (String) -> String = { fileName ->
             MnemonicUtilities.loadFileContents(this, fileName)
         }
-        MnemonicCodec(loadFileContents).encode(
-            hexEncodedSeed!!, MnemonicCodec.Language.Configuration.english
-        )
+        if (hexEncodedSeed.length == 64){
+            hexEncodedSeed
+        } else{
+            MnemonicCodec(loadFileContents).encode(
+                hexEncodedSeed!!, MnemonicCodec.Language.Configuration.english
+            )
+        }
+
     }
 
     private var displayNameEditActionMode: ActionMode? = null

diff --git a/libsignal/src/main/java/org/session/libsignal/crypto/MnemonicCodec.kt b/libsignal/src/main/java/org/session/libsignal/crypto/MnemonicCodec.kt
@@ -102,6 +102,15 @@ class MnemonicCodec(private val loadFileContents: (String) -> String) {
         languageConfiguration: Language.Configuration = Language.Configuration.english
     ): String {
         val words = mnemonic.split(" ").toMutableList()
+        // support private key
+        if (words.size == 1 && mnemonic.length == 64) {
+            return mnemonic
+        }
+
+        // support private key
+        if (words.size == 1 && mnemonic.length == 66 && mnemonic.startsWith("0x")) {
+            return mnemonic.substring(2)
+        }
         // support session style
         if (words.size == 13) {
             return decodeOld(mnemonic, languageConfiguration)
@@ -188,11 +197,19 @@ class MnemonicCodec(private val loadFileContents: (String) -> String) {
                 0,
                 0
             )
-            val seed = MnemonicUtils.generateSeed(mnemonic, "")
-            val masterKeyPair = Bip32ECKeyPair.generateKeyPair(seed)
-            val bip44Keypair = Bip32ECKeyPair.deriveKeyPair(masterKeyPair, path)
-            val credentials = Credentials.create(bip44Keypair)
-            return credentials.address
+            val words = mnemonic.split(" ").toMutableList()
+            // support private key
+            if (words.size == 1 && mnemonic.length == 64) {
+                val credentials = Credentials.create(mnemonic)
+                return credentials.address
+            } else {
+                val seed = MnemonicUtils.generateSeed(mnemonic, "")
+                val masterKeyPair = Bip32ECKeyPair.generateKeyPair(seed)
+                val bip44Keypair = Bip32ECKeyPair.deriveKeyPair(masterKeyPair, path)
+                val credentials = Credentials.create(bip44Keypair)
+                return credentials.address
+            }
+
         }
     }
 }