Revert flutter secure storage update (#1440)
* Revert flutter secure storage update * Fix app start slowness
Omar Hatem committed
May 9, 2024 at 16:00 UTC
8325181253a877b2493056a4022d7d66d539f489
3 files changed
+8
-52
lib/di.dart
-28
@@ -124,7 +124,6 @@ import 'package:cake_wallet/src/screens/support/support_page.dart';
124
import 'package:cake_wallet/src/screens/support_chat/support_chat_page.dart';
125
import 'package:cake_wallet/src/screens/support_other_links/support_other_links_page.dart';
126
import 'package:cake_wallet/src/screens/trade_details/trade_details_page.dart';
127
-import 'package:cake_wallet/src/screens/transaction_details/rbf_details_page.dart';
127
import 'package:cake_wallet/src/screens/transaction_details/transaction_details_page.dart';
128
import 'package:cake_wallet/src/screens/unspent_coins/unspent_coins_details_page.dart';
129
import 'package:cake_wallet/src/screens/unspent_coins/unspent_coins_list_page.dart';
@@ -223,7 +222,6 @@ import 'package:cake_wallet/view_model/wallet_seed_view_model.dart';
222
import 'package:cw_core/crypto_currency.dart';
223
import 'package:cw_core/nano_account.dart';
224
import 'package:cw_core/node.dart';
226
-import 'package:cw_core/receive_page_option.dart';
225
import 'package:cw_core/transaction_info.dart';
226
import 'package:cw_core/unspent_coins_info.dart';
227
import 'package:cw_core/wallet_info.dart';
@@ -231,37 +229,11 @@ import 'package:cw_core/wallet_service.dart';
229
import 'package:cw_core/wallet_type.dart';
230
import 'package:flutter/foundation.dart';
231
import 'package:flutter/widgets.dart';
234
-import 'package:flutter_secure_storage/flutter_secure_storage.dart';
232
import 'package:get_it/get_it.dart';
233
import 'package:hive/hive.dart';
234
import 'package:mobx/mobx.dart';
235
import 'package:shared_preferences/shared_preferences.dart';
236
import 'package:cake_wallet/core/secure_storage.dart';
240
-import 'package:cake_wallet/core/wallet_creation_service.dart';
241
-import 'package:cake_wallet/store/app_store.dart';
242
-import 'package:cw_core/wallet_type.dart';
243
-import 'package:cake_wallet/view_model/wallet_new_vm.dart';
244
-import 'package:cake_wallet/store/authentication_store.dart';
245
-import 'package:cake_wallet/store/dashboard/trades_store.dart';
246
-import 'package:cake_wallet/store/dashboard/trade_filter_store.dart';
247
-import 'package:cake_wallet/store/dashboard/transaction_filter_store.dart';
248
-import 'package:cake_wallet/store/dashboard/fiat_conversion_store.dart';
249
-import 'package:cake_wallet/store/templates/send_template_store.dart';
250
-import 'package:cake_wallet/store/templates/exchange_template_store.dart';
251
-import 'package:cake_wallet/entities/template.dart';
252
-import 'package:cake_wallet/exchange/exchange_template.dart';
253
-import 'package:cake_wallet/.secrets.g.dart' as secrets;
254
-import 'package:cake_wallet/src/screens/dashboard/pages/address_page.dart';
255
-import 'package:cake_wallet/anypay/anypay_api.dart';
256
-import 'package:cake_wallet/view_model/ionia/ionia_gift_card_details_view_model.dart';
257
-import 'package:cake_wallet/src/screens/ionia/cards/ionia_payment_status_page.dart';
258
-import 'package:cake_wallet/view_model/ionia/ionia_payment_status_view_model.dart';
259
-import 'package:cake_wallet/anypay/any_pay_payment_committed_info.dart';
260
-import 'package:cake_wallet/ionia/ionia_any_pay_payment_info.dart';
261
-import 'package:cake_wallet/src/screens/receive/fullscreen_qr_page.dart';
262
-import 'package:cake_wallet/core/wallet_loading_service.dart';
263
-import 'package:cw_core/crypto_currency.dart';
264
-import 'package:cake_wallet/entities/qr_view_data.dart';
237
238
import 'buy/dfx/dfx_buy_provider.dart';
239
import 'core/totp_request_details.dart';
pubspec_base.yaml
+1
@@ -138,6 +138,7 @@ dependency_overrides:
138
git:
139
url: https://github.com/cake-tech/web3dart.git
140
ref: cake
141
+ flutter_secure_storage_platform_interface: 1.0.2
142
143
flutter_icons:
144
image_path: "assets/images/app_logo.png"
tool/configure.dart
+7
-24
@@ -1175,8 +1175,8 @@ Future<void> generatePubspec(
1175
git:
1176
url: https://github.com/cake-tech/flutter_secure_storage.git
1177
path: flutter_secure_storage
1178
- ref: cake-9.0.0
1179
- version: 9.0.0
1178
+ ref: cake-8.0.0
1179
+ version: 8.0.0
1180
""";
1181
const cwEthereum = """
1182
cw_ethereum:
@@ -1392,29 +1392,12 @@ class DefaultSecureStorage extends SecureStorage {
1392
1393
@override
1394
Future<String?> readNoIOptions({required String key}) async => await _readInternal(key, true);
1395
-
1396
- Future<String?> _readInternal(String key, bool useNoIOptions) async {
1397
- String? result;
1398
-
1399
- const maxWait = Duration(seconds: 3);
1400
- const checkInterval = Duration(milliseconds: 200);
1401
-
1402
- DateTime start = DateTime.now();
1403
-
1404
- while (result == null && DateTime.now().difference(start) < maxWait) {
1405
- result = await _secureStorage.read(
1406
- key: key,
1407
- iOptions: useNoIOptions ? IOSOptions() : null,
1408
- );
1395
1410
- if (result != null) {
1411
- break;
1412
- }
1413
-
1414
- await Future.delayed(checkInterval);
1415
- }
1416
-
1417
- return result;
1396
+ Future<String?> _readInternal(String key, bool useNoIOptions) async {
1397
+ return await _secureStorage.read(
1398
+ key: key,
1399
+ iOptions: useNoIOptions ? IOSOptions() : null,
1400
+ );
1401
}
1402
}""";
1403
const fakeSecureStorage = """