From e33cc00266c2119c5dcae1fc575e515d7b90b7ff Mon Sep 17 00:00:00 2001 From: Imran Remtulla Date: Sun, 14 May 2023 13:42:09 -0400 Subject: [PATCH] Make all sources override-eligible to account for subdomains --- lib/app_sources/codeberg.dart | 1 - lib/app_sources/fdroidrepo.dart | 1 - lib/app_sources/github.dart | 1 - lib/app_sources/gitlab.dart | 1 - lib/app_sources/html.dart | 4 ---- lib/app_sources/jenkins.dart | 1 - lib/app_sources/sourceforge.dart | 1 - lib/app_sources/sourcehut.dart | 1 - lib/pages/add_app.dart | 6 ++---- lib/providers/source_provider.dart | 1 - 10 files changed, 2 insertions(+), 16 deletions(-) diff --git a/lib/app_sources/codeberg.dart b/lib/app_sources/codeberg.dart index 8b1e3d3..f94cdb9 100644 --- a/lib/app_sources/codeberg.dart +++ b/lib/app_sources/codeberg.dart @@ -7,7 +7,6 @@ import 'package:obtainium/providers/source_provider.dart'; class Codeberg extends AppSource { Codeberg() { host = 'codeberg.org'; - overrideEligible = true; additionalSourceSpecificSettingFormItems = []; diff --git a/lib/app_sources/fdroidrepo.dart b/lib/app_sources/fdroidrepo.dart index e19b34a..9bf2931 100644 --- a/lib/app_sources/fdroidrepo.dart +++ b/lib/app_sources/fdroidrepo.dart @@ -7,7 +7,6 @@ import 'package:obtainium/providers/source_provider.dart'; class FDroidRepo extends AppSource { FDroidRepo() { name = tr('fdroidThirdPartyRepo'); - overrideEligible = true; additionalSourceAppSpecificSettingFormItems = [ [ diff --git a/lib/app_sources/github.dart b/lib/app_sources/github.dart index 54c1242..a34bda2 100644 --- a/lib/app_sources/github.dart +++ b/lib/app_sources/github.dart @@ -13,7 +13,6 @@ import 'package:url_launcher/url_launcher_string.dart'; class GitHub extends AppSource { GitHub() { host = 'github.com'; - overrideEligible = true; additionalSourceSpecificSettingFormItems = [ GeneratedFormTextField('github-creds', diff --git a/lib/app_sources/gitlab.dart b/lib/app_sources/gitlab.dart index f53f8af..c6d8a63 100644 --- a/lib/app_sources/gitlab.dart +++ b/lib/app_sources/gitlab.dart @@ -14,7 +14,6 @@ import 'package:url_launcher/url_launcher_string.dart'; class GitLab extends AppSource { GitLab() { host = 'gitlab.com'; - overrideEligible = true; canSearch = true; additionalSourceSpecificSettingFormItems = [ diff --git a/lib/app_sources/html.dart b/lib/app_sources/html.dart index c6ec9e2..7b69ade 100644 --- a/lib/app_sources/html.dart +++ b/lib/app_sources/html.dart @@ -85,10 +85,6 @@ bool _isNumeric(String s) { } class HTML extends AppSource { - HTML() { - overrideEligible = true; - } - @override // TODO: implement requestHeaders choice, hardcoded for now Map? get requestHeaders => { diff --git a/lib/app_sources/jenkins.dart b/lib/app_sources/jenkins.dart index b628814..2aa8853 100644 --- a/lib/app_sources/jenkins.dart +++ b/lib/app_sources/jenkins.dart @@ -6,7 +6,6 @@ import 'package:obtainium/providers/source_provider.dart'; class Jenkins extends AppSource { Jenkins() { - overrideEligible = true; overrideVersionDetectionFormDefault('releaseDateAsVersion', true); } diff --git a/lib/app_sources/sourceforge.dart b/lib/app_sources/sourceforge.dart index 794eef1..3253926 100644 --- a/lib/app_sources/sourceforge.dart +++ b/lib/app_sources/sourceforge.dart @@ -6,7 +6,6 @@ import 'package:obtainium/providers/source_provider.dart'; class SourceForge extends AppSource { SourceForge() { host = 'sourceforge.net'; - overrideEligible = true; } @override diff --git a/lib/app_sources/sourcehut.dart b/lib/app_sources/sourcehut.dart index 756fadc..d74fd7c 100644 --- a/lib/app_sources/sourcehut.dart +++ b/lib/app_sources/sourcehut.dart @@ -9,7 +9,6 @@ import 'package:easy_localization/easy_localization.dart'; class SourceHut extends AppSource { SourceHut() { host = 'git.sr.ht'; - overrideEligible = true; additionalSourceAppSpecificSettingFormItems = [ [ diff --git a/lib/pages/add_app.dart b/lib/pages/add_app.dart index ac85b10..c439f30 100644 --- a/lib/pages/add_app.dart +++ b/lib/pages/add_app.dart @@ -321,10 +321,8 @@ class _AddAppPageState extends State { 'overrideSource', defaultValue: HTML().runtimeType.toString(), [ - ...sourceProvider.sources - .where((s) => s.overrideEligible) - .map((s) => - MapEntry(s.runtimeType.toString(), s.name)) + ...sourceProvider.sources.map( + (s) => MapEntry(s.runtimeType.toString(), s.name)) ], label: tr('overrideSource')) ] diff --git a/lib/providers/source_provider.dart b/lib/providers/source_provider.dart index 6fc9902..d980e3c 100644 --- a/lib/providers/source_provider.dart +++ b/lib/providers/source_provider.dart @@ -317,7 +317,6 @@ abstract class AppSource { late String name; bool enforceTrackOnly = false; bool changeLogIfAnyIsMarkDown = true; - bool overrideEligible = false; AppSource() { name = runtimeType.toString();