rottenwheel/mysu_anon
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/mysu.git synced 2024-11-25 17:02:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Handle wallet creation differently in preparation for seed offset support

Browse source
This commit is contained in:
pokkst 2022-11-04 23:25:59 -05:00
parent 08b3f23b66
commit 39bb06c833
No known key found for this signature in database
GPG key ID: 90C2ED85E67A50FF
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -28,8 +28,10 @@ import net.mynero.wallet.model.Wallet;
import net.mynero.wallet.model.WalletManager; import net.mynero.wallet.model.WalletManager;
import net.mynero.wallet.service.PrefService; import net.mynero.wallet.service.PrefService;
import net.mynero.wallet.util.Constants; import net.mynero.wallet.util.Constants;
import net.mynero.wallet.util.RestoreHeight;
import java.io.File; import java.io.File;
import java.util.Calendar;
public class OnboardingFragment extends Fragment { public class OnboardingFragment extends Fragment {
@ -172,7 +174,8 @@ public class OnboardingFragment extends Fragment {
File walletFile = new File(mainActivity.getApplicationInfo().dataDir, Constants.WALLET_NAME); File walletFile = new File(mainActivity.getApplicationInfo().dataDir, Constants.WALLET_NAME);
Wallet wallet = null; Wallet wallet = null;
if (walletSeed.isEmpty()) { if (walletSeed.isEmpty()) {
wallet = WalletManager.getInstance().createWallet(walletFile, walletPassword, Constants.MNEMONIC_LANGUAGE, restoreHeight); Wallet tmpWallet = createTempWallet(mainActivity.getApplicationInfo().dataDir); //we do this to get seed, then recover wallet so we can use seed offset
wallet = WalletManager.getInstance().recoveryWallet(walletFile, walletPassword, tmpWallet.getSeed(""), "", getNewRestoreHeight());
} else { } else {
if (!checkMnemonic(walletSeed)) { if (!checkMnemonic(walletSeed)) {
Toast.makeText(mainActivity, getString(R.string.invalid_mnemonic_code), Toast.LENGTH_SHORT).show(); Toast.makeText(mainActivity, getString(R.string.invalid_mnemonic_code), Toast.LENGTH_SHORT).show();
@ -217,6 +220,17 @@ public class OnboardingFragment extends Fragment {
} }
} }
private long getNewRestoreHeight() {
Calendar restoreDate = Calendar.getInstance();
restoreDate.add(Calendar.DAY_OF_MONTH, 0);
return RestoreHeight.getInstance().getHeight(restoreDate.getTime());
}
private Wallet createTempWallet(String dir) {
File tmpWalletFile = new File(dir, Constants.WALLET_NAME + "_tmp");
return WalletManager.getInstance().createWallet(tmpWalletFile, "", Constants.MNEMONIC_LANGUAGE, 0);
}
private boolean checkMnemonic(String seed) { private boolean checkMnemonic(String seed) {
return (seed.split("\\s").length == 25); return (seed.split("\\s").length == 25);
} }