Compare commits

...

4 Commits

Author SHA1 Message Date
52ce5b19c4 More informative errors for mass update checking 2022-10-11 11:53:20 -04:00
03f0b6cf05 Fixed sort order (was reversed asc/desc)
Also changed default sort to nameAuthor ascending
2022-10-09 15:26:51 -04:00
5d8d0de8de Slightly more efficient JSON importing (tiny difference) 2022-10-08 17:31:08 -04:00
07f6d4ad2c Fixed custom App name issue 2022-10-08 12:26:08 -04:00
5 changed files with 28 additions and 9 deletions

View File

@ -14,7 +14,7 @@ import 'package:dynamic_color/dynamic_color.dart';
import 'package:device_info_plus/device_info_plus.dart'; import 'package:device_info_plus/device_info_plus.dart';
const String currentReleaseTag = const String currentReleaseTag =
'v0.5.6-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES 'v0.5.9-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES
const String bgUpdateCheckTaskName = 'bg-update-check'; const String bgUpdateCheckTaskName = 'bg-update-check';

View File

@ -114,7 +114,7 @@ class AppsPageState extends State<AppsPage> {
return result; return result;
}); });
if (settingsProvider.sortOrder == SortOrderSettings.ascending) { if (settingsProvider.sortOrder == SortOrderSettings.descending) {
sortedApps = sortedApps.reversed.toList(); sortedApps = sortedApps.reversed.toList();
} }

View File

@ -313,7 +313,8 @@ class AppsProvider with ChangeNotifier {
App newApp = await sourceProvider.getApp( App newApp = await sourceProvider.getApp(
sourceProvider.getSource(currentApp.url), sourceProvider.getSource(currentApp.url),
currentApp.url, currentApp.url,
currentApp.additionalData); currentApp.additionalData,
customName: currentApp.name);
newApp.installedVersion = currentApp.installedVersion; newApp.installedVersion = currentApp.installedVersion;
if (currentApp.preferredApkIndex < newApp.apkUrls.length) { if (currentApp.preferredApkIndex < newApp.apkUrls.length) {
newApp.preferredApkIndex = currentApp.preferredApkIndex; newApp.preferredApkIndex = currentApp.preferredApkIndex;
@ -324,6 +325,7 @@ class AppsProvider with ChangeNotifier {
Future<List<App>> checkUpdates({DateTime? ignoreAfter}) async { Future<List<App>> checkUpdates({DateTime? ignoreAfter}) async {
List<App> updates = []; List<App> updates = [];
Map<String, List<String>> errors = {};
if (!gettingUpdates) { if (!gettingUpdates) {
gettingUpdates = true; gettingUpdates = true;
@ -339,14 +341,31 @@ class AppsProvider with ChangeNotifier {
DateTime.fromMicrosecondsSinceEpoch(0)) DateTime.fromMicrosecondsSinceEpoch(0))
.compareTo(apps[b]!.app.lastUpdateCheck ?? .compareTo(apps[b]!.app.lastUpdateCheck ??
DateTime.fromMicrosecondsSinceEpoch(0))); DateTime.fromMicrosecondsSinceEpoch(0)));
for (int i = 0; i < appIds.length; i++) { for (int i = 0; i < appIds.length; i++) {
App? newApp = await getUpdate(appIds[i]); App? newApp;
try {
newApp = await getUpdate(appIds[i]);
} catch (e) {
var tempIds = errors.remove(e.toString());
tempIds ??= [];
tempIds.add(appIds[i]);
errors.putIfAbsent(e.toString(), () => tempIds!);
}
if (newApp != null) { if (newApp != null) {
updates.add(newApp); updates.add(newApp);
} }
} }
gettingUpdates = false; gettingUpdates = false;
} }
if (errors.isNotEmpty) {
String finalError = '';
for (var e in errors.keys) {
finalError +=
'$e ${errors[e]!.map((e) => apps[e]!.app.name).toString()}. ';
}
throw finalError;
}
return updates; return updates;
} }
@ -391,8 +410,8 @@ class AppsProvider with ChangeNotifier {
for (App a in importedApps) { for (App a in importedApps) {
a.installedVersion = a.installedVersion =
apps.containsKey(a.id) ? apps[a]?.app.installedVersion : null; apps.containsKey(a.id) ? apps[a]?.app.installedVersion : null;
await saveApps([a]);
} }
await saveApps(importedApps);
notifyListeners(); notifyListeners();
return importedApps.length; return importedApps.length;
} }

View File

@ -74,8 +74,8 @@ class SettingsProvider with ChangeNotifier {
} }
SortColumnSettings get sortColumn { SortColumnSettings get sortColumn {
return SortColumnSettings return SortColumnSettings.values[
.values[prefs?.getInt('sortColumn') ?? SortColumnSettings.added.index]; prefs?.getInt('sortColumn') ?? SortColumnSettings.nameAuthor.index];
} }
set sortColumn(SortColumnSettings s) { set sortColumn(SortColumnSettings s) {
@ -85,7 +85,7 @@ class SettingsProvider with ChangeNotifier {
SortOrderSettings get sortOrder { SortOrderSettings get sortOrder {
return SortOrderSettings.values[ return SortOrderSettings.values[
prefs?.getInt('sortOrder') ?? SortOrderSettings.descending.index]; prefs?.getInt('sortOrder') ?? SortOrderSettings.ascending.index];
} }
set sortOrder(SortOrderSettings s) { set sortOrder(SortOrderSettings s) {

View File

@ -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 # 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 # 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. # of the product and file versions while build-number is used as the build suffix.
version: 0.5.6+27 # When changing this, update the tag in main() accordingly version: 0.5.9+30 # When changing this, update the tag in main() accordingly
environment: environment:
sdk: '>=2.19.0-79.0.dev <3.0.0' sdk: '>=2.19.0-79.0.dev <3.0.0'