From 7c8c75f7c8fd03085b8a027ab76884a065f6d9f3 Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Tue, 4 Feb 2025 12:47:08 -0800
Subject: [PATCH 1/2] feat: add support for 24 word recovery phrases, add
 option to choose word count on wallet creation.

---
 wallet/AndroidManifest.xml                    |   5 +
 .../res/layout/activity_phrasewordcount.xml   | 121 ++++++++++++++++++
 wallet/res/values/strings-extra.xml           |   6 +-
 wallet/res/values/strings.xml                 |   2 +
 .../wallet/service/WalletFactory.kt           |  18 ++-
 .../wallet/ui/OnboardingActivity.kt           |  17 ++-
 .../wallet/ui/OnboardingViewModel.kt          |   4 +-
 .../ui/dashpay/utils/GoogleDriveService.kt    |   2 +-
 .../onboarding/SelectSecurityLevelActivity.kt |  52 ++++++++
 .../schildbach/wallet/util/MnemonicCodeExt.kt |   4 +-
 10 files changed, 220 insertions(+), 11 deletions(-)
 create mode 100644 wallet/res/layout/activity_phrasewordcount.xml
 create mode 100644 wallet/src/de/schildbach/wallet/ui/onboarding/SelectSecurityLevelActivity.kt

diff --git a/wallet/AndroidManifest.xml b/wallet/AndroidManifest.xml
index b4ad2b8c3..1bceb72ef 100644
--- a/wallet/AndroidManifest.xml
+++ b/wallet/AndroidManifest.xml
@@ -97,6 +97,11 @@
 
         </activity>
 
+        <activity
+            android:name="de.schildbach.wallet.ui.onboarding.SelectSecurityLevelActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/My.Theme.ChildActivity" />
+
         <activity
             android:name="de.schildbach.wallet.ui.verify.VerifySeedActivity"
             android:screenOrientation="portrait"
diff --git a/wallet/res/layout/activity_phrasewordcount.xml b/wallet/res/layout/activity_phrasewordcount.xml
new file mode 100644
index 000000000..84bf41fa3
--- /dev/null
+++ b/wallet/res/layout/activity_phrasewordcount.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/titleBar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        app:layout_constraintTop_toTopOf="parent"
+        app:navigationIcon="@drawable/ic_arrow_back" />
+
+    <LinearLayout
+        android:id="@+id/register_panel"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:layout_marginTop="20dp"
+        android:paddingHorizontal="20dp"
+        android:paddingBottom="62dp"
+        app:layout_constraintTop_toBottomOf="@id/titleBar">
+
+        <TextView
+            android:id="@+id/title"
+            style="@style/Headline5"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="?attr/actionBarSize"
+            android:text="@string/select_security_level_title"
+            android:textAlignment="gravity" />
+
+        <TextView
+            android:id="@+id/description_1"
+            style="@style/Body2"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:gravity="start"
+            android:textAlignment="gravity"
+            android:text="@string/select_security_level_message" />
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/twelve_words_option"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/register_panel"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="15dp"
+            android:background="@drawable/light_grey_border_item"
+            android:paddingHorizontal="20dp"
+            android:paddingVertical="12dp">
+
+        <TextView
+            android:id="@+id/twelve_words_option_title"
+            style="@style/Subtitle1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/select_security_level_12_words_title"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/twelve_words_option_message"
+            style="@style/Caption.Secondary"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="20dp"
+            android:text="@string/select_security_level_12_words_message"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/twelve_words_option_title" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/twenty_four_words_option"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/intermediate_cl"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="15dp"
+            android:background="@drawable/light_grey_border_item"
+            android:paddingHorizontal="20dp"
+            android:paddingVertical="12dp">
+
+            <TextView
+                android:id="@+id/non_contested_name_title"
+                style="@style/Subtitle1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/select_security_level_24_words_title"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/non_contested_name_description"
+                style="@style/Caption.Secondary"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="20dp"
+                android:text="@string/select_security_level_24_words_message"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/non_contested_name_title" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/continue_btn"
+        style="@style/Button.Primary.Large.Blue"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="20dp"
+        android:text="@string/button_continue"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/wallet/res/values/strings-extra.xml b/wallet/res/values/strings-extra.xml
index 7bdf76030..6b2d26149 100644
--- a/wallet/res/values/strings-extra.xml
+++ b/wallet/res/values/strings-extra.xml
@@ -122,7 +122,7 @@
     <string name="request_coins_clipboard_address_msg">Dash address copied to clipboard</string>
     <string name="backup_wallet_to_seed_show_recovery_phrase">Show</string>
     <string name="restore_wallet_from_invalid_seed_warning_message">\"%s\" is not a recovery phrase word</string>
-    <string name="restore_wallet_from_invalid_seed_not_twelve_words">Recovery phrase must have 12 words</string>
+    <string name="restore_wallet_from_invalid_seed_not_twelve_words">Recovery phrase must have 12 or 24 words</string>
     <string name="restore_wallet_from_invalid_seed_bad_checksum">Bad recovery phrase</string>
     <string name="restore_wallet_from_invalid_seed_failure">Wallet could not be restored:\n\n%s\n\nBad recovery phrase?</string>
 
@@ -473,4 +473,8 @@
     <string name="stale_exchange_rates_error">Prices weren\'t retrieved. Fiat values may be incorrect.</string>
     <string name="stale_exchange_rates_stale">Prices are at least 30 minutes old. Fiat values may be incorrect.</string>
     <string name="stale_exchange_rates_volatile">Prices have fluctuated more than 50% since the last update.</string>
+    <string name="select_security_level_title">Select Security Level</string>
+    <string name="select_security_level_message">You can secure your wallet with a 12 or 24 word recovery phrase.</string>
+    <string name="select_security_level_12_words_title">Secure</string>
+    <string name="select_security_level_24_words_message">24 word recovery phrase</string>
 </resources>
\ No newline at end of file
diff --git a/wallet/res/values/strings.xml b/wallet/res/values/strings.xml
index 5d0a76731..b09196806 100644
--- a/wallet/res/values/strings.xml
+++ b/wallet/res/values/strings.xml
@@ -417,5 +417,7 @@
     <string name="battery_optimization_dialog_message_not_optimized">This app is configured to continue running after not being visible for some time.\n\nWe suggest allowing this app to always stay up-to-date with the blockchain, even in the background.\n\nDon\'t worry, we will always mind your battery usage.</string>
     <string name="battery_optimization_dialog_button_change">Open Settings</string>
     <string name="credits_profile_change_message">Update profile information</string>
+    <string name="select_security_level_12_words_message">12 word recovery phrase</string>
+    <string name="select_security_level_24_words_title">Very secure</string>
 
 </resources>
diff --git a/wallet/src/de/schildbach/wallet/service/WalletFactory.kt b/wallet/src/de/schildbach/wallet/service/WalletFactory.kt
index 7ae887fc8..4e957393a 100644
--- a/wallet/src/de/schildbach/wallet/service/WalletFactory.kt
+++ b/wallet/src/de/schildbach/wallet/service/WalletFactory.kt
@@ -30,6 +30,7 @@ import org.bitcoinj.core.AddressFormatException
 import org.bitcoinj.core.DumpedPrivateKey
 import org.bitcoinj.core.ECKey
 import org.bitcoinj.core.NetworkParameters
+import org.bitcoinj.crypto.LinuxSecureRandom
 import org.bitcoinj.script.Script
 import org.bitcoinj.wallet.DeterministicKeyChain
 import org.bitcoinj.wallet.DeterministicSeed
@@ -49,13 +50,14 @@ import java.io.FileInputStream
 import java.io.IOException
 import java.io.InputStream
 import java.io.InputStreamReader
+import java.security.SecureRandom
 import java.text.ParseException
 import java.util.LinkedList
 import javax.inject.Inject
 
 interface WalletFactory {
     // Onboarding
-    fun create(params: NetworkParameters): Wallet
+    fun create(params: NetworkParameters, seedWordCount: Int): Wallet
     fun restoreFromSeed(params: NetworkParameters, recoveryPhrase: List<String>): Wallet
     @Throws(IOException::class)
     fun restoreFromFile(params: NetworkParameters, backupUri: Uri, password: String): Pair<Wallet, Boolean>
@@ -99,8 +101,18 @@ class DashWalletFactory @Inject constructor(
         }
     }
 
-    override fun create(params: NetworkParameters): Wallet {
-        val wallet = WalletEx.createDeterministic(params, Script.ScriptType.P2PKH)
+    override fun create(params: NetworkParameters, seedWordCount: Int): Wallet {
+        //val wallet = WalletEx.createDeterministic(params, Script.ScriptType.P2PKH)
+        val bits = when (seedWordCount) {
+            12 -> DeterministicSeed.DEFAULT_SEED_ENTROPY_BITS
+            24 -> DeterministicSeed.DEFAULT_SEED_ENTROPY_BITS * 2
+            else -> error("only 12 or 24 words are supported when creating a wallet")
+        }
+        val wallet = WalletEx.fromSeed(
+            params,
+            DeterministicSeed(SecureRandom(), bits, ""),
+            Script.ScriptType.P2PKH
+        )
         addMissingExtensions(wallet)
         checkWalletValid(wallet, params)
         return wallet
diff --git a/wallet/src/de/schildbach/wallet/ui/OnboardingActivity.kt b/wallet/src/de/schildbach/wallet/ui/OnboardingActivity.kt
index ef6b3de1f..00a85c761 100644
--- a/wallet/src/de/schildbach/wallet/ui/OnboardingActivity.kt
+++ b/wallet/src/de/schildbach/wallet/ui/OnboardingActivity.kt
@@ -26,6 +26,7 @@ import android.os.Build
 import android.os.Bundle
 import android.text.TextUtils
 import android.widget.Toast
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import androidx.activity.viewModels
 import androidx.core.view.isVisible
@@ -40,6 +41,7 @@ import de.schildbach.wallet.ui.main.MainActivity
 import de.schildbach.wallet.security.PinRetryController
 import de.schildbach.wallet_test.BuildConfig
 import de.schildbach.wallet.security.SecurityGuard
+import de.schildbach.wallet.ui.onboarding.SelectSecurityLevelActivity
 import de.schildbach.wallet_test.R
 import de.schildbach.wallet_test.databinding.ActivityOnboardingBinding
 import de.schildbach.wallet_test.databinding.ActivityOnboardingPermLockBinding
@@ -111,6 +113,16 @@ class OnboardingActivity : RestoreFromFileActivity() {
     @Inject
     lateinit var pinRetryController: PinRetryController
 
+    private val selectWordCountLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+        if (result.resultCode == RESULT_OK) {
+            val onboardingInvite = intent.getParcelableExtra<InvitationLinkData>(EXTRA_INVITE)
+            viewModel.createNewWallet(
+                onboardingInvite,
+                result.data!!.extras!!.getInt(SelectSecurityLevelActivity.EXTRA_WORD_COUNT)
+            )
+        }
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -243,8 +255,9 @@ class OnboardingActivity : RestoreFromFileActivity() {
 
     private fun initView() {
         binding.createNewWallet.setOnClickListener {
-            val onboardingInvite = intent.getParcelableExtra<InvitationLinkData>(EXTRA_INVITE)
-            viewModel.createNewWallet(onboardingInvite)
+            selectWordCountLauncher.launch(
+                Intent(this, SelectSecurityLevelActivity::class.java)
+            )
         }
         binding.recoveryWallet.setOnClickListener {
             walletApplication.initEnvironmentIfNeeded()
diff --git a/wallet/src/de/schildbach/wallet/ui/OnboardingViewModel.kt b/wallet/src/de/schildbach/wallet/ui/OnboardingViewModel.kt
index c4d869bdf..db95e959e 100644
--- a/wallet/src/de/schildbach/wallet/ui/OnboardingViewModel.kt
+++ b/wallet/src/de/schildbach/wallet/ui/OnboardingViewModel.kt
@@ -56,9 +56,9 @@ class OnboardingViewModel @Inject constructor(
     internal val finishUnecryptedWalletUpgradeAction = SingleLiveEvent<Unit>()
     internal val startActivityAction = SingleLiveEvent<Intent>()
 
-    fun createNewWallet(onboardingInvite: InvitationLinkData?) {
+    fun createNewWallet(onboardingInvite: InvitationLinkData?, seedWordCount: Int) {
         walletApplication.initEnvironmentIfNeeded()
-        val wallet = walletFactory.create(Constants.NETWORK_PARAMETERS)
+        val wallet = walletFactory.create(Constants.NETWORK_PARAMETERS, seedWordCount)
         log.info("successfully created new wallet")
         walletApplication.setWallet(wallet)
         configuration.armBackupSeedReminder()
diff --git a/wallet/src/de/schildbach/wallet/ui/dashpay/utils/GoogleDriveService.kt b/wallet/src/de/schildbach/wallet/ui/dashpay/utils/GoogleDriveService.kt
index 0f22f6fd5..ad1266ced 100644
--- a/wallet/src/de/schildbach/wallet/ui/dashpay/utils/GoogleDriveService.kt
+++ b/wallet/src/de/schildbach/wallet/ui/dashpay/utils/GoogleDriveService.kt
@@ -116,7 +116,7 @@ object GoogleDriveService {
 
     fun getSigninAccount(context: Context?): GoogleSignInAccount? {
         val opts = getGoogleSigninOptions()
-        val account = GoogleSignIn.getLastSignedInAccount(context)
+        val account = GoogleSignIn.getLastSignedInAccount(context!!)
         val permissions = arrayOf(Scope(DriveScopes.DRIVE_FILE))
         return if (GoogleSignIn.hasPermissions(account, *permissions)) {
             account
diff --git a/wallet/src/de/schildbach/wallet/ui/onboarding/SelectSecurityLevelActivity.kt b/wallet/src/de/schildbach/wallet/ui/onboarding/SelectSecurityLevelActivity.kt
new file mode 100644
index 000000000..295494ec5
--- /dev/null
+++ b/wallet/src/de/schildbach/wallet/ui/onboarding/SelectSecurityLevelActivity.kt
@@ -0,0 +1,52 @@
+package de.schildbach.wallet.ui.onboarding
+
+import android.content.Intent
+import android.os.Bundle
+import de.schildbach.wallet_test.databinding.ActivityPhrasewordcountBinding
+import org.dash.wallet.common.SecureActivity
+
+class SelectSecurityLevelActivity : SecureActivity() {
+    private lateinit var binding: ActivityPhrasewordcountBinding
+    private var selectedWordCount: Int = 12
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = ActivityPhrasewordcountBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        binding.titleBar.setOnClickListener {
+            setResult(RESULT_CANCELED)
+            finish()
+        }
+
+        binding.twelveWordsOption.setOnClickListener {
+            setMode(12)
+        }
+
+        binding.twentyFourWordsOption.setOnClickListener {
+            setMode(24)
+        }
+
+        binding.continueBtn.setOnClickListener {
+            setResult(RESULT_OK, Intent().apply { putExtra(EXTRA_WORD_COUNT, selectedWordCount) })
+            finish()
+        }
+        setMode(12)
+    }
+
+    private fun setMode(wordCount: Int) {
+        if (wordCount == 12) {
+            binding.twelveWordsOption.isSelected = true
+            binding.twentyFourWordsOption.isSelected = false
+            selectedWordCount = 12
+        } else {
+            binding.twelveWordsOption.isSelected = false
+            binding.twentyFourWordsOption.isSelected = true
+            selectedWordCount = 24
+        }
+    }
+
+    companion object {
+        const val EXTRA_WORD_COUNT = "extra_word_count"
+    }
+}
\ No newline at end of file
diff --git a/wallet/src/de/schildbach/wallet/util/MnemonicCodeExt.kt b/wallet/src/de/schildbach/wallet/util/MnemonicCodeExt.kt
index d654af69d..89c56287d 100644
--- a/wallet/src/de/schildbach/wallet/util/MnemonicCodeExt.kt
+++ b/wallet/src/de/schildbach/wallet/util/MnemonicCodeExt.kt
@@ -60,8 +60,8 @@ class MnemonicCodeExt(wordstream: InputStream, wordListDigest: String?) : Mnemon
 
     @Throws(MnemonicException::class)
     fun check(context: Context, words: List<String>) {
-        if (words.size != 12) {
-            throw MnemonicException.MnemonicLengthException("Word list size must be 12")
+        if (words.size != 12 && words.size != 24) {
+            throw MnemonicException.MnemonicLengthException("Word list size must be 12 or 24")
         }
         try {
             check(words)

From a33291a41cfc66a93b984e5c72c6fd4cd53582d7 Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Mon, 10 Feb 2025 07:52:26 -0800
Subject: [PATCH 2/2] chore: move strings to strings-extra.xml

---
 wallet/res/values/strings-extra.xml | 2 ++
 wallet/res/values/strings.xml       | 3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/wallet/res/values/strings-extra.xml b/wallet/res/values/strings-extra.xml
index 6b2d26149..14ded7180 100644
--- a/wallet/res/values/strings-extra.xml
+++ b/wallet/res/values/strings-extra.xml
@@ -476,5 +476,7 @@
     <string name="select_security_level_title">Select Security Level</string>
     <string name="select_security_level_message">You can secure your wallet with a 12 or 24 word recovery phrase.</string>
     <string name="select_security_level_12_words_title">Secure</string>
+    <string name="select_security_level_12_words_message">12 word recovery phrase</string>
+    <string name="select_security_level_24_words_title">Very secure</string>
     <string name="select_security_level_24_words_message">24 word recovery phrase</string>
 </resources>
\ No newline at end of file
diff --git a/wallet/res/values/strings.xml b/wallet/res/values/strings.xml
index b09196806..51afb61b8 100644
--- a/wallet/res/values/strings.xml
+++ b/wallet/res/values/strings.xml
@@ -417,7 +417,4 @@
     <string name="battery_optimization_dialog_message_not_optimized">This app is configured to continue running after not being visible for some time.\n\nWe suggest allowing this app to always stay up-to-date with the blockchain, even in the background.\n\nDon\'t worry, we will always mind your battery usage.</string>
     <string name="battery_optimization_dialog_button_change">Open Settings</string>
     <string name="credits_profile_change_message">Update profile information</string>
-    <string name="select_security_level_12_words_message">12 word recovery phrase</string>
-    <string name="select_security_level_24_words_title">Very secure</string>
-
 </resources>