diff --git a/lib/app_sources/apkcombo.dart b/lib/app_sources/apkcombo.dart index 6c5dfa6..16e21c5 100644 --- a/lib/app_sources/apkcombo.dart +++ b/lib/app_sources/apkcombo.dart @@ -1,6 +1,5 @@ import 'package:easy_localization/easy_localization.dart'; import 'package:html/parser.dart'; -import 'package:http/http.dart'; import 'package:obtainium/custom_errors.dart'; import 'package:obtainium/providers/source_provider.dart'; @@ -85,7 +84,6 @@ class APKCombo extends AppSource { Map additionalSettings, ) async { String appId = tryInferringAppId(standardUrl)!; - String host = Uri.parse(standardUrl).host; var preres = await sourceRequest(standardUrl); if (preres.statusCode != 200) { throw getObtainiumHttpError(preres); diff --git a/lib/app_sources/apkpure.dart b/lib/app_sources/apkpure.dart index 1ab017d..20028a4 100644 --- a/lib/app_sources/apkpure.dart +++ b/lib/app_sources/apkpure.dart @@ -1,6 +1,5 @@ import 'package:easy_localization/easy_localization.dart'; import 'package:html/parser.dart'; -import 'package:http/http.dart'; import 'package:obtainium/custom_errors.dart'; import 'package:obtainium/providers/source_provider.dart'; diff --git a/lib/app_sources/codeberg.dart b/lib/app_sources/codeberg.dart index d50332d..5938ec2 100644 --- a/lib/app_sources/codeberg.dart +++ b/lib/app_sources/codeberg.dart @@ -1,6 +1,4 @@ -import 'dart:convert'; import 'package:easy_localization/easy_localization.dart'; -import 'package:http/http.dart'; import 'package:obtainium/app_sources/github.dart'; import 'package:obtainium/components/generated_form.dart'; import 'package:obtainium/custom_errors.dart'; diff --git a/lib/app_sources/fdroidrepo.dart b/lib/app_sources/fdroidrepo.dart index 184e139..e19b34a 100644 --- a/lib/app_sources/fdroidrepo.dart +++ b/lib/app_sources/fdroidrepo.dart @@ -1,6 +1,5 @@ import 'package:easy_localization/easy_localization.dart'; import 'package:html/parser.dart'; -import 'package:http/http.dart'; import 'package:obtainium/components/generated_form.dart'; import 'package:obtainium/custom_errors.dart'; import 'package:obtainium/providers/source_provider.dart'; diff --git a/lib/app_sources/gitlab.dart b/lib/app_sources/gitlab.dart index ae65875..f53f8af 100644 --- a/lib/app_sources/gitlab.dart +++ b/lib/app_sources/gitlab.dart @@ -83,12 +83,12 @@ class GitLab extends AppSource { } var json = jsonDecode(res.body) as List; Map> results = {}; - json.forEach((element) { + for (var element in json) { results['https://$host/${element['path_with_namespace']}'] = [ element['name_with_namespace'], element['description'] ?? tr('noDescription') ]; - }); + } return results; } diff --git a/lib/app_sources/izzyondroid.dart b/lib/app_sources/izzyondroid.dart index cdab17a..1773558 100644 --- a/lib/app_sources/izzyondroid.dart +++ b/lib/app_sources/izzyondroid.dart @@ -1,4 +1,3 @@ -import 'package:http/http.dart'; import 'package:obtainium/app_sources/fdroid.dart'; import 'package:obtainium/custom_errors.dart'; import 'package:obtainium/providers/source_provider.dart'; diff --git a/lib/app_sources/jenkins.dart b/lib/app_sources/jenkins.dart index 804b3fb..b628814 100644 --- a/lib/app_sources/jenkins.dart +++ b/lib/app_sources/jenkins.dart @@ -10,7 +10,6 @@ class Jenkins extends AppSource { overrideVersionDetectionFormDefault('releaseDateAsVersion', true); } - @override String trimJobUrl(String url) { RegExp standardUrlRegEx = RegExp('.*/job/[^/]+'); RegExpMatch? match = standardUrlRegEx.firstMatch(url); diff --git a/lib/app_sources/sourcehut.dart b/lib/app_sources/sourcehut.dart index b85758f..6277486 100644 --- a/lib/app_sources/sourcehut.dart +++ b/lib/app_sources/sourcehut.dart @@ -1,6 +1,5 @@ import 'package:html/parser.dart'; import 'package:http/http.dart'; -import 'package:obtainium/app_sources/github.dart'; import 'package:obtainium/app_sources/html.dart'; import 'package:obtainium/custom_errors.dart'; import 'package:obtainium/providers/source_provider.dart'; @@ -58,7 +57,6 @@ class SourceHut extends AppSource { throw NoVersionError(); } String? releaseDateString = entry.querySelector('pubDate')?.innerHtml; - var link = entry.querySelector('link'); String releasePage = '$standardUrl/refs/$version'; DateTime? releaseDate = releaseDateString != null ? DateFormat('EEE, dd MMM yyyy HH:mm:ss Z').parse(releaseDateString) diff --git a/lib/app_sources/vlc.dart b/lib/app_sources/vlc.dart index 06ad878..c531f26 100644 --- a/lib/app_sources/vlc.dart +++ b/lib/app_sources/vlc.dart @@ -1,6 +1,5 @@ import 'package:html/parser.dart'; import 'package:http/http.dart'; -import 'package:obtainium/app_sources/html.dart'; import 'package:obtainium/custom_errors.dart'; import 'package:obtainium/providers/source_provider.dart'; diff --git a/lib/pages/app.dart b/lib/pages/app.dart index b7585c8..3e2e993 100644 --- a/lib/pages/app.dart +++ b/lib/pages/app.dart @@ -32,6 +32,7 @@ class _AppPageState extends State { getUpdate(String id) { appsProvider.checkUpdate(id).catchError((e) { showError(e, context); + return null; }); } diff --git a/lib/pages/apps.dart b/lib/pages/apps.dart index 37fa60c..72cdfbc 100644 --- a/lib/pages/apps.dart +++ b/lib/pages/apps.dart @@ -71,6 +71,7 @@ class AppsPageState extends State { }); return appsProvider.checkUpdates().catchError((e) { showError(e, context); + return []; }).whenComplete(() { setState(() { refreshingSince = null; @@ -379,6 +380,7 @@ class AppsPageState extends State { [listedApps[appIndex].app.id], globalNavigatorKey.currentContext).catchError((e) { showError(e, context); + return []; }); }, icon: Icon( @@ -681,6 +683,7 @@ class AppsPageState extends State { settingsProvider: settingsProvider) .catchError((e) { showError(e, context); + return []; }); } }); diff --git a/lib/pages/import_export.dart b/lib/pages/import_export.dart index 7a896c9..fd10f86 100644 --- a/lib/pages/import_export.dart +++ b/lib/pages/import_export.dart @@ -323,8 +323,8 @@ class _ImportExportPageState extends State { ], ), if (importInProgress) - Column( - children: const [ + const Column( + children: [ SizedBox( height: 14, ), diff --git a/lib/providers/source_provider.dart b/lib/providers/source_provider.dart index f498496..6fc9902 100644 --- a/lib/providers/source_provider.dart +++ b/lib/providers/source_provider.dart @@ -7,7 +7,6 @@ import 'package:device_info_plus/device_info_plus.dart'; import 'package:easy_localization/easy_localization.dart'; import 'package:html/dom.dart'; import 'package:http/http.dart'; -import 'package:obtainium/app_sources/apkcombo.dart'; import 'package:obtainium/app_sources/apkmirror.dart'; import 'package:obtainium/app_sources/apkpure.dart'; import 'package:obtainium/app_sources/codeberg.dart';