From 01121ddc62d49d9644380f13aba0e4871bbd4e4c Mon Sep 17 00:00:00 2001 From: Neeraj Gupta <254676+ua741@users.noreply.github.com> Date: Sun, 6 Nov 2022 11:38:24 +0530 Subject: [PATCH 1/3] Billing: Remove redundant future --- lib/services/billing_service.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/services/billing_service.dart b/lib/services/billing_service.dart index 65462ec97..10a51382d 100644 --- a/lib/services/billing_service.dart +++ b/lib/services/billing_service.dart @@ -38,7 +38,7 @@ class BillingService { Future _future; - Future init() async { + void init() { // if (Platform.isIOS && kDebugMode) { // await FlutterInappPurchase.instance.initConnection; // FlutterInappPurchase.instance.clearTransactionIOS(); From 709e2a0085e3b6522b7af021823001a1852eee3f Mon Sep 17 00:00:00 2001 From: Neeraj Gupta <254676+ua741@users.noreply.github.com> Date: Sun, 6 Nov 2022 11:44:46 +0530 Subject: [PATCH 2/3] Remove unncessary awaits by passing pref --- lib/main.dart | 31 +++++++++++---------- lib/services/collections_service.dart | 4 +-- lib/services/local_file_update_service.dart | 4 +-- lib/services/local_sync_service.dart | 4 +-- lib/services/memories_service.dart | 2 +- lib/services/remote_sync_service.dart | 4 +-- lib/services/search_service.dart | 2 +- lib/services/sync_service.dart | 4 +-- lib/services/trash_sync_service.dart | 4 +-- lib/utils/file_uploader.dart | 4 +-- lib/utils/local_settings.dart | 4 +-- 11 files changed, 34 insertions(+), 33 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index cebd83c39..208d679a1 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -123,8 +123,9 @@ void _headlessTaskHandler(HeadlessTask task) { Future _init(bool isBackground, {String via = ''}) async { _isProcessRunning = true; _logger.info("Initializing... inBG =$isBackground via: $via"); + final SharedPreferences preferences = await SharedPreferences.getInstance(); await _logFGHeartBeatInfo(); - _scheduleHeartBeat(isBackground); + _scheduleHeartBeat(preferences, isBackground); if (isBackground) { AppLifecycleService.instance.onAppInBackground('init via: $via'); } else { @@ -137,17 +138,17 @@ Future _init(bool isBackground, {String via = ''}) async { await UserService.instance.init(); await UserRemoteFlagService.instance.init(); await UpdateService.instance.init(); - await BillingService.instance.init(); - await CollectionsService.instance.init(); - await FileUploader.instance.init(isBackground); - await LocalSyncService.instance.init(); - await TrashSyncService.instance.init(); - await RemoteSyncService.instance.init(); - await SyncService.instance.init(); - await MemoriesService.instance.init(); - await LocalSettings.instance.init(); - await LocalFileUpdateService.instance.init(); - await SearchService.instance.init(); + BillingService.instance.init(); + await CollectionsService.instance.init(preferences); + await FileUploader.instance.init(preferences, isBackground); + await LocalSyncService.instance.init(preferences); + TrashSyncService.instance.init(preferences); + RemoteSyncService.instance.init(preferences); + await SyncService.instance.init(preferences); + MemoriesService.instance.init(); + LocalSettings.instance.init(preferences); + LocalFileUpdateService.instance.init(preferences); + SearchService.instance.init(); if (Platform.isIOS) { PushService.instance.init().then((_) { FirebaseMessaging.onBackgroundMessage( @@ -186,14 +187,14 @@ Future _runWithLogs(Function() function, {String prefix = ""}) async { ); } -Future _scheduleHeartBeat(bool isBackground) async { - final prefs = await SharedPreferences.getInstance(); +Future _scheduleHeartBeat( + SharedPreferences prefs, bool isBackground) async { await prefs.setInt( isBackground ? kLastBGTaskHeartBeatTime : kLastFGTaskHeartBeatTime, DateTime.now().microsecondsSinceEpoch, ); Future.delayed(kHeartBeatFrequency, () async { - _scheduleHeartBeat(isBackground); + _scheduleHeartBeat(prefs, isBackground); }); } diff --git a/lib/services/collections_service.dart b/lib/services/collections_service.dart index 5761d870f..a37034d0f 100644 --- a/lib/services/collections_service.dart +++ b/lib/services/collections_service.dart @@ -62,8 +62,8 @@ class CollectionsService { static final CollectionsService instance = CollectionsService._privateConstructor(); - Future init() async { - _prefs = await SharedPreferences.getInstance(); + Future init(SharedPreferences preferences) async { + _prefs = preferences; final collections = await _db.getAllCollections(); for (final collection in collections) { diff --git a/lib/services/local_file_update_service.dart b/lib/services/local_file_update_service.dart index 097fc9f8f..30a836ea1 100644 --- a/lib/services/local_file_update_service.dart +++ b/lib/services/local_file_update_service.dart @@ -28,8 +28,8 @@ class LocalFileUpdateService { _fileUpdationDB = FileUpdationDB.instance; } - Future init() async { - _prefs = await SharedPreferences.getInstance(); + void init(SharedPreferences preferences) async { + _prefs = preferences; } static LocalFileUpdateService instance = diff --git a/lib/services/local_sync_service.dart b/lib/services/local_sync_service.dart index b9137e96b..6221a8d13 100644 --- a/lib/services/local_sync_service.dart +++ b/lib/services/local_sync_service.dart @@ -47,8 +47,8 @@ class LocalSyncService { static final LocalSyncService instance = LocalSyncService._privateConstructor(); - Future init() async { - _prefs = await SharedPreferences.getInstance(); + Future init(SharedPreferences preferences) async { + _prefs = preferences; if (!AppLifecycleService.instance.isForeground) { await PhotoManager.setIgnorePermissionCheck(true); } diff --git a/lib/services/memories_service.dart b/lib/services/memories_service.dart index 4253ad0bb..551bfe66b 100644 --- a/lib/services/memories_service.dart +++ b/lib/services/memories_service.dart @@ -25,7 +25,7 @@ class MemoriesService extends ChangeNotifier { static final MemoriesService instance = MemoriesService._privateConstructor(); - Future init() async { + void init() { addListener(() { _cachedMemories = null; }); diff --git a/lib/services/remote_sync_service.dart b/lib/services/remote_sync_service.dart index 5b1f3195c..ac21db57d 100644 --- a/lib/services/remote_sync_service.dart +++ b/lib/services/remote_sync_service.dart @@ -65,8 +65,8 @@ class RemoteSyncService { RemoteSyncService._privateConstructor(); - Future init() async { - _prefs = await SharedPreferences.getInstance(); + void init(SharedPreferences preferences) { + _prefs = preferences; Bus.instance.on().listen((event) async { if (event.type == EventType.addedOrUpdated) { diff --git a/lib/services/search_service.dart b/lib/services/search_service.dart index e5b737de4..57fee2d69 100644 --- a/lib/services/search_service.dart +++ b/lib/services/search_service.dart @@ -32,7 +32,7 @@ class SearchService { static final SearchService instance = SearchService._privateConstructor(); - Future init() async { + void init() { Bus.instance.on().listen((event) { // only invalidate, let the load happen on demand _cachedFilesFuture = null; diff --git a/lib/services/sync_service.dart b/lib/services/sync_service.dart index efc014f13..a3671394f 100644 --- a/lib/services/sync_service.dart +++ b/lib/services/sync_service.dart @@ -60,8 +60,8 @@ class SyncService { static final SyncService instance = SyncService._privateConstructor(); - Future init() async { - _prefs = await SharedPreferences.getInstance(); + Future init(SharedPreferences preferences) async { + _prefs = preferences; if (Platform.isIOS) { _logger.info("Clearing file cache"); await PhotoManager.clearFileCache(); diff --git a/lib/services/trash_sync_service.dart b/lib/services/trash_sync_service.dart index e97856cbd..9062d4ea5 100644 --- a/lib/services/trash_sync_service.dart +++ b/lib/services/trash_sync_service.dart @@ -32,8 +32,8 @@ class TrashSyncService { TrashSyncService._privateConstructor(); final _enteDio = Network.instance.enteDio; - Future init() async { - _prefs = await SharedPreferences.getInstance(); + void init(SharedPreferences preferences) { + _prefs = preferences; } Future syncTrash() async { diff --git a/lib/utils/file_uploader.dart b/lib/utils/file_uploader.dart index 9869f99f3..0d5d2a4b3 100644 --- a/lib/utils/file_uploader.dart +++ b/lib/utils/file_uploader.dart @@ -70,8 +70,8 @@ class FileUploader { } static FileUploader instance = FileUploader._privateConstructor(); - Future init(bool isBackground) async { - _prefs = await SharedPreferences.getInstance(); + Future init(SharedPreferences preferences, bool isBackground) async { + _prefs = preferences; _isBackground = isBackground; _processType = isBackground ? ProcessType.background : ProcessType.foreground; diff --git a/lib/utils/local_settings.dart b/lib/utils/local_settings.dart index c254b0dc9..790d7a3b5 100644 --- a/lib/utils/local_settings.dart +++ b/lib/utils/local_settings.dart @@ -13,8 +13,8 @@ class LocalSettings { static const kCollectionSortPref = "collection_sort_pref"; late SharedPreferences _prefs; - Future init() async { - _prefs = await SharedPreferences.getInstance(); + void init(SharedPreferences preferences) { + _prefs = preferences; } AlbumSortKey albumSortKey() { From b6688d46460f2b8cf5b99f871adfe087eadf0229 Mon Sep 17 00:00:00 2001 From: Neeraj Gupta <254676+ua741@users.noreply.github.com> Date: Sun, 6 Nov 2022 11:54:10 +0530 Subject: [PATCH 3/3] minor fix --- lib/services/local_file_update_service.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/services/local_file_update_service.dart b/lib/services/local_file_update_service.dart index 30a836ea1..45883032c 100644 --- a/lib/services/local_file_update_service.dart +++ b/lib/services/local_file_update_service.dart @@ -28,7 +28,7 @@ class LocalFileUpdateService { _fileUpdationDB = FileUpdationDB.instance; } - void init(SharedPreferences preferences) async { + void init(SharedPreferences preferences) { _prefs = preferences; }