Skip to content

Commit d31c0a4

Browse files
kumulynjakumulynja
committed
fix recipients locator merge conflict
2 parents acf2b90 + 79603e6 commit d31c0a4

13 files changed

Lines changed: 72 additions & 73 deletions

‎ios/Podfile.lock‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -260,45 +260,45 @@ EXTERNAL SOURCES:
260260
SPEC CHECKSUMS:
261261
AppAuth: d4f13a8fe0baf391b2108511793e4b479691fb73
262262
AppCheckCore: cc8fd0a3a230ddd401f326489c99990b013f0c4f
263-
ark_wallet: cb7a2af0c3a711d488709b7b91b6e639cfd441b1
264-
bdk_flutter: cef9180019b4c6b67a3e3dfb74611683fe140107
263+
ark_wallet: f985745c06c7cf93f368c61218c51ac56b46c71e
264+
bdk_flutter: 86c9ba59ee282dee08c3a29599abe867d10a8b10
265265
boltz: 6388ec2412f3753b63a9e65c97f87ea26f43bddc
266-
camera_avfoundation: 5675ca25298b6f81fa0a325188e7df62cc217741
267-
dart_bbqr: bfd89cc8a74538d94ef6d87d11e4a2ad55578e7d
266+
camera_avfoundation: 281867ff09f1da66f031a184ecfbc6f2e625c9f5
267+
dart_bbqr: 10143a83ef3919f9ac06974e3bbe23cac4abc39b
268268
DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
269269
DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60
270-
file_picker: a0560bc09d61de87f12d246fc47d2119e6ef37be
270+
file_picker: b159e0c068aef54932bb15dc9fd1571818edaf49
271271
Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
272-
flutter_native_splash: c32d145d68aeda5502d5f543ee38c192065986cf
273-
flutter_nfc_kit: e1b71583eafd2c9650bc86844a7f2d185fb414f6
274-
flutter_secure_storage: 1ed9476fba7e7a782b22888f956cce43e2c62f13
275-
flutter_zxing: e8bcc43bd3056c70c271b732ed94e7a16fd62f93
276-
google_sign_in_ios: b48bb9af78576358a168361173155596c845f0b9
272+
flutter_native_splash: df59bb2e1421aa0282cb2e95618af4dcb0c56c29
273+
flutter_nfc_kit: 3985c93f749b9cb4747479205c2f10bd2f877a11
274+
flutter_secure_storage: d33dac7ae2ea08509be337e775f6b59f1ff45f12
275+
flutter_zxing: d527c3ff9c7f3606dd29a7ec8c4055f7daa088c5
276+
google_sign_in_ios: 7411fab6948df90490dc4620ecbcabdc3ca04017
277277
GoogleSignIn: ce8c89bb9b37fb624b92e7514cc67335d1e277e4
278278
GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1
279279
GTMAppAuth: f69bd07d68cd3b766125f7e072c45d7340dea0de
280280
GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6
281-
image_picker_ios: e0ece4aa2a75771a7de3fa735d26d90817041326
282-
integration_test: 4a889634ef21a45d28d50d622cf412dc6d9f586e
281+
image_picker_ios: 4f2f91b01abdb52842a8e277617df877e40f905b
282+
integration_test: 252f60fa39af5e17c3aa9899d35d908a0721b573
283283
lwk: 22e06bc5664247d6b2dac91cfe209b63b70dd580
284-
no_screenshot: 6d183496405a3ab709a67a54e5cd0f639e94729e
285-
package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
286-
path_provider_foundation: bb55f6dbba17d0dccd6737fe6f7f34fbd0376880
284+
no_screenshot: 67d110f12466f4913b488803d4e498d03ef2889e
285+
package_info_plus: c0502532a26c7662a62a356cebe2692ec5fe4ec4
286+
path_provider_foundation: 0b743cbb62d8e47eab856f09262bb8c1ddcfe6ba
287287
payjoin_flutter: 6397d7b698cdad6453be4949ab6aca1863f6c5e5
288-
permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d
288+
permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
289289
PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
290290
ScreenProtectorKit: 83a6281b02c7a5902ee6eac4f5045f674e902ae4
291291
SDWebImage: e9c98383c7572d713c1a0d7dd2783b10599b9838
292-
share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a
292+
share_plus: 8b6f8b3447e494cca5317c8c3073de39b3600d1f
293293
sqlite3: 8d708bc63e9f4ce48f0ad9d6269e478c5ced1d9b
294-
sqlite3_flutter_libs: d13b8b3003f18f596e542bcb9482d105577eff41
294+
sqlite3_flutter_libs: c7b32a4d17d2cbad19895873ccc815f276b1f125
295295
SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4
296-
tor: 767208930250ef7be241963b75568c55c0a81890
297-
universal_ble: ff19787898040d721109c6324472e5dd4bc86adc
298-
url_launcher_ios: 7a95fa5b60cc718a708b8f2966718e93db0cef1b
299-
webview_cookie_manager: d63a76cabdf42a7ea3d92768ac67d4853a1367f8
300-
webview_flutter_wkwebview: 8ebf4fded22593026f7dbff1fbff31ea98573c8d
301-
workmanager_apple: 904529ae31e97fc5be632cf628507652294a0778
296+
tor: 662a9f5b980b5c86decb8ba611de9bcd4c8286eb
297+
universal_ble: cf52a7b3fd2e7c14d6d7262e9fdadb72ab6b88a6
298+
url_launcher_ios: bb13df5870e8c4234ca12609d04010a21be43dfa
299+
webview_cookie_manager: eaf920722b493bd0f7611b5484771ca53fed03f7
300+
webview_flutter_wkwebview: 29eb20d43355b48fe7d07113835b9128f84e3af4
301+
workmanager_apple: 7bac258335c310689a641e2d66e88d4845d372e9
302302

303303
PODFILE CHECKSUM: cc3fb9f3ad75d6f5db35855d6f129b8b2fb2d9f5
304304

‎ios/Runner/DebugProfile.entitlements‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>keychain-access-groups</key>
6+
<array/>
7+
</dict>
8+
</plist>

‎ios/Runner/Release.entitlements‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>keychain-access-groups</key>
6+
<array/>
7+
</dict>
8+
</plist>

‎lib/core/storage/migrations/004_legacy/migration01to02.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import 'package:lwk/lwk.dart' as lwk;
1919

2020
Future<void> doMigration0_1to0_2() async {
2121
try {
22-
final secureStorageDatasource = MigrationSecureStorageDatasource();
22+
final secureStorageDatasource = locator<MigrationSecureStorageDatasource>();
2323
final hiveDatasource = locator<OldHiveDatasource>();
2424
final oldSeedRepository = OldSeedRepository(secureStorageDatasource);
2525

‎lib/core/storage/migrations/004_legacy/migration02to03.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import 'package:bb_mobile/locator.dart';
1212
import 'package:boltz/boltz.dart';
1313

1414
Future<void> doMigration0_2to0_3() async {
15-
final secureStorageDatasource = MigrationSecureStorageDatasource();
15+
final secureStorageDatasource = locator<MigrationSecureStorageDatasource>();
1616
final hiveDatasource = locator<OldHiveDatasource>();
1717
final oldWalletRepository = OldWalletRepository(hiveDatasource);
1818

‎lib/core/storage/migrations/004_legacy/migration03to04.dart‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import 'package:bb_mobile/core/storage/migrations/005_hive_to_sqlite/old/entities/old_storage_keys.dart';
22
import 'package:bb_mobile/core/storage/migrations/005_hive_to_sqlite/secure_storage_datasource.dart';
3+
import 'package:bb_mobile/locator.dart';
34

45
Future<void> doMigration0_3to0_4() async {
5-
final secureStorageDatasource = MigrationSecureStorageDatasource();
6+
final secureStorageDatasource = locator<MigrationSecureStorageDatasource>();
67

78
await secureStorageDatasource.store(
89
key: OldStorageKeys.version.name,

‎lib/core/storage/migrations/005_hive_to_sqlite/old/old_hive_datasource.dart‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import 'dart:convert';
22

33
import 'package:bb_mobile/core/storage/migrations/005_hive_to_sqlite/old/entities/old_storage_keys.dart';
4-
import 'package:bb_mobile/core/storage/secure_storage.dart';
4+
import 'package:flutter_secure_storage/flutter_secure_storage.dart';
55
import 'package:hive/hive.dart' show Box, Hive, HiveAesCipher;
66
import 'package:path_provider/path_provider.dart'
77
show getApplicationDocumentsDirectory;
@@ -11,10 +11,9 @@ class OldHiveDatasource {
1111

1212
OldHiveDatasource(this.box);
1313

14-
static Future<Box> getBox() async {
14+
static Future<Box> getBox(FlutterSecureStorage secureStorage) async {
1515
final dir = await getApplicationDocumentsDirectory();
1616
Hive.init(dir.path);
17-
final secureStorage = SecureStorage.init();
1817
final password = await secureStorage.read(
1918
key: OldStorageKeys.hiveEncryption.name,
2019
);

‎lib/core/storage/migrations/005_hive_to_sqlite/secure_storage_datasource.dart‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
import 'dart:convert';
22

33
import 'package:bb_mobile/core/storage/migrations/005_hive_to_sqlite/old/entities/old_seed.dart';
4-
import 'package:bb_mobile/core/storage/secure_storage.dart';
54
import 'package:flutter_secure_storage/flutter_secure_storage.dart';
65

76
class MigrationSecureStorageDatasource {
87
final FlutterSecureStorage _storage;
98

10-
MigrationSecureStorageDatasource() : _storage = SecureStorage.init();
9+
MigrationSecureStorageDatasource(this._storage);
1110

1211
Future<void> store({required String key, required String value}) async {
1312
await _storage.write(key: key, value: value);

‎lib/core/storage/secure_storage.dart‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎lib/core/storage/storage_locator.dart‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,26 @@ import 'package:bb_mobile/core/storage/migrations/005_hive_to_sqlite/old/old_see
1010
import 'package:bb_mobile/core/storage/migrations/005_hive_to_sqlite/old/old_wallet_repository.dart';
1111
import 'package:bb_mobile/core/storage/migrations/005_hive_to_sqlite/secure_storage_datasource.dart';
1212
import 'package:bb_mobile/core/storage/requires_migration_usecase.dart';
13-
import 'package:bb_mobile/core/storage/secure_storage.dart';
1413
import 'package:bb_mobile/core/swaps/data/repository/boltz_swap_repository.dart';
1514
import 'package:bb_mobile/core/utils/constants.dart';
1615
import 'package:bb_mobile/core/wallet/data/repositories/wallet_repository.dart';
16+
import 'package:flutter_secure_storage/flutter_secure_storage.dart';
1717
import 'package:get_it/get_it.dart';
1818

1919
class StorageLocator {
2020
static Future<void> registerDatasources(GetIt locator) async {
21+
const secureStorage = FlutterSecureStorage(
22+
aOptions: AndroidOptions(encryptedSharedPreferences: true),
23+
// iOptions: IOSOptions(accessibility: KeychainAccessibility.first_unlock),
24+
);
2125
locator.registerLazySingleton<KeyValueStorageDatasource<String>>(
22-
() => SecureStorageDatasourceImpl(SecureStorage.init()),
26+
() => SecureStorageDatasourceImpl(secureStorage),
2327
instanceName: LocatorInstanceNameConstants.secureStorageDatasource,
2428
);
2529
locator.registerLazySingleton<MigrationSecureStorageDatasource>(
26-
() => MigrationSecureStorageDatasource(),
30+
() => MigrationSecureStorageDatasource(secureStorage),
2731
);
28-
final oldHiveBox = await OldHiveDatasource.getBox();
32+
final oldHiveBox = await OldHiveDatasource.getBox(secureStorage);
2933
locator.registerLazySingleton<OldHiveDatasource>(
3034
() => OldHiveDatasource(oldHiveBox),
3135
);
@@ -64,7 +68,8 @@ class StorageLocator {
6468
() => GetAllSeedsUsecase(seedRepository: locator<SeedRepository>()),
6569
);
6670
locator.registerFactory<MigrateToV4LegacyUsecase>(
67-
() => MigrateToV4LegacyUsecase(MigrationSecureStorageDatasource()),
71+
() =>
72+
MigrateToV4LegacyUsecase(locator<MigrationSecureStorageDatasource>()),
6873
);
6974
locator.registerFactory<RequiresMigrationUsecase>(
7075
() => RequiresMigrationUsecase(

0 commit comments

Comments
 (0)