Skip to content

CW-1288-Creating-backup-on-MacOS-crashes-the-app #2750

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Serhii-Borodenko wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

CW-1288-Creating-backup-on-MacOS-crashes-the-app #2750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions lib/core/backup_service.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import 'package:cw_core/wallet_info.dart';
import 'package:cake_wallet/.secrets.g.dart' as secrets;
import 'package:cake_wallet/wallet_types.g.dart';
import 'package:cake_backup/backup.dart' as cake_backup;
import 'package:path/path.dart' as path;

class $BackupService {
$BackupService(this._secureStorage, this.transactionDescriptionBox,
Expand Down Expand Up @@ -338,4 +339,11 @@ class $BackupService {

Future<Uint8List> decryptV2(Uint8List data, String passphrase) async =>
cake_backup.decrypt(passphrase, data);

Future<Directory> getRestoreTempDir() async {
final appDir = await getAppDir();
final dir = Directory(path.join(appDir.path, '~_RESTORE_TMP'));
if (!dir.existsSync()) dir.createSync(recursive: true);
return dir;
}
}
21 changes: 16 additions & 5 deletions lib/core/backup_service_v3.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,11 +236,16 @@ class BackupServiceV3 extends $BackupService {
throw Exception('Invalid v3 backup: missing data.bin');
}
final dataStream = dataFile.rawContent!.getStream();

final decryptedData = File('${file.path}_decrypted'); // decrypted zip file
if (decryptedData.existsSync()) {
decryptedData.deleteSync();
}

final tmpDir = await getRestoreTempDir();
if (!tmpDir.existsSync()) tmpDir.createSync(recursive: true);

final decryptedData = File('${tmpDir.path}/data_decrypted.zip');

// pre-clean
if (decryptedData.existsSync()) decryptedData.deleteSync();

try {
decryptedData.createSync(recursive: true);
decryptedData.writeAsBytesSync(Uint8List(0), mode: FileMode.write, flush: true);

Expand Down Expand Up @@ -314,6 +319,12 @@ class BackupServiceV3 extends $BackupService {

// Delete decrypted data file
decryptedData.deleteSync();
} finally {
// always clean, even on exception
if (decryptedData.existsSync()) {
decryptedData.deleteSync();
}
}
}

Future<void> verifyHardwareWallets(String password,
Expand Down
Loading