Mirrors
/
wowwallet
mirror of https://gitlab.com/monerujo-io/wowwallet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Generate Wallet command added to wallet list

This commit is contained in:
m2049r 2017-08-16 00:28:53 +02:00
parent 34941c599a
commit 142885821e
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/m2049r/xmrwallet/GenerateFragment.java
View File

@ -95,6 +95,7 @@ public class GenerateFragment extends Fragment {
bGenerate.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
// TODO make keyboard go away
generateWallet();
}
});
@ -105,6 +106,7 @@ public class GenerateFragment extends Fragment {
acceptWallet();
}
});
bAccept.setEnabled(false);
return view;
@ -116,6 +118,7 @@ public class GenerateFragment extends Fragment {
File walletFile = new File(activityCallback.getStorageRoot(), name + ".keys");
if (walletFile.exists()) {
Toast.makeText(getActivity(), getString(R.string.generate_wallet_exists), Toast.LENGTH_LONG).show();
etWalletName.requestFocus();
return;
}
String password = etWalletPassword.getText().toString();

3
app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java
View File

@ -67,7 +67,8 @@ public class LoginActivity extends Activity
// adapted from http://www.mkyong.com/android/android-prompt-user-input-dialog-example/
@Override
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();
} else {
promptPassword(wallet);

16
app/src/main/java/com/m2049r/xmrwallet/LoginFragment.java
View File

@ -53,7 +53,8 @@ import java.util.TreeSet;
public class LoginFragment extends Fragment {
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;
@ -159,16 +160,18 @@ public class LoginFragment extends Fragment {
}
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)) {
Toast.makeText(getActivity(), getString(R.string.panic), Toast.LENGTH_LONG).show();
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())) {
Toast.makeText(getActivity(), getString(R.string.warn_daemon_unavailable), Toast.LENGTH_LONG).show();
return;
@ -192,6 +195,7 @@ public class LoginFragment extends Fragment {
Log.d(TAG, "filtering " + s);
if (x.indexOf(s.charAt(1)) >= 0) displayedList.add(s);
}
displayedList.add(WALLETNAME_PREAMBLE + getString(R.string.generate_title));
}
private void loadList() {

2
app/src/main/res/values/strings.xml
View File

@ -18,7 +18,7 @@
<string name="bad_password">Bad password!</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="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="title_amount">Amount</string>