Ecosystem/cake_wallet
1
0
Fork 0
mirror of https://github.com/cake-tech/cake_wallet.git synced 2024-12-22 19:49:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Linux: fixes for wallet rename (#1000)

Browse source 
* fix: missing MarketPlaceViewModel register

* fix: no auth route on wallet list _loadWallet

* fix: fixes for wallet rename with password flow

* fix: missing monero condition

* fix: navigator pop

* fix: going back case
This commit is contained in:
Rafael Saes 2023-07-14 17:28:01 -03:00 committed by GitHub
parent 62007975e1
commit 8a7ef39f19
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 200 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
cw_monero/lib/monero_wallet.dart
View file

@ -276,12 +276,44 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
}
Future<void> renameWalletFiles(String newWalletName) async {
final currentWalletDirPath = await pathForWalletDir(name: name, type: type);
try {
// -- rename the waller folder --
final currentWalletDir =
Directory(await pathForWalletDir(name: name, type: type));
final newWalletDirPath =
await pathForWalletDir(name: newWalletName, type: type);
await currentWalletDir.rename(newWalletDirPath);
// -- use new waller folder to rename files with old names still --
final renamedWalletPath = newWalletDirPath + '/$name';
final currentCacheFile = File(renamedWalletPath);
final currentKeysFile = File('$renamedWalletPath.keys');
final currentAddressListFile = File('$renamedWalletPath.address.txt');
final newWalletPath =
await pathForWallet(name: newWalletName, type: type);
if (currentCacheFile.existsSync()) {
await currentCacheFile.rename(newWalletPath);
}
if (currentKeysFile.existsSync()) {
await currentKeysFile.rename('$newWalletPath.keys');
}
if (currentAddressListFile.existsSync()) {
await currentAddressListFile.rename('$newWalletPath.address.txt');
}
} catch (e) {
final currentWalletPath = await pathForWallet(name: name, type: type);
final currentCacheFile = File(currentWalletPath);
final currentKeysFile = File('$currentWalletPath.keys');
final currentAddressListFile = File('$currentWalletPath.address.txt');
final newWalletPath = await pathForWallet(name: newWalletName, type: type);
final newWalletPath =
await pathForWallet(name: newWalletName, type: type);
// Copies current wallet files into new wallet name's dir and files
if (currentCacheFile.existsSync()) {
@ -295,7 +327,8 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
}
// Delete old name's dir and files
await Directory(currentWalletPath).delete(recursive: true);
await Directory(currentWalletDirPath).delete(recursive: true);
}
}
@override

8
lib/core/wallet_loading_service.dart
View file

@ -25,6 +25,14 @@ class WalletLoadingService {
await keyService.deleteWalletPassword(walletName: name);
await walletService.rename(name, walletPassword, newName);
// set shared preferences flag based on previous wallet name
if (type == WalletType.monero) {
final oldNameKey = PreferencesKey.moneroWalletUpdateV1Key(name);
final isPasswordUpdated = sharedPreferences.getBool(oldNameKey) ?? false;
final newNameKey = PreferencesKey.moneroWalletUpdateV1Key(newName);
await sharedPreferences.setBool(newNameKey, isPasswordUpdated);
}
}
Future<WalletBase> load(WalletType type, String name, {String? password}) async {

5
lib/di.dart
View file

@ -42,6 +42,7 @@ import 'package:cake_wallet/utils/device_info.dart';
import 'package:cake_wallet/store/anonpay/anonpay_transactions_store.dart';
import 'package:cake_wallet/view_model/anon_invoice_page_view_model.dart';
import 'package:cake_wallet/view_model/anonpay_details_view_model.dart';
import 'package:cake_wallet/view_model/dashboard/market_place_view_model.dart';
import 'package:cake_wallet/view_model/dashboard/receive_option_view_model.dart';
import 'package:cake_wallet/view_model/ionia/ionia_auth_view_model.dart';
import 'package:cake_wallet/view_model/ionia/ionia_buy_card_view_model.dart';
@ -898,6 +899,8 @@ Future setup({
getIt.registerFactory<IoniaAnyPay>(() => IoniaAnyPay(
getIt.get<IoniaService>(), getIt.get<AnyPayApi>(), getIt.get<AppStore>().wallet!));
getIt.registerFactory(()=> MarketPlaceViewModel(getIt.get<IoniaService>()));
getIt.registerFactory(() => IoniaGiftCardsListViewModel(ioniaService: getIt.get<IoniaService>()));
getIt.registerFactory(() => IoniaAuthViewModel(ioniaService: getIt.get<IoniaService>()));
@ -1067,6 +1070,7 @@ Future setup({
return WalletUnlockPage(
getIt.get<WalletUnlockLoadableViewModel>(param1: args),
args.callback,
args.authPasswordHandler,
closable: closable);
}, instanceName: 'wallet_unlock_loadable');
@ -1074,6 +1078,7 @@ Future setup({
return WalletUnlockPage(
getIt.get<WalletUnlockVerifiableViewModel>(param1: args),
args.callback,
args.authPasswordHandler,
closable: closable);
}, instanceName: 'wallet_unlock_verifiable');

37
lib/src/screens/wallet/wallet_edit_page.dart
View file

@ -2,8 +2,12 @@ import 'package:another_flushbar/flushbar.dart';
import 'package:cake_wallet/core/auth_service.dart';
import 'package:cake_wallet/core/wallet_name_validator.dart';
import 'package:cake_wallet/palette.dart';
import 'package:cake_wallet/routes.dart';
import 'package:cake_wallet/src/screens/auth/auth_page.dart';
import 'package:cake_wallet/src/screens/wallet_unlock/wallet_unlock_arguments.dart';
import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
import 'package:cake_wallet/store/settings_store.dart';
import 'package:cake_wallet/utils/show_bar.dart';
import 'package:cake_wallet/utils/show_pop_up.dart';
import 'package:cake_wallet/view_model/wallet_list/wallet_edit_view_model.dart';
@ -94,9 +98,36 @@ class WalletEditPage extends BasePage {
);
} else {
try {
await walletEditViewModel.changeName(editingWallet);
Navigator.of(context).pop();
walletEditViewModel.resetState();
bool confirmed = false;
if (SettingsStoreBase
.walletPasswordDirectInput) {
await Navigator.of(context).pushNamed(
Routes.walletUnlockLoadable,
arguments: WalletUnlockArguments(
authPasswordHandler:
(String password) async {
await walletEditViewModel
.changeName(editingWallet,
password: password);
},
callback: (bool
isAuthenticatedSuccessfully,
AuthPageState auth) async {
if (isAuthenticatedSuccessfully) {
auth.close();
confirmed = true;
}
},
walletName: editingWallet.name,
walletType: editingWallet.type));
} else {
await walletEditViewModel
.changeName(editingWallet);
confirmed = true;
}
if (confirmed) Navigator.of(context).pop();
} catch (e) {}
}
}

16
lib/src/screens/wallet_list/wallet_list_page.dart
View file

@ -1,7 +1,9 @@
import 'package:cake_wallet/main.dart';
import 'package:cake_wallet/src/screens/auth/auth_page.dart';
import 'package:cake_wallet/core/auth_service.dart';
import 'package:cake_wallet/src/screens/wallet_unlock/wallet_unlock_arguments.dart';
import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
import 'package:cake_wallet/store/settings_store.dart';
import 'package:cake_wallet/utils/responsive_layout_util.dart';
import 'package:cake_wallet/utils/show_bar.dart';
import 'package:cake_wallet/utils/show_pop_up.dart';
@ -210,6 +212,20 @@ class WalletListBodyState extends State<WalletListBody> {
}
Future<void> _loadWallet(WalletListItem wallet) async {
if (SettingsStoreBase.walletPasswordDirectInput) {
Navigator.of(context).pushNamed(
Routes.walletUnlockLoadable,
arguments: WalletUnlockArguments(
callback: (bool isAuthenticatedSuccessfully, AuthPageState auth) async {
if (isAuthenticatedSuccessfully) {
auth.close();
setState(() {});
}
}, walletName: wallet.name,
walletType: wallet.type));
return;
}
await widget.authService.authenticateAction(context,
onAuthSuccess: (isAuthenticatedSuccessfully) async {
if (!isAuthenticatedSuccessfully) {

10
lib/src/screens/wallet_unlock/wallet_unlock_arguments.dart
View file

@ -1,13 +1,17 @@
import 'package:cake_wallet/src/screens/auth/auth_page.dart';
import 'package:cw_core/wallet_type.dart';
typedef AuthPasswordHandler = Future<void> Function(String);
class WalletUnlockArguments {
WalletUnlockArguments({
required this.callback,
WalletUnlockArguments(
{required this.callback,
this.walletName,
this.walletType});
this.walletType,
this.authPasswordHandler});
final OnAuthenticationFinished callback;
final AuthPasswordHandler? authPasswordHandler;
final String? walletName;
final WalletType? walletType;
}

19
lib/src/screens/wallet_unlock/wallet_unlock_page.dart
View file

@ -2,10 +2,10 @@ import 'package:another_flushbar/flushbar.dart';
import 'package:cake_wallet/core/execution_state.dart';
import 'package:cake_wallet/generated/i18n.dart';
import 'package:cake_wallet/src/screens/auth/auth_page.dart';
import 'package:cake_wallet/src/screens/wallet_unlock/wallet_unlock_arguments.dart';
import 'package:cake_wallet/src/widgets/primary_button.dart';
import 'package:cake_wallet/utils/responsive_layout_util.dart';
import 'package:cake_wallet/utils/show_bar.dart';
import 'package:cake_wallet/view_model/wallet_unlock_verifiable_view_model.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:cake_wallet/view_model/wallet_unlock_view_model.dart';
@ -17,10 +17,12 @@ class WalletUnlockPage extends StatefulWidget {
WalletUnlockPage(
this.walletUnlockViewModel,
this.onAuthenticationFinished,
this.authPasswordHandler,
{required this.closable});
final WalletUnlockViewModel walletUnlockViewModel;
final OnAuthenticationFinished onAuthenticationFinished;
final AuthPasswordHandler? authPasswordHandler;
final bool closable;
@override
@ -204,7 +206,20 @@ class WalletUnlockPageState extends AuthPageState<WalletUnlockPage> {
child: Observer(
builder: (_) =>
LoadingPrimaryButton(
onPressed: () => widget.walletUnlockViewModel.unlock(),
onPressed: () async {
if (widget.authPasswordHandler != null) {
try {
await widget.authPasswordHandler!(widget
.walletUnlockViewModel.password);
widget.walletUnlockViewModel.success();
} catch (e) {
widget.walletUnlockViewModel.failure(e);
}
return;
}
widget.walletUnlockViewModel.unlock();
},
text: S.of(context).unlock,
color: Colors.green,
textColor: Colors.white,

9
lib/view_model/wallet_list/wallet_edit_view_model.dart
View file

@ -32,11 +32,12 @@ abstract class WalletEditViewModelBase with Store {
final WalletLoadingService _walletLoadingService;
@action
Future<void> changeName(WalletListItem walletItem) async {
Future<void> changeName(WalletListItem walletItem, {String? password}) async {
state = WalletEditRenamePending();
await _walletLoadingService.renameWallet(
walletItem.type, walletItem.name, newName);
_walletListViewModel.updateList();
walletItem.type, walletItem.name, newName,
password: password);
resetState();
}
@action
@ -45,11 +46,11 @@ abstract class WalletEditViewModelBase with Store {
final walletService = getIt.get<WalletService>(param1: wallet.type);
await walletService.remove(wallet.name);
resetState();
_walletListViewModel.updateList();
}
@action
void resetState() {
_walletListViewModel.updateList();
state = WalletEditViewModelInitialState();
}
}

33
lib/view_model/wallet_unlock_loadable_view_model.dart
View file

@ -7,14 +7,13 @@ import 'package:cake_wallet/view_model/wallet_unlock_view_model.dart';
part 'wallet_unlock_loadable_view_model.g.dart';
class WalletUnlockLoadableViewModel = WalletUnlockLoadableViewModelBase with _$WalletUnlockLoadableViewModel;
class WalletUnlockLoadableViewModel = WalletUnlockLoadableViewModelBase
with _$WalletUnlockLoadableViewModel;
abstract class WalletUnlockLoadableViewModelBase extends WalletUnlockViewModel with Store {
WalletUnlockLoadableViewModelBase(
this._appStore,
this._walletLoadingService, {
required this.walletName,
required this.walletType})
abstract class WalletUnlockLoadableViewModelBase extends WalletUnlockViewModel
with Store {
WalletUnlockLoadableViewModelBase(this._appStore, this._walletLoadingService,
{required this.walletName, required this.walletType})
: password = '',
state = InitialExecutionState();
@ -43,14 +42,24 @@ class WalletUnlockLoadableViewModel = WalletUnlockLoadableViewModelBase with _$W
Future<void> unlock() async {
try {
state = InitialExecutionState();
final wallet = await _walletLoadingService.load(
walletType,
walletName,
final wallet = await _walletLoadingService.load(walletType, walletName,
password: password);
_appStore.changeCurrentWallet(wallet);
success();
} catch (e) {
failure(e.toString());
}
}
@override
@action
void success() {
state = ExecutedSuccessfullyState();
} catch(e) {
}
@override
@action
void failure(e) {
state = FailureState(e.toString());
}
}
}

30
lib/view_model/wallet_unlock_verifiable_view_model.dart
View file

@ -7,13 +7,13 @@ import 'package:cake_wallet/view_model/wallet_unlock_view_model.dart';
part 'wallet_unlock_verifiable_view_model.g.dart';
class WalletUnlockVerifiableViewModel = WalletUnlockVerifiableViewModelBase with _$WalletUnlockVerifiableViewModel;
class WalletUnlockVerifiableViewModel = WalletUnlockVerifiableViewModelBase
with _$WalletUnlockVerifiableViewModel;
abstract class WalletUnlockVerifiableViewModelBase extends WalletUnlockViewModel with Store {
WalletUnlockVerifiableViewModelBase(
this.appStore, {
required this.walletName,
required this.walletType})
abstract class WalletUnlockVerifiableViewModelBase extends WalletUnlockViewModel
with Store {
WalletUnlockVerifiableViewModelBase(this.appStore,
{required this.walletName, required this.walletType})
: password = '',
state = InitialExecutionState();
@ -41,9 +41,21 @@ abstract class WalletUnlockVerifiableViewModelBase extends WalletUnlockViewModel
try {
state = appStore.wallet!.password == password
? ExecutedSuccessfullyState()
: FailureState(S.current.invalid_password) ;
} catch(e) {
state = FailureState('${S.current.invalid_password}\n${e.toString()}');
: FailureState(S.current.invalid_password);
} catch (e) {
failure('${S.current.invalid_password}\n${e.toString()}');
}
}
@override
@action
void success() {
state = ExecutedSuccessfullyState();
}
@override
@action
void failure(e) {
state = FailureState(e.toString());
}
}

2
lib/view_model/wallet_unlock_view_model.dart
View file

@ -6,4 +6,6 @@ abstract class WalletUnlockViewModel {
void setPassword(String password);
ExecutionState get state;
Future<void> unlock();
void success();
void failure(dynamic e);
}