Release 4.4.3 (#415)

* Add ability for change password for wallets classes.

* Update generateWalletPassword

* Add WalletLoadingService

* Add update monero password after wallet loading.

* Update version for Cake Wallet to 4.4.2 (103)

* Changed version for Cake Wallet to 4.4.3 (104).

* Changed version for Cake Wallet android

* Changed version for Monero.com ios and android.

lib/core/generate_wallet_password.dart

@@ -1,12 +1,6 @@
 import 'package:uuid/uuid.dart';
 import 'package:cw_core/key.dart';
-import 'package:cw_core/wallet_type.dart';
 
-String generateWalletPassword(WalletType type) {
-  switch (type) {
-    case WalletType.monero:
-      return Uuid().v4();
-    default:
-      return generateKey();
-  }
+String generateWalletPassword() {
+  return generateKey();
 }

lib/core/wallet_creation_service.dart

@@ -1,5 +1,6 @@
 import 'package:cake_wallet/di.dart';
 import 'package:cw_core/wallet_info.dart';
+import 'package:cake_wallet/entities/preferences_key.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:hive/hive.dart';
@@ -31,6 +32,8 @@ class WalletCreationService {
   final Box<WalletInfo> walletInfoSource;
   WalletService _service;
 
+  static const _isNewMoneroWalletPasswordUpdated = true;
+
   void changeWalletType({@required WalletType type}) {
     this.type = type;
     _service = getIt.get<WalletService>(param1: type);
@@ -51,28 +54,55 @@ class WalletCreationService {
 
   Future<WalletBase> create(WalletCredentials credentials) async {
     checkIfExists(credentials.name);
-    final password = generateWalletPassword(type);
+    final password = generateWalletPassword();
     credentials.password = password;
     await keyService.saveWalletPassword(
         password: password, walletName: credentials.name);
-    return await _service.create(credentials);
+    final wallet =  await _service.create(credentials);
+
+    if (wallet.type == WalletType.monero) {
+      await sharedPreferences
+        .setBool(
+          PreferencesKey.moneroWalletUpdateV1Key(wallet.name),
+          _isNewMoneroWalletPasswordUpdated);
+    }
+
+    return wallet;
   }
 
   Future<WalletBase> restoreFromKeys(WalletCredentials credentials) async {
     checkIfExists(credentials.name);
-    final password = generateWalletPassword(type);
+    final password = generateWalletPassword();
     credentials.password = password;
     await keyService.saveWalletPassword(
         password: password, walletName: credentials.name);
-    return await _service.restoreFromKeys(credentials);
+    final wallet = await _service.restoreFromKeys(credentials);
+
+    if (wallet.type == WalletType.monero) {
+      await sharedPreferences
+        .setBool(
+          PreferencesKey.moneroWalletUpdateV1Key(wallet.name),
+          _isNewMoneroWalletPasswordUpdated);
+    }
+
+    return wallet;
   }
 
   Future<WalletBase> restoreFromSeed(WalletCredentials credentials) async {
     checkIfExists(credentials.name);
-    final password = generateWalletPassword(type);
+    final password = generateWalletPassword();
     credentials.password = password;
     await keyService.saveWalletPassword(
         password: password, walletName: credentials.name);
-    return await _service.restoreFromSeed(credentials);
+    final wallet = await _service.restoreFromSeed(credentials);
+
+    if (wallet.type == WalletType.monero) {
+      await sharedPreferences
+        .setBool(
+          PreferencesKey.moneroWalletUpdateV1Key(wallet.name),
+          _isNewMoneroWalletPasswordUpdated);
+    }
+
+    return wallet;
   }
 }

lib/core/wallet_loading_service.dart

@@ -0,0 +1,52 @@
+import 'package:cake_wallet/core/generate_wallet_password.dart';
+import 'package:cake_wallet/core/key_service.dart';
+import 'package:cake_wallet/entities/preferences_key.dart';
+import 'package:cw_core/wallet_base.dart';
+import 'package:cw_core/wallet_service.dart';
+import 'package:cw_core/wallet_type.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+class WalletLoadingService {
+	WalletLoadingService(
+		this.sharedPreferences,
+		this.keyService,
+		this.walletServiceFactory);
+	
+	final SharedPreferences sharedPreferences;
+	final KeyService keyService;
+	final WalletService Function(WalletType type) walletServiceFactory;
+
+	Future<WalletBase> load(WalletType type, String name) async {
+		if (walletServiceFactory == null) {
+			throw Exception('WalletLoadingService.walletServiceFactory is not set');
+		}
+		final walletService = walletServiceFactory?.call(type);
+		final password = await keyService.getWalletPassword(walletName: name);
+  		final wallet = await walletService.openWallet(name, password);
+
+  		if (type == WalletType.monero) {
+  			await upateMoneroWalletPassword(wallet);
+  		}
+
+  		return wallet;
+	}
+
+	Future<void> upateMoneroWalletPassword(WalletBase wallet) async {
+		final key = PreferencesKey.moneroWalletUpdateV1Key(wallet.name);
+		var isPasswordUpdated = sharedPreferences.getBool(key) ?? false;
+
+		if (isPasswordUpdated) {
+			return;
+		}
+
+		final password = generateWalletPassword();
+		// Save new generated password with backup key for case
+		// if wallet will change password, but it will faild to updated in secure storage
+		final bakWalletName = '#__${wallet.name}_bak__#';
+		await keyService.saveWalletPassword(walletName: bakWalletName, password: password);
+		await wallet.changePassword(password);
+		await keyService.saveWalletPassword(walletName: wallet.name, password: password);
+		isPasswordUpdated = true;
+		await sharedPreferences.setBool(key, isPasswordUpdated);
+	}
+}

lib/di.dart

@@ -124,6 +124,7 @@ import 'package:cake_wallet/exchange/exchange_template.dart';
 import 'package:cake_wallet/.secrets.g.dart' as secrets;
 import 'package:cake_wallet/src/screens/dashboard/widgets/address_page.dart';
 import 'package:cake_wallet/src/screens/receive/fullscreen_qr_page.dart';
+import 'package:cake_wallet/core/wallet_loading_service.dart';
 
 final getIt = GetIt.instance;
 
@@ -218,6 +219,12 @@ Future setup(
           sharedPreferences: getIt.get<SharedPreferences>(),
           walletInfoSource: _walletInfoSource));
 
+  getIt.registerFactory<WalletLoadingService>(
+    () => WalletLoadingService(
+      getIt.get<SharedPreferences>(),
+      getIt.get<KeyService>(),
+      (WalletType type) => getIt.get<WalletService>(param1: type)));
+
   getIt.registerFactoryParam<WalletNewVM, WalletType, void>((type, _) =>
       WalletNewVM(getIt.get<AppStore>(),
           getIt.get<WalletCreationService>(param1: type), _walletInfoSource,
@@ -352,7 +359,7 @@ Future setup(
   getIt.registerFactory(() => WalletListViewModel(
       _walletInfoSource,
       getIt.get<AppStore>(),
-      getIt.get<KeyService>()));
+      getIt.get<WalletLoadingService>()));
 
   getIt.registerFactory(() =>
       WalletListPage(walletListViewModel: getIt.get<WalletListViewModel>()));

lib/entities/load_current_wallet.dart

@@ -5,6 +5,7 @@ import 'package:cake_wallet/core/key_service.dart';
 import 'package:cw_core/wallet_service.dart';
 import 'package:cake_wallet/entities/preferences_key.dart';
 import 'package:cw_core/wallet_type.dart';
+import 'package:cake_wallet/core/wallet_loading_service.dart';
 
 Future<void> loadCurrentWallet() async {
   final appStore = getIt.get<AppStore>();
@@ -15,9 +16,7 @@ Future<void> loadCurrentWallet() async {
       getIt.get<SharedPreferences>().getInt(PreferencesKey.currentWalletType) ??
           0;
   final type = deserializeFromInt(typeRaw);
-  final password =
-      await getIt.get<KeyService>().getWalletPassword(walletName: name);
-  final _service = getIt.get<WalletService>(param1: type);
-  final wallet = await _service.openWallet(name, password);
+  final walletLoadingService = getIt.get<WalletLoadingService>();
+  final wallet = await walletLoadingService.load(type, name);
   appStore.changeCurrentWallet(wallet);
 }

lib/entities/preferences_key.dart

@@ -22,4 +22,8 @@ class PreferencesKey {
   static const bitcoinTransactionPriority = 'current_fee_priority_bitcoin';
   static const shouldShowReceiveWarning = 'should_show_receive_warning';
   static const shouldShowYatPopup = 'should_show_yat_popup';
+  static const moneroWalletPasswordUpdateV1Base = 'monero_wallet_update_v1';
+
+  static String moneroWalletUpdateV1Key(String name)
+    => '${PreferencesKey.moneroWalletPasswordUpdateV1Base}_${name}';
 }

lib/view_model/wallet_list/wallet_list_view_model.dart

@@ -1,9 +1,9 @@
+import 'package:cake_wallet/core/wallet_loading_service.dart';
 import 'package:cake_wallet/view_model/wallet_new_vm.dart';
 import 'package:hive/hive.dart';
 import 'package:mobx/mobx.dart';
 import 'package:cake_wallet/di.dart';
 import 'package:cake_wallet/store/app_store.dart';
-import 'package:cake_wallet/core/key_service.dart';
 import 'package:cw_core/wallet_service.dart';
 import 'package:cake_wallet/view_model/wallet_list/wallet_list_item.dart';
 import 'package:cw_core/wallet_info.dart';
@@ -16,7 +16,7 @@ class WalletListViewModel = WalletListViewModelBase with _$WalletListViewModel;
 
 abstract class WalletListViewModelBase with Store {
   WalletListViewModelBase(this._walletInfoSource, this._appStore,
-      this._keyService) {
+      this._walletLoadingService) {
     wallets = ObservableList<WalletListItem>();
     _updateList();
   }
@@ -26,17 +26,14 @@ abstract class WalletListViewModelBase with Store {
 
   final AppStore _appStore;
   final Box<WalletInfo> _walletInfoSource;
-  final KeyService _keyService;
+  final WalletLoadingService _walletLoadingService;
 
   WalletType get currentWalletType => _appStore.wallet.type;
 
   @action
-  Future<void> loadWallet(WalletListItem wallet) async {
-    final password =
-        await _keyService.getWalletPassword(walletName: wallet.name);
-    final walletService = getIt.get<WalletService>(param1: wallet.type);
-    final loadedWallet = await walletService.openWallet(wallet.name, password);
-    _appStore.changeCurrentWallet(loadedWallet);
+  Future<void> loadWallet(WalletListItem walletItem) async {
+    final wallet = await _walletLoadingService.load(walletItem.type, walletItem.name);
+    _appStore.changeCurrentWallet(wallet);
     _updateList();
   }
 

lib/view_model/wallet_restoration_from_keys_vm.dart

@@ -45,7 +45,7 @@ abstract class WalletRestorationFromKeysVMBase extends WalletCreationVM
 
   @override
   WalletCredentials getCredentials(dynamic options) {
-    final password = generateWalletPassword(type);
+    final password = generateWalletPassword();
 
     switch (type) {
       case WalletType.monero:

lib/view_model/wallet_restoration_from_seed_vm.dart

@@ -36,7 +36,7 @@ abstract class WalletRestorationFromSeedVMBase extends WalletCreationVM
 
   @override
   WalletCredentials getCredentials(dynamic options) {
-    final password = generateWalletPassword(type);
+    final password = generateWalletPassword();
 
     switch (type) {
       case WalletType.monero:

lib/view_model/wallet_restore_view_model.dart

@@ -53,7 +53,7 @@ abstract class WalletRestoreViewModelBase extends WalletCreationVM with Store {
   
   @override
   WalletCredentials getCredentials(dynamic options) {
-    final password = generateWalletPassword(type);
+    final password = generateWalletPassword();
     final height = options['height'] as int;
     name = options['name'] as String;