feat: add support for 24 word recovery phrases #1346
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -56,9 +56,9 @@ class OnboardingViewModel @Inject constructor( | |||||||||||||||||||
| internal val finishUnecryptedWalletUpgradeAction = SingleLiveEvent<Unit>() | ||||||||||||||||||||
| internal val startActivityAction = SingleLiveEvent<Intent>() | ||||||||||||||||||||
|
|
||||||||||||||||||||
| fun createNewWallet(onboardingInvite: InvitationLinkData?, seedWordCount: Int) { | ||||||||||||||||||||
| walletApplication.initEnvironmentIfNeeded() | ||||||||||||||||||||
| val wallet = walletFactory.create(Constants.NETWORK_PARAMETERS, seedWordCount) | ||||||||||||||||||||
|
Comment on lines
+59
to
+61
There was a problem hiding this comment. 🛠️ Refactor suggestion Validate seedWordCount parameter. Add validation to ensure only supported word counts (12 or 24) are accepted. fun createNewWallet(onboardingInvite: InvitationLinkData?, seedWordCount: Int) {
+ require(seedWordCount == 12 || seedWordCount == 24) { "Unsupported word count: $seedWordCount" }
walletApplication.initEnvironmentIfNeeded()
val wallet = walletFactory.create(Constants.NETWORK_PARAMETERS, seedWordCount)📝 Committable suggestion
Suggested change
|
||||||||||||||||||||
| log.info("successfully created new wallet") | ||||||||||||||||||||
| walletApplication.setWallet(wallet) | ||||||||||||||||||||
| configuration.armBackupSeedReminder() | ||||||||||||||||||||
|
|
||||||||||||||||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -116,7 +116,7 @@ object GoogleDriveService { | |||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||
| fun getSigninAccount(context: Context?): GoogleSignInAccount? { | ||||||||||||||||||||||||||||
| val opts = getGoogleSigninOptions() | ||||||||||||||||||||||||||||
| val account = GoogleSignIn.getLastSignedInAccount(context!!) | ||||||||||||||||||||||||||||
|
Comment on lines
117
to
+119
There was a problem hiding this comment. Replace non-null assertion with safe null handling. Using fun getSigninAccount(context: Context?): GoogleSignInAccount? {
val opts = getGoogleSigninOptions()
- val account = GoogleSignIn.getLastSignedInAccount(context!!)
+ if (context == null) {
+ log.warn("getSigninAccount called with null context")
+ return null
+ }
+ val account = GoogleSignIn.getLastSignedInAccount(context)📝 Committable suggestion
Suggested change
|
||||||||||||||||||||||||||||
| val permissions = arrayOf(Scope(DriveScopes.DRIVE_FILE)) | ||||||||||||||||||||||||||||
| return if (GoogleSignIn.hasPermissions(account, *permissions)) { | ||||||||||||||||||||||||||||
| account | ||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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 && words.size != 24) { | ||
| throw MnemonicException.MnemonicLengthException("Word list size must be 12 or 24") | ||
| } | ||
| try { | ||
| check(words) | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🛠️ Refactor suggestion
Add content descriptions for accessibility.
Both option containers need content descriptions to improve accessibility for screen readers.
<androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/twelve_words_option" + android:contentDescription="@string/select_security_level_12_words_title" ...> <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/twenty_four_words_option" + android:contentDescription="@string/select_security_level_24_words_title" ...>Also applies to: 74-104