LBRYCommunity/lbry-react-native
1
0
Fork 0
Code Issues Pull requests 12 Projects Releases Packages Wiki Activity

do not call wallet_encrypt with blank password #60

Merged
akinwale merged 1 commit from blank-password-encrypt into master 2019-10-20 20:31:16 +02:00
Conversation 0 Commits 1 Files changed 2 +18 -5
2 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/page/firstRun/view.js
View file

@ -300,12 +300,19 @@ class FirstRunScreen extends React.PureComponent {
if (NativeModules.UtilityModule) { if (NativeModules.UtilityModule) {
const newPassword = this.state.walletPassword ? this.state.walletPassword : ''; const newPassword = this.state.walletPassword ? this.state.walletPassword : '';
NativeModules.UtilityModule.setSecureValue(Constants.KEY_WALLET_PASSWORD, newPassword); NativeModules.UtilityModule.setSecureValue(Constants.KEY_WALLET_PASSWORD, newPassword);
Lbry.wallet_encrypt({ new_password: newPassword }).then(() => { if (newPassword.trim().length === 0) {
// fresh account, new password set // blank password. Do not encrypt
getSync(newPassword); getSync(newPassword);
setClientSetting(Constants.SETTING_DEVICE_WALLET_SYNCED, true); setClientSetting(Constants.SETTING_DEVICE_WALLET_SYNCED, true);
this.closeFinalPage(); this.closeFinalPage();
}); } else {
Lbry.wallet_encrypt({ new_password: newPassword }).then(() => {
// fresh account, new password set
getSync(newPassword);
setClientSetting(Constants.SETTING_DEVICE_WALLET_SYNCED, true);
this.closeFinalPage();
});
}
} }
}; };

10
src/page/verification/internal/sync-verify-page.js
View file

@ -37,11 +37,17 @@ class SyncVerifyPage extends React.PureComponent {
if (!hasSyncedWallet) { if (!hasSyncedWallet) {
// fresh account with no sync // fresh account with no sync
const newPassword = this.state.password ? this.state.password : ''; const newPassword = this.state.password ? this.state.password : '';
Lbry.wallet_encrypt({ new_password: newPassword }).then(() => { if (newPassword.trim().length === 0) {
getSync(newPassword); getSync(newPassword);
setClientSetting(Constants.SETTING_DEVICE_WALLET_SYNCED, true); setClientSetting(Constants.SETTING_DEVICE_WALLET_SYNCED, true);
navigation.goBack(); navigation.goBack();
}); } else {
Lbry.wallet_encrypt({ new_password: newPassword }).then(() => {
getSync(newPassword);
setClientSetting(Constants.SETTING_DEVICE_WALLET_SYNCED, true);
navigation.goBack();
});
}
} else { } else {
syncApply(syncHash, syncData, this.state.password ? this.state.password : ''); syncApply(syncHash, syncData, this.state.password ? this.state.password : '');
} }