From d538db83179ef55a176f3539edfb0ae1fd34a37f Mon Sep 17 00:00:00 2001 From: fuwa Date: Thu, 3 Jan 2019 06:46:27 +0000 Subject: [PATCH] fix leading white spaces in seed --- .../java/com/wownero/wownerujo/GenerateFragment.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/wownero/wownerujo/GenerateFragment.java b/app/src/main/java/com/wownero/wownerujo/GenerateFragment.java index cd733b2..7892273 100644 --- a/app/src/main/java/com/wownero/wownerujo/GenerateFragment.java +++ b/app/src/main/java/com/wownero/wownerujo/GenerateFragment.java @@ -76,6 +76,10 @@ public class GenerateFragment extends Fragment { private String type = null; + private static String[] tokenizeSeed(String seed) { + return seed.trim().split("\\s+"); + } + @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { @@ -417,9 +421,11 @@ public class GenerateFragment extends Fragment { return height; } + + private boolean checkMnemonic() { String seed = etWalletMnemonic.getEditText().getText().toString(); - boolean ok = (seed.split("\\s+").length == 25); // 25 words + boolean ok = (tokenizeSeed(seed).length == 25); // 25 words if (!ok) { etWalletMnemonic.setError(getString(R.string.generate_check_mnemonic)); } else { @@ -484,7 +490,7 @@ public class GenerateFragment extends Fragment { } else if (type.equals(TYPE_SEED)) { if (!checkMnemonic()) return; String seed = etWalletMnemonic.getEditText().getText().toString(); - seed = TextUtils.join(" ", seed.split("\\s+")); + seed = TextUtils.join(" ", tokenizeSeed(seed)); bGenerate.setEnabled(false); if (fingerprintAuthAllowed) { KeyStoreHelper.saveWalletUserPass(getActivity(), name, password);