From bb4f34317b6a8a6d08c7dc0a5b550321ca0c3f24 Mon Sep 17 00:00:00 2001 From: Imran Remtulla Date: Mon, 21 Aug 2023 23:55:54 -0400 Subject: [PATCH] Bugfix + version increment + update packages --- lib/main.dart | 17 +++++++++-------- pubspec.lock | 34 +++++++++++++++++++++------------- pubspec.yaml | 2 +- 3 files changed, 31 insertions(+), 22 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index 1b59a7f..a6130f0 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -21,7 +21,7 @@ import 'package:easy_localization/src/easy_localization_controller.dart'; // ignore: implementation_imports import 'package:easy_localization/src/localization.dart'; -const String currentVersion = '0.13.26'; +const String currentVersion = '0.13.27'; const String currentReleaseTag = 'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES @@ -82,7 +82,7 @@ Future bgUpdateCheckApps(int taskId, Map? params) async { AppsProvider appsProvider = AppsProvider(); await appsProvider.loadApps(); - logs.add('BG update master task started.'); + logs.add('BG update parent task started.'); var appIds = appsProvider.getAppsSortedByUpdateCheckTime(); for (var id in appIds) { AndroidAlarmManager.oneShot( @@ -90,7 +90,8 @@ Future bgUpdateCheckApps(int taskId, Map? params) async { params: {'appId': id}); await Future.delayed(const Duration(seconds: 1)); } - logs.add('BG update master task - all $appIds child tasks started.'); + logs.add( + 'BG update parent task ended (${appIds.length} child task(s) started).'); } @pragma('vm:entry-point') @@ -107,10 +108,8 @@ Future bgUpdateCheckApp(int taskId, Map? params) async { String appId = params!['appId']; params['attemptCount'] = (params['attemptCount'] ?? 0) + 1; int maxAttempts = 5; - if (params['attemptCount'] > 1) { - logs.add( - 'BG update check for $appId: Note this is attempt #${params['attemptCount']} of $maxAttempts'); - } + logs.add( + 'BG update task for $appId started (attempt #${params['attemptCount']}).'); try { await appsProvider.loadApps(singleId: appId); AppInMemory app = appsProvider.apps[appId]!; @@ -153,6 +152,9 @@ Future bgUpdateCheckApp(int taskId, Map? params) async { notificationsProvider.notify(ErrorCheckingUpdatesNotification( '$appId: ${e.toString()}', id: appId.hashCode * 20)); + } finally { + logs.add( + 'BG update task for $appId ended (attempt #${params['attemptCount']}).'); } } @@ -253,7 +255,6 @@ class _ObtainiumState extends State { Duration(minutes: existingUpdateInterval), bgUpdateCheckAlarmId, bgUpdateCheckApps, - allowWhileIdle: true, rescheduleOnReboot: true, wakeup: true); } diff --git a/pubspec.lock b/pubspec.lock index ffb90fa..fd01871 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -111,10 +111,10 @@ packages: dependency: transitive description: name: collection - sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" + sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 url: "https://pub.dev" source: hosted - version: "1.17.1" + version: "1.17.2" convert: dependency: transitive description: @@ -379,10 +379,10 @@ packages: dependency: transitive description: name: intl - sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6 + sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" url: "https://pub.dev" source: hosted - version: "0.18.0" + version: "0.18.1" js: dependency: transitive description: @@ -419,18 +419,18 @@ packages: dependency: transitive description: name: matcher - sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" + sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" url: "https://pub.dev" source: hosted - version: "0.12.15" + version: "0.12.16" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "0.5.0" meta: dependency: transitive description: @@ -672,10 +672,10 @@ packages: dependency: transitive description: name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" sqflite: dependency: "direct main" description: @@ -736,10 +736,10 @@ packages: dependency: transitive description: name: test_api - sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb + sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" url: "https://pub.dev" source: hosted - version: "0.5.1" + version: "0.6.0" timezone: dependency: transitive description: @@ -836,6 +836,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" + web: + dependency: transitive + description: + name: web + sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + url: "https://pub.dev" + source: hosted + version: "0.1.4-beta" webview_flutter: dependency: "direct main" description: @@ -909,5 +917,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.0.0 <4.0.0" + dart: ">=3.1.0-185.0.dev <4.0.0" flutter: ">=3.10.0" diff --git a/pubspec.yaml b/pubspec.yaml index 551bf12..f107cb0 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -17,7 +17,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # In Windows, build-name is used as the major, minor, and patch parts # of the product and file versions while build-number is used as the build suffix. -version: 0.13.26+190 # When changing this, update the tag in main() accordingly +version: 0.13.27+191 # When changing this, update the tag in main() accordingly environment: sdk: '>=2.18.2 <3.0.0'