rottenwheel/mysu
1
0
Fork 0
mirror of https://codeberg.org/r4v3r23/mysu.git synced 2024-11-10 05:03:44 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix offset issue with new wallets, create 0.4.0.1

Browse Source
This commit is contained in:
pokkst 2022-12-04 12:48:31 -06:00
parent 82ed0f4409
commit 36be2a6613
No known key found for this signature in database
GPG Key ID: 90C2ED85E67A50FF
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -9,8 +9,8 @@ android {
applicationId "net.mynero.wallet"
minSdkVersion 21
targetSdkVersion 33
versionCode 400
versionName "0.4.0 'Fluorine Fermi'"
versionCode 40001
versionName "0.4.0.1 'Fluorine Fermi'"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
externalNativeBuild {
cmake {

7
app/src/main/java/net/mynero/wallet/fragment/onboarding/OnboardingFragment.java
View File

@ -225,6 +225,10 @@ public class OnboardingFragment extends Fragment {
long restoreHeight = getNewRestoreHeight();
File walletFile = new File(mainActivity.getApplicationInfo().dataDir, Constants.WALLET_NAME);
Wallet wallet = null;
if(!offset.isEmpty()) {
PrefService.getInstance().edit().putBoolean(Constants.PREF_USES_OFFSET, true).apply();
}
if (walletSeed.isEmpty()) {
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(""), offset, restoreHeight);
@ -236,9 +240,6 @@ public class OnboardingFragment extends Fragment {
if (!restoreHeightText.isEmpty()) {
restoreHeight = Long.parseLong(restoreHeightText);
}
if(!offset.isEmpty()) {
PrefService.getInstance().edit().putBoolean(Constants.PREF_USES_OFFSET, true).apply();
}
wallet = WalletManager.getInstance().recoveryWallet(walletFile, walletPassword, walletSeed, offset, restoreHeight);
}
Wallet.Status walletStatus = wallet.getStatus();