Merge pull request #11 from cake-tech/CW-832-cupcake-post-release-things

CW-832-cupcake-post-release-things
cake-tech · Nov 26, 2024 · e7290dd · e7290dd
2 parents b81afb0 + 896084f
commit e7290dd
Show file tree

Hide file tree

Showing 28 changed files with 4,067 additions and 92 deletions.
diff --git a/android/.gitignore b/android/.gitignore
@@ -11,3 +11,4 @@ GeneratedPluginRegistrant.java
 key.properties
 **/*.keystore
 **/*.jks
+**/*.pwd
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -6,6 +6,9 @@ PODS:
     - Flutter
   - integration_test (0.0.1):
     - Flutter
+  - local_auth_darwin (0.0.1):
+    - Flutter
+    - FlutterMacOS
   - package_info_plus (0.4.5):
     - Flutter
   - path_provider_foundation (0.0.1):
@@ -19,6 +22,7 @@ DEPENDENCIES:
   - Flutter (from `Flutter`)
   - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
   - integration_test (from `.symlinks/plugins/integration_test/ios`)
+  - local_auth_darwin (from `.symlinks/plugins/local_auth_darwin/darwin`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
   - share_plus (from `.symlinks/plugins/share_plus/ios`)
@@ -32,6 +36,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/flutter_secure_storage/ios"
   integration_test:
     :path: ".symlinks/plugins/integration_test/ios"
+  local_auth_darwin:
+    :path: ".symlinks/plugins/local_auth_darwin/darwin"
   package_info_plus:
     :path: ".symlinks/plugins/package_info_plus/ios"
   path_provider_foundation:
@@ -44,10 +50,11 @@ SPEC CHECKSUMS:
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
   flutter_secure_storage: d33dac7ae2ea08509be337e775f6b59f1ff45f12
   integration_test: 252f60fa39af5e17c3aa9899d35d908a0721b573
+  local_auth_darwin: 66e40372f1c29f383a314c738c7446e2f7fdadc3
   package_info_plus: c0502532a26c7662a62a356cebe2692ec5fe4ec4
   path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
   share_plus: 8875f4f2500512ea181eef553c3e27dba5135aad
 
 PODFILE CHECKSUM: 819463e6a0290f5a72f145ba7cde16e8b6ef0796
 
-COCOAPODS: 1.15.2
+COCOAPODS: 1.16.2
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
@@ -47,5 +47,7 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+	<key>NSFaceIDUsageDescription</key>
+	<string>Authenticate with FaceID instead of pin</string>
 </dict>
 </plist>
diff --git a/lib/coins/monero/coin.dart b/lib/coins/monero/coin.dart
@@ -391,13 +391,18 @@ class MoneroWalletInfo extends CoinWalletInfo {
 
   @override
   Future<void> renameWallet(String newName) async {
+    if (p.basename(walletName) == newName) {
+      throw Exception("Wallet wasn't renamed");
+    }
     for (var element in wPtrList) {
       monero.WalletManager_closeWallet(Monero.wmPtr, element, true);
     }
     wPtrList.clear();
     final basePath = p.dirname(walletName);
-    File(walletName).rename(p.join(basePath, newName));
-    File("$walletName.keys").rename(p.join(basePath, "$newName.keys"));
+    File(walletName).copySync(p.join(basePath, newName));
+    File("$walletName.keys").copySync(p.join(basePath, "$newName.keys"));
+    File(walletName).deleteSync();
+    File("$walletName.keys").deleteSync();
     _walletName = newName;
   }
 

diff --git a/lib/coins/monero/wallet.dart b/lib/coins/monero/wallet.dart
@@ -299,6 +299,18 @@ class MoneroWallet implements CoinWallet {
                 value: secrets[key] ?? "unknown");
           },
         ),
+      if (config.debug)
+        ...List.generate(
+          config.toJson().keys.length,
+          (index) {
+            final key = config.toJson().keys.elementAt(index);
+            return WalletSeedDetail(
+                type: WalletSeedDetailType.text,
+                name: key,
+                value: const JsonEncoder.withIndent('    ')
+                    .convert(config.toJson()[key]));
+          },
+        ),
     ];
   }
 }

diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
@@ -54,6 +54,8 @@
   "balance": "Balance",
   "wallet_seed": "Wallet seed",
   "wallet_passphrase": "Wallet passphrase",
+  "wallet_password": "Wallet password",
+  "wallet_password_repeat": "Wallet password (repeat)",
   "secret_spend_key": "Secret spend key",
   "spend_key": "Spend key",
   "secret_view_key": "Secret view key",

diff --git a/lib/l10n/app_pl.arb b/lib/l10n/app_pl.arb
@@ -54,6 +54,8 @@
   "balance": "Saldo",
   "wallet_seed": "Fraza odzyskiwania",
   "wallet_passphrase": "Hasło frazy odzyskiwania",
+  "wallet_password": "Hasło portfela",
+  "wallet_password_repeat": "Hasło portfela (ponownie)",
   "secret_spend_key": "Tajny klucz wydatków",
   "spend_key": "Klucz wydatków",
   "secret_view_key": "Tajny klucz podglądu",

diff --git a/lib/main.dart b/lib/main.dart
@@ -2,6 +2,7 @@ import 'package:cupcake/l10n/app_localizations.dart';
 import 'package:cupcake/themes/base_theme.dart';
 import 'package:cupcake/utils/config.dart';
 import 'package:cupcake/utils/filesystem.dart';
+import 'package:cupcake/utils/secure_storage.dart';
 import 'package:cupcake/view_model/home_screen_view_model.dart';
 import 'package:cupcake/views/home_screen.dart';
 import 'package:cupcake/views/initial_setup_screen.dart';
@@ -13,12 +14,14 @@ late String signingKeyFound = "";
 
 Future<void> appInit() async {
   WidgetsFlutterBinding.ensureInitialized();
-  // try {
-  //   signingKeyFound = await getSigningKey() ?? "unknown";
-  // } catch (e) {
-  //   signingKeyFound = e.toString();
-  // }
   await initializeBaseStoragePath();
+  if (config.initialSetupComplete == false) {
+    final oldSecureStorage = await secureStorage.readAll();
+    final date = DateTime.now().toIso8601String();
+    config.oldSecureStorage[date] = oldSecureStorage;
+    config.save();
+    await secureStorage.deleteAll();
+  }
 }
 
 Future<void> main() async {

diff --git a/lib/utils/config.dart b/lib/utils/config.dart
@@ -14,15 +14,19 @@ class CupcakeConfig {
     required this.msForQrCode,
     required this.maxFragmentLength,
     required this.walletSort,
+    required this.biometricEnabled,
     required this.debug,
+    required this.oldSecureStorage,
   });
   CoinWalletInfo? lastWallet;
   bool initialSetupComplete;
   int walletMigrationLevel;
   int msForQrCode;
   int maxFragmentLength;
   int walletSort;
+  bool biometricEnabled;
   bool debug;
+  Map<String, dynamic> oldSecureStorage;
 
   factory CupcakeConfig.fromJson(Map<String, dynamic> json) {
     return CupcakeConfig(
@@ -32,7 +36,9 @@ class CupcakeConfig {
       msForQrCode: json['msForQrCode'] ?? 1000 ~/ 3.5,
       maxFragmentLength: json['maxFragmentLength'] ?? 130,
       walletSort: json['walletSort'] ?? 0,
+      biometricEnabled: json['biometricEnabled'] ?? false,
       debug: json['debug'] ?? false,
+      oldSecureStorage: json['oldSecureStorage'] ?? {},
     );
   }
 
@@ -44,6 +50,8 @@ class CupcakeConfig {
       'msForQrCode': msForQrCode,
       'maxFragmentLength': maxFragmentLength,
       'walletSort': walletSort,
+      'biometricEnabled': biometricEnabled,
+      'oldSecureStorage': oldSecureStorage,
       'debug': debug,
     };
   }