Skip to content

Commit b2c379f

Browse files
committed
sanity checks [skip ci]
1 parent 91e4940 commit b2c379f

3 files changed

Lines changed: 13 additions & 8 deletions

File tree

lib/view_model/backup_view_model.dart

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
import 'dart:io';
2-
import 'package:cake_wallet/core/backup_service.dart';
32
import 'package:cake_wallet/core/backup_service_v3.dart';
43
import 'package:cake_wallet/core/execution_state.dart';
54
import 'package:cake_wallet/core/secure_storage.dart';
5+
import 'package:cake_wallet/entities/default_settings_migration.dart' show generateBackupPassword;
66
import 'package:cake_wallet/entities/secret_store_key.dart';
77
import 'package:cake_wallet/view_model/edit_backup_password_view_model.dart';
88
import 'package:cw_core/root_dir.dart';
99
import 'package:cw_core/utils/print_verbose.dart';
10-
import 'package:flutter/foundation.dart';
1110
import 'package:mobx/mobx.dart';
1211
import 'package:intl/intl.dart';
1312
import 'package:cake_wallet/wallet_type_utils.dart';
14-
import 'package:path_provider/path_provider.dart';
1513

1614
part 'backup_view_model.g.dart';
1715

@@ -60,7 +58,10 @@ abstract class BackupViewModelBase with Store {
6058
@action
6159
Future<void> init() async {
6260
final key = generateStoreKeyFor(key: SecretStoreKey.backupPassword);
63-
backupPassword = (await secureStorage.read(key: key))!;
61+
backupPassword = (await secureStorage.read(key: key)) ?? '';
62+
if (backupPassword.isEmpty) {
63+
generateBackupPassword(secureStorage);
64+
}
6465
}
6566

6667
@action

lib/view_model/edit_backup_password_view_model.dart

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import 'package:cake_wallet/core/secure_storage.dart';
2+
import 'package:cake_wallet/entities/default_settings_migration.dart' show generateBackupPassword;
23
import 'package:mobx/mobx.dart';
34
import 'package:cake_wallet/entities/secret_store_key.dart';
45

@@ -28,6 +29,9 @@ abstract class EditBackupPasswordViewModelBase with Store {
2829
Future<void> init() async {
2930
final key = generateStoreKeyFor(key: SecretStoreKey.backupPassword);
3031
final password = (await secureStorage.read(key: key)) ?? '';
32+
if (backupPassword.isEmpty) {
33+
generateBackupPassword(secureStorage);
34+
}
3135
_originalPassword = password;
3236
backupPassword = password;
3337
}

scripts/macos/app_env.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ if [ -n "$1" ]; then
1616
fi
1717

1818
MONERO_COM_NAME="Monero.com"
19-
MONERO_COM_VERSION="5.6.1"
20-
MONERO_COM_BUILD_NUMBER=72
19+
MONERO_COM_VERSION="5.6.5"
20+
MONERO_COM_BUILD_NUMBER=73
2121
MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
2222

2323
CAKEWALLET_NAME="Cake Wallet"
24-
CAKEWALLET_VERSION="5.6.1"
25-
CAKEWALLET_BUILD_NUMBER=139
24+
CAKEWALLET_VERSION="5.6.5"
25+
CAKEWALLET_BUILD_NUMBER=140
2626
CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
2727

2828
if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then

0 commit comments

Comments
 (0)