rottenwheel/mysu
1
0
Fork 0
mirror of https://codeberg.org/r4v3r23/mysu.git synced 2024-11-09 15:50:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

prevents seed from being copied in dialog, and makes wallet restore/creation async

Browse source
This commit is contained in:
pokkst 2022-10-01 22:07:12 -05:00
parent 8c112f60f1
commit b1f8552628
No known key found for this signature in database
GPG key ID: 90C2ED85E67A50FF
2 changed files with 40 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
app/src/main/java/net/mynero/wallet/fragment/onboarding/OnboardingFragment.java
View file

@ -1,5 +1,6 @@
package net.mynero.wallet.fragment.onboarding;
import android.os.AsyncTask;
import android.os.Bundle;
import android.text.Editable;
import android.text.TextWatcher;
@ -54,34 +55,13 @@ public class OnboardingFragment extends Fragment {
moreOptionsChevronImageView.setOnClickListener(view12 -> mViewModel.onMoreOptionsClicked());
createWalletButton.setOnClickListener(view1 -> {
String walletPassword = walletPasswordEditText.getText().toString();
if (!walletPassword.isEmpty()) {
PrefService.getInstance().edit().putBoolean(Constants.PREF_USES_PASSWORD, true).apply();
}
String walletSeed = walletSeedEditText.getText().toString().trim();
String restoreHeightText = walletRestoreHeightEditText.getText().toString().trim();
long restoreHeight = -1;
File walletFile = new File(getActivity().getApplicationInfo().dataDir, Constants.WALLET_NAME);
Wallet wallet = null;
if (walletSeed.isEmpty()) {
wallet = WalletManager.getInstance().createWallet(walletFile, walletPassword, Constants.MNEMONIC_LANGUAGE, restoreHeight);
} else {
if (!checkMnemonic(walletSeed)) {
Toast.makeText(getContext(), getString(R.string.invalid_mnemonic_code), Toast.LENGTH_SHORT).show();
return;
}
if (!restoreHeightText.isEmpty()) {
restoreHeight = Long.parseLong(restoreHeightText);
}
wallet = WalletManager.getInstance().recoveryWallet(walletFile, walletPassword, walletSeed, "", restoreHeight);
}
boolean ok = wallet.getStatus().isOk();
walletFile.delete(); // cache is broken for some reason when recovering wallets. delete the file here. this happens in monerujo too.
if (ok) {
((MainActivity) getActivity()).init(walletFile, walletPassword);
getActivity().onBackPressed();
}
AsyncTask.execute(() -> {
createOrImportWallet(
walletPasswordEditText.getText().toString(),
walletSeedEditText.getText().toString().trim(),
walletRestoreHeightEditText.getText().toString().trim()
);
});
});
walletSeedEditText.addTextChangedListener(new TextWatcher() {
@Override
@ -116,6 +96,37 @@ public class OnboardingFragment extends Fragment {
});
}
private void createOrImportWallet(String walletPassword, String walletSeed, String restoreHeightText) {
MainActivity mainActivity = (MainActivity) getActivity();
if(mainActivity != null) {
if (!walletPassword.isEmpty()) {
PrefService.getInstance().edit().putBoolean(Constants.PREF_USES_PASSWORD, true).apply();
}
long restoreHeight = -1;
File walletFile = new File(mainActivity.getApplicationInfo().dataDir, Constants.WALLET_NAME);
Wallet wallet = null;
if (walletSeed.isEmpty()) {
wallet = WalletManager.getInstance().createWallet(walletFile, walletPassword, Constants.MNEMONIC_LANGUAGE, restoreHeight);
} else {
if (!checkMnemonic(walletSeed)) {
Toast.makeText(getContext(), getString(R.string.invalid_mnemonic_code), Toast.LENGTH_SHORT).show();
return;
}
if (!restoreHeightText.isEmpty()) {
restoreHeight = Long.parseLong(restoreHeightText);
}
wallet = WalletManager.getInstance().recoveryWallet(walletFile, walletPassword, walletSeed, "", restoreHeight);
}
boolean ok = wallet.getStatus().isOk();
walletFile.delete(); // cache is broken for some reason when recovering wallets. delete the file here. this happens in monerujo too.
if (ok) {
mainActivity.init(walletFile, walletPassword);
mainActivity.runOnUiThread(mainActivity::onBackPressed);
}
}
}
private boolean checkMnemonic(String seed) {
return (seed.split("\\s").length == 25);
}

2
app/src/main/java/net/mynero/wallet/fragment/settings/SettingsFragment.java
View file

@ -169,7 +169,7 @@ public class SettingsFragment extends Fragment implements PasswordBottomSheetDia
private void displaySeedDialog() {
InformationBottomSheetDialog informationDialog = new InformationBottomSheetDialog();
informationDialog.showCopyButton = true;
informationDialog.showCopyButton = false;
informationDialog.information = WalletManager.getInstance().getWallet().getSeed("");
informationDialog.show(getActivity().getSupportFragmentManager(), "information_seed_dialog");
}