Mirrors
/
xmrwallet
mirror of https://github.com/m2049r/xmrwallet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

allow back only if not accepting (#54)

This commit is contained in:
m2049r 2017-09-10 10:40:13 +02:00 committed by GitHub
parent eb2b3b5675
commit 924c3fa260
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/com/m2049r/xmrwallet/GenerateReviewFragment.java
View File

@ -79,12 +79,14 @@ public class GenerateReviewFragment extends Fragment {
Bundle args = getArguments(); Bundle args = getArguments();
String path = args.getString("path"); String path = args.getString("path");
String password = args.getString("password"); String password = args.getString("password");
String type = args.getString("type"); this.type = args.getString("type");
new AsyncShow().executeOnExecutor(MoneroThreadPoolExecutor.MONERO_THREAD_POOL_EXECUTOR, new AsyncShow().executeOnExecutor(MoneroThreadPoolExecutor.MONERO_THREAD_POOL_EXECUTOR,
path, password, type); path, password);
return view; return view;
} }
String type;
private void acceptWallet() { private void acceptWallet() {
String name = tvWalletName.getText().toString(); String name = tvWalletName.getText().toString();
String password = tvWalletPassword.getText().toString(); String password = tvWalletPassword.getText().toString();
@ -93,7 +95,6 @@ public class GenerateReviewFragment extends Fragment {
} }
private class AsyncShow extends AsyncTask<String, Void, Boolean> { private class AsyncShow extends AsyncTask<String, Void, Boolean> {
String type;
String password; String password;
String name; String name;
@ -106,10 +107,9 @@ public class GenerateReviewFragment extends Fragment {
@Override @Override
protected Boolean doInBackground(String... params) { protected Boolean doInBackground(String... params) {
if (params.length != 3) return false; if (params.length != 2) return false;
String walletPath = params[0]; String walletPath = params[0];
password = params[1]; password = params[1];
type = params[2];
Wallet wallet; Wallet wallet;
boolean closeWallet; boolean closeWallet;
@ -195,4 +195,8 @@ public class GenerateReviewFragment extends Fragment {
public void hideProgress() { public void hideProgress() {
pbProgress.setVisibility(View.INVISIBLE); pbProgress.setVisibility(View.INVISIBLE);
} }
boolean backOk() {
return !type.equals(GenerateReviewFragment.VIEW_TYPE_ACCEPT);
}
} }

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

@ -905,4 +905,16 @@ public class LoginActivity extends AppCompatActivity
outChannel.close(); outChannel.close();
} }
} }
@Override
public void onBackPressed() {
Fragment f = getSupportFragmentManager().findFragmentById(R.id.fragment_container);
if (f instanceof GenerateReviewFragment) {
if (((GenerateReviewFragment) f).backOk()) {
super.onBackPressed();
}
} else {
super.onBackPressed();
}
}
} }