All mnemonics

app/src/main/java/com/ravenwallet/presenter/activities/InputWordsActivity.java

@@ -378,7 +378,8 @@ public void onFocusChange(View v, boolean hasFocus) {
 
     private void validateWord(EditText view) {
         String word = view.getText().toString();
-        boolean valid = SmartValidator.isWordValid(this, word);
+        //TODO: Validate against a known loaded wordlist instead of all lists every time?
+        boolean valid = SmartValidator.isPhraseWordValid(this, word);
         view.setTextColor(getColor(valid ? R.color.light_gray : R.color.red_text));
         if (!valid)
             SpringAnimator.failShakeAnimation(this, view);

app/src/main/java/com/ravenwallet/presenter/activities/PaperKeyActivity.java

@@ -22,6 +22,7 @@
 import com.ravenwallet.tools.animation.BRDialog;
 import com.ravenwallet.tools.manager.BRReportsManager;
 import com.ravenwallet.tools.security.PostAuth;
+import com.ravenwallet.tools.util.Bip39Wordlist;
 import com.ravenwallet.tools.util.Utils;
 
 import java.util.Locale;
@@ -96,7 +97,13 @@ public void onClick(View v) {
 
             }
         });
+
         String cleanPhrase = getIntent().getExtras() == null ? null : getIntent().getStringExtra("phrase");
+
+        if(!Bip39Wordlist.isValidPhrase(PaperKeyActivity.this, cleanPhrase)) {
+            BRReportsManager.reportBug(new IllegalArgumentException("Paper key phrase is invalid"), true);
+        }
+
         wordMap = new SparseArray<>();
 
         if (Utils.isNullOrEmpty(cleanPhrase)) {

app/src/main/java/com/ravenwallet/presenter/activities/PaperKeyProveActivity.java

@@ -33,7 +33,7 @@
 import com.ravenwallet.tools.manager.BRReportsManager;
 import com.ravenwallet.tools.manager.BRSharedPrefs;
 import com.ravenwallet.tools.security.SmartValidator;
-import com.ravenwallet.tools.util.Bip39Reader;
+import com.ravenwallet.tools.util.Bip39Wordlist;
 import com.ravenwallet.tools.util.Utils;
 
 import java.util.Locale;
@@ -226,11 +226,13 @@ private void randomWordsSetUp(String[] words) {
 
     private boolean isWordCorrect(boolean first) {
         if (first) {
-            String edit = Bip39Reader.cleanWord(wordEditFirst.getText().toString());
-            return SmartValidator.isWordValid(PaperKeyProveActivity.this, edit) && edit.equalsIgnoreCase(sparseArrayWords.get(sparseArrayWords.keyAt(0)));
+            String firstWordClean = Bip39Wordlist.cleanWord(wordEditFirst.getText().toString());
+            return SmartValidator.isPhraseWordValid(PaperKeyProveActivity.this, firstWordClean) &&
+                    firstWordClean.equalsIgnoreCase(sparseArrayWords.get(sparseArrayWords.keyAt(0)));
         } else {
-            String edit = Bip39Reader.cleanWord(wordEditSecond.getText().toString());
-            return SmartValidator.isWordValid(PaperKeyProveActivity.this, edit) && edit.equalsIgnoreCase(sparseArrayWords.get(sparseArrayWords.keyAt(1)));
+            String secondWordClean = Bip39Wordlist.cleanWord(wordEditSecond.getText().toString());
+            return SmartValidator.isPhraseWordValid(PaperKeyProveActivity.this, secondWordClean) &&
+                    secondWordClean.equalsIgnoreCase(sparseArrayWords.get(sparseArrayWords.keyAt(1)));
         }
     }
 
@@ -248,7 +250,7 @@ private boolean isWordCorrect(boolean first) {
 
     private void validateWord(EditText view) {
         String word = view.getText().toString();
-        boolean valid = SmartValidator.isWordValid(this, word);
+        boolean valid = SmartValidator.isPhraseWordValid(this, word);
         view.setTextColor(getColor(valid ? R.color.light_gray : R.color.red_text));
 //        if (!valid)
 //            SpringAnimator.failShakeAnimation(this, view);

app/src/main/java/com/ravenwallet/presenter/activities/intro/WriteDownActivity.java

@@ -2,25 +2,49 @@
 
 import android.annotation.TargetApi;
 import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
+import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.ImageButton;
+import android.widget.ImageView;
+import android.widget.ListView;
+import android.widget.TextView;
 
 import com.ravenwallet.R;
 import com.ravenwallet.presenter.activities.HomeActivity;
 import com.ravenwallet.presenter.activities.util.BRActivity;
+import com.ravenwallet.presenter.entities.BRSettingsItem;
+import com.ravenwallet.presenter.entities.IPFSGateway;
 import com.ravenwallet.presenter.interfaces.BRAuthCompletion;
 import com.ravenwallet.tools.animation.BRAnimator;
+import com.ravenwallet.tools.manager.BRSharedPrefs;
+import com.ravenwallet.tools.manager.FontManager;
 import com.ravenwallet.tools.security.AuthManager;
 import com.ravenwallet.tools.security.PostAuth;
 import com.ravenwallet.tools.util.BRConstants;
+import com.ravenwallet.tools.util.Bip39Wordlist;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import static com.ravenwallet.R.layout.settings_list_item;
+import static com.ravenwallet.R.layout.settings_list_section;
 
 public class WriteDownActivity extends BRActivity {
     private static final String TAG = WriteDownActivity.class.getName();
@@ -54,6 +78,7 @@ public void onClick(View v) {
                 BRAnimator.showSupportFragment(app, BRConstants.paperKey);
             }
         });
+
         writeButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {

app/src/main/java/com/ravenwallet/tools/security/PostAuth.java

@@ -24,6 +24,7 @@
 import com.ravenwallet.tools.sqlite.CurrencyDataSource;
 import com.ravenwallet.tools.threads.executor.BRExecutor;
 import com.ravenwallet.tools.util.BRConstants;
+import com.ravenwallet.tools.util.Bip39Wordlist;
 import com.ravenwallet.tools.util.Utils;
 import com.ravenwallet.wallet.WalletsMaster;
 import com.ravenwallet.wallet.abstracts.BaseWalletManager;
@@ -140,7 +141,7 @@ public void onRecoverWalletAuth(Activity app, boolean authAsked) {
             } else {
                 if (phraseForKeyStore.length() != 0) {
                     BRSharedPrefs.putPhraseWroteDown(app, true);
-                    byte[] seed = BRCoreKey.getSeedFromPhrase(phraseForKeyStore.getBytes());
+                    byte[] phraseKey = BRCoreKey.getDerivedPhraseKey(phraseForKeyStore.getBytes());
 //                    byte[] authKey = BRCoreKey.getAuthPrivKeyForAPI(seed);
 //                    BRKeyStore.putAuthKey(authKey, app);
                     BRCoreMasterPubKey mpk = new BRCoreMasterPubKey(phraseForKeyStore.getBytes(), true);

app/src/main/java/com/ravenwallet/tools/security/SmartValidator.java

@@ -7,7 +7,7 @@
 import com.ravenwallet.core.BRCoreMasterPubKey;
 import com.ravenwallet.tools.manager.BRReportsManager;
 import com.ravenwallet.tools.manager.BRSharedPrefs;
-import com.ravenwallet.tools.util.Bip39Reader;
+import com.ravenwallet.tools.util.Bip39Wordlist;
 
 import java.text.Normalizer;
 import java.util.Arrays;
@@ -43,31 +43,21 @@ public class SmartValidator {
     private static final String TAG = SmartValidator.class.getName();
     private static List<String> list;
 
-    public static boolean isPaperKeyValid(Context ctx, String paperKey) {
-        String languageCode = Locale.getDefault().getLanguage();
-        if (!isValid(ctx, paperKey, languageCode)) {
-            //try all langs
-            for (String lang : Bip39Reader.LANGS) {
-                if (isValid(ctx, paperKey, lang)) {
-                    return true;
-                }
-            }
-        } else {
-            return true;
-        }
-
-        return false;
+    public static boolean isPhraseWordValid(Context ctx, String phraseWord) {
+        return Bip39Wordlist.isValidWord(ctx, phraseWord);
+    }
 
+    public static boolean isPaperKeyValid(Context ctx, String paperKey) {
+        return isPaperKeyValid(ctx, paperKey, Locale.getDefault().getLanguage());
     }
 
-    private static boolean isValid(Context ctx, String paperKey, String lang) {
-        List<String> list = Bip39Reader.bip39List(ctx, lang);
-        String[] words = list.toArray(new String[list.size()]);
-        if (words.length % Bip39Reader.WORD_LIST_SIZE != 0) {
-            Log.e(TAG, "isPaperKeyValid: " + "The list size should divide by " + Bip39Reader.WORD_LIST_SIZE);
-            BRReportsManager.reportBug(new IllegalArgumentException("words.length is not dividable by " + Bip39Reader.WORD_LIST_SIZE), true);
+    private static boolean isPaperKeyValid(Context ctx, String paperKey, String lang) {
+        Bip39Wordlist wordList = Bip39Wordlist.getWordlistForLanguage(lang);
+        if(wordList == null) {
+            Log.e(TAG, "No wordlist found for language: '" + lang + "'");
+            BRReportsManager.reportBug(new IllegalArgumentException("No wordlist found for language: '" + lang + "'"), true);
         }
-        return BRCoreMasterPubKey.validateRecoveryPhrase(words, paperKey);
+        return wordList.checkPhrase(ctx, paperKey);
     }
 
     public static boolean isPaperKeyCorrect(String insertedPhrase, Context activity) {
@@ -100,13 +90,4 @@ public static boolean checkFirstAddress(Activity app, byte[] mpk) {
     public static String cleanPaperKey(Context activity, String phraseToCheck) {
         return Normalizer.normalize(phraseToCheck.replace("　", " ").replace("\n", " ").trim().replaceAll(" +", " "), Normalizer.Form.NFKD);
     }
-
-    public static boolean isWordValid(Context ctx, String word) {
-        Log.e(TAG, "isWordValid: word:" + word + ":" + word.length());
-        if (list == null) list = Bip39Reader.bip39List(ctx, null);
-        String cleanWord = Bip39Reader.cleanWord(word);
-        Log.e(TAG, "isWordValid: cleanWord:" + cleanWord + ":" + cleanWord.length());
-        return list.contains(cleanWord);
-
-    }
 }