Generate Wallet command added to wallet list
This commit is contained in:
parent
34941c599a
commit
142885821e
|
@ -95,6 +95,7 @@ public class GenerateFragment extends Fragment {
|
||||||
bGenerate.setOnClickListener(new View.OnClickListener() {
|
bGenerate.setOnClickListener(new View.OnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
|
// TODO make keyboard go away
|
||||||
generateWallet();
|
generateWallet();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
@ -105,6 +106,7 @@ public class GenerateFragment extends Fragment {
|
||||||
acceptWallet();
|
acceptWallet();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
bAccept.setEnabled(false);
|
bAccept.setEnabled(false);
|
||||||
|
|
||||||
return view;
|
return view;
|
||||||
|
@ -116,6 +118,7 @@ public class GenerateFragment extends Fragment {
|
||||||
File walletFile = new File(activityCallback.getStorageRoot(), name + ".keys");
|
File walletFile = new File(activityCallback.getStorageRoot(), name + ".keys");
|
||||||
if (walletFile.exists()) {
|
if (walletFile.exists()) {
|
||||||
Toast.makeText(getActivity(), getString(R.string.generate_wallet_exists), Toast.LENGTH_LONG).show();
|
Toast.makeText(getActivity(), getString(R.string.generate_wallet_exists), Toast.LENGTH_LONG).show();
|
||||||
|
etWalletName.requestFocus();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
String password = etWalletPassword.getText().toString();
|
String password = etWalletPassword.getText().toString();
|
||||||
|
|
|
@ -67,7 +67,8 @@ public class LoginActivity extends Activity
|
||||||
// adapted from http://www.mkyong.com/android/android-prompt-user-input-dialog-example/
|
// adapted from http://www.mkyong.com/android/android-prompt-user-input-dialog-example/
|
||||||
@Override
|
@Override
|
||||||
public void onWalletSelected(final String wallet) {
|
public void onWalletSelected(final String wallet) {
|
||||||
if (wallet.toLowerCase().startsWith("test")) {
|
Log.d(TAG, "selected wallet is ." + wallet + ".");
|
||||||
|
if (wallet.equals(getString(R.string.generate_title))) {
|
||||||
startGenerateFragment();
|
startGenerateFragment();
|
||||||
} else {
|
} else {
|
||||||
promptPassword(wallet);
|
promptPassword(wallet);
|
||||||
|
|
|
@ -53,7 +53,8 @@ import java.util.TreeSet;
|
||||||
|
|
||||||
public class LoginFragment extends Fragment {
|
public class LoginFragment extends Fragment {
|
||||||
private static final String TAG = "LoginFragment";
|
private static final String TAG = "LoginFragment";
|
||||||
public static final int WALLETNAME_PREAMBLE_LENGTH = "[123456] ".length();
|
public static final String WALLETNAME_PREAMBLE = "[------] ";
|
||||||
|
public static final int WALLETNAME_PREAMBLE_LENGTH = WALLETNAME_PREAMBLE.length();
|
||||||
|
|
||||||
|
|
||||||
ListView listView;
|
ListView listView;
|
||||||
|
@ -159,16 +160,18 @@ public class LoginFragment extends Fragment {
|
||||||
}
|
}
|
||||||
|
|
||||||
String itemValue = (String) listView.getItemAtPosition(position);
|
String itemValue = (String) listView.getItemAtPosition(position);
|
||||||
String x = isMainNet() ? "4" : "9A";
|
|
||||||
if (x.indexOf(itemValue.charAt(1)) < 0) {
|
|
||||||
Toast.makeText(getActivity(), getString(R.string.prompt_wrong_net), Toast.LENGTH_LONG).show();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (itemValue.length() <= (WALLETNAME_PREAMBLE_LENGTH)) {
|
if (itemValue.length() <= (WALLETNAME_PREAMBLE_LENGTH)) {
|
||||||
Toast.makeText(getActivity(), getString(R.string.panic), Toast.LENGTH_LONG).show();
|
Toast.makeText(getActivity(), getString(R.string.panic), Toast.LENGTH_LONG).show();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
String x = isMainNet() ? "4-" : "9A-";
|
||||||
|
if (x.indexOf(itemValue.charAt(1)) < 0) {
|
||||||
|
Toast.makeText(getActivity(), getString(R.string.prompt_wrong_net), Toast.LENGTH_LONG).show();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (!checkAndSetWalletDaemon(getDaemon(), !isMainNet())) {
|
if (!checkAndSetWalletDaemon(getDaemon(), !isMainNet())) {
|
||||||
Toast.makeText(getActivity(), getString(R.string.warn_daemon_unavailable), Toast.LENGTH_LONG).show();
|
Toast.makeText(getActivity(), getString(R.string.warn_daemon_unavailable), Toast.LENGTH_LONG).show();
|
||||||
return;
|
return;
|
||||||
|
@ -192,6 +195,7 @@ public class LoginFragment extends Fragment {
|
||||||
Log.d(TAG, "filtering " + s);
|
Log.d(TAG, "filtering " + s);
|
||||||
if (x.indexOf(s.charAt(1)) >= 0) displayedList.add(s);
|
if (x.indexOf(s.charAt(1)) >= 0) displayedList.add(s);
|
||||||
}
|
}
|
||||||
|
displayedList.add(WALLETNAME_PREAMBLE + getString(R.string.generate_title));
|
||||||
}
|
}
|
||||||
|
|
||||||
private void loadList() {
|
private void loadList() {
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
<string name="bad_password">Bad password!</string>
|
<string name="bad_password">Bad password!</string>
|
||||||
<string name="prompt_daemon_missing">Daemon address must be set!</string>
|
<string name="prompt_daemon_missing">Daemon address must be set!</string>
|
||||||
<string name="prompt_wrong_net">Daemon type does not fit to wallet!</string>
|
<string name="prompt_wrong_net">Daemon type does not fit to wallet!</string>
|
||||||
<string name="warn_daemon_unavailable">Cannot connect to daemon!</string>
|
<string name="warn_daemon_unavailable">Cannot connect to daemon! Try again.</string>
|
||||||
<string name="panic">Something\'s wrong!</string>
|
<string name="panic">Something\'s wrong!</string>
|
||||||
|
|
||||||
<string name="title_amount">Amount</string>
|
<string name="title_amount">Amount</string>
|
||||||
|
|
Loading…
Reference in New Issue