Merge pull request #240 from ImranR98/dev

APK RegEx Filter, Increased GitHub/Codeberg Release Range, UI Tweaks
Addresses #237, #238.

README.md

@@ -9,6 +9,7 @@ Motivation: [Side Of Burritos - You should use this instead of F-Droid | How to
 Currently supported App sources:
 - [GitHub](https://github.com/)
 - [GitLab](https://gitlab.com/)
+- [Codeberg](https://codeberg.org/)
 - [F-Droid](https://f-droid.org/)
 - [IzzyOnDroid](https://android.izzysoft.de/)
 - [Mullvad](https://mullvad.net/en/)
@@ -18,6 +19,8 @@ Currently supported App sources:
 - Third Party F-Droid Repos
   - Any URLs ending with `/fdroid/<word>`, where `<word>` can be anything - most often `repo`
 - [Steam](https://store.steampowered.com/mobile)
+- "HTML" (Fallback)
+  - Any other URL that returns an HTML page with links to APK files (if multiple, the last file alphabetically is picked)
 
 ## Limitations
 - App installs happen asynchronously and the success/failure of an install cannot be determined directly. This results in install statuses and versions sometimes being out of sync with the OS until the next launch or until the problem is manually corrected.

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
   <background android:drawable="@color/ic_launcher_background"/>
   <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+  <monochrome android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>

assets/translations/de.json

@@ -211,6 +211,7 @@
     "language": "Sprache",
     "storagePermissionDenied": "Storage permission denied",
     "selectedCategorizeWarning": "This will replace any existing category settings for the selected Apps.",
+    "filterAPKsByRegEx": "Filter APKs by Regular Expression",
     "tooManyRequestsTryAgainInMinutes": {
         "one": "Zu viele Anfragen (Rate begrenzt) - versuchen Sie es in {} Minute erneut",
         "other": "Zu viele Anfragen (Rate begrenzt) - versuchen Sie es in {} Minuten erneut"

assets/translations/en.json

@@ -211,6 +211,7 @@
     "language": "Language",
     "storagePermissionDenied": "Storage permission denied",
     "selectedCategorizeWarning": "This will replace any existing category settings for the selected Apps.",
+    "filterAPKsByRegEx": "Filter APKs by Regular Expression",
     "tooManyRequestsTryAgainInMinutes": {
         "one": "Too many requests (rate limited) - try again in {} minute",
         "other": "Too many requests (rate limited) - try again in {} minutes"

assets/translations/hu.json

@@ -207,9 +207,10 @@
     "categoryDeleteWarning": "A(z) {} összes app kategorizálatlan állapotba kerül.",
     "addCategory": "Új kategória",
     "label": "Címke",
-    "language": "Language",
-    "storagePermissionDenied": "Storage permission denied",
-    "selectedCategorizeWarning": "This will replace any existing category settings for the selected Apps.",
+    "language": "Nyelv",
+    "storagePermissionDenied": "Tárhely engedély megtagadva",
+    "selectedCategorizeWarning": "Ez felváltja a kiválasztott alkalmazások meglévő kategória-beállításait.",
+    "filterAPKsByRegEx": "Filter APKs by Regular Expression",
     "tooManyRequestsTryAgainInMinutes": {
         "one": "Túl sok kérés (korlátozott arány) – próbálja újra {} perc múlva",
         "other": "Túl sok kérés (korlátozott arány) – próbálja újra {} perc múlva"

assets/translations/it.json

@@ -211,6 +211,7 @@
     "language": "Lingua",
     "storagePermissionDenied": "Storage permission denied",
     "selectedCategorizeWarning": "This will replace any existing category settings for the selected Apps.",
+    "filterAPKsByRegEx": "Filter APKs by Regular Expression",
     "tooManyRequestsTryAgainInMinutes": {
         "one": "Troppe richieste (traffico limitato) - riprova tra {} minuto",
         "other": "Troppe richieste (traffico limitato) - riprova tra {} minuti"

assets/translations/ja.json

@@ -209,8 +209,9 @@
     "addCategory": "カテゴリを追加",
     "label": "ラベル",
     "language": "言語",
-    "storagePermissionDenied": "Storage permission denied",
-    "selectedCategorizeWarning": "This will replace any existing category settings for the selected Apps.",
+    "storagePermissionDenied": "ストレージ権限が拒否されました",
+    "selectedCategorizeWarning": "これにより、選択したアプリの既存のカテゴリ設定がすべて置き換えられます。",
+    "filterAPKsByRegEx": "Filter APKs by Regular Expression",
     "tooManyRequestsTryAgainInMinutes": {
         "one": "リクエストが多すぎます（レート制限）- {}分後に再試行してください",
         "other": "リクエストが多すぎます（レート制限）- {}分後に再試行してください"

assets/translations/zh.json

@@ -211,6 +211,7 @@
     "language": "语言",
     "storagePermissionDenied": "存储权限已被拒绝",
     "selectedCategorizeWarning": "这将取代所选应用程序的任何现有类别",
+    "filterAPKsByRegEx": "Filter APKs by Regular Expression",
     "tooManyRequestsTryAgainInMinutes": {
         "one": "请求过多 (API 限制) - 在 {} 分钟后重试",
         "other": "请求过多 (API 限制) - 在 {} 分钟后重试"

lib/app_sources/codeberg.dart

@@ -0,0 +1,149 @@
+import 'dart:convert';
+import 'package:easy_localization/easy_localization.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';
+
+class Codeberg extends AppSource {
+  Codeberg() {
+    host = 'codeberg.org';
+
+    additionalSourceSpecificSettingFormItems = [];
+
+    additionalSourceAppSpecificSettingFormItems = [
+      [
+        GeneratedFormSwitch('includePrereleases',
+            label: tr('includePrereleases'), defaultValue: false)
+      ],
+      [
+        GeneratedFormSwitch('fallbackToOlderReleases',
+            label: tr('fallbackToOlderReleases'), defaultValue: true)
+      ],
+      [
+        GeneratedFormTextField('filterReleaseTitlesByRegEx',
+            label: tr('filterReleaseTitlesByRegEx'),
+            required: false,
+            additionalValidators: [
+              (value) {
+                return regExValidator(value);
+              }
+            ])
+      ]
+    ];
+
+    canSearch = true;
+  }
+
+  @override
+  String standardizeURL(String url) {
+    RegExp standardUrlRegEx = RegExp('^https?://$host/[^/]+/[^/]+');
+    RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
+    if (match == null) {
+      throw InvalidURLError(name);
+    }
+    return url.substring(0, match.end);
+  }
+
+  @override
+  String? changeLogPageFromStandardUrl(String standardUrl) =>
+      '$standardUrl/releases';
+
+  @override
+  Future<APKDetails> getLatestAPKDetails(
+    String standardUrl,
+    Map<String, dynamic> additionalSettings,
+  ) async {
+    bool includePrereleases = additionalSettings['includePrereleases'];
+    bool fallbackToOlderReleases =
+        additionalSettings['fallbackToOlderReleases'];
+    String? regexFilter =
+        (additionalSettings['filterReleaseTitlesByRegEx'] as String?)
+                    ?.isNotEmpty ==
+                true
+            ? additionalSettings['filterReleaseTitlesByRegEx']
+            : null;
+    Response res = await get(Uri.parse(
+        'https://$host/api/v1/repos${standardUrl.substring('https://$host'.length)}/releases?per_page=100'));
+    if (res.statusCode == 200) {
+      var releases = jsonDecode(res.body) as List<dynamic>;
+
+      List<String> getReleaseAPKUrls(dynamic release) =>
+          (release['assets'] as List<dynamic>?)
+              ?.map((e) {
+                return e['name'] != null && e['browser_download_url'] != null
+                    ? MapEntry(e['name'] as String,
+                        e['browser_download_url'] as String)
+                    : const MapEntry('', '');
+              })
+              .where((element) => element.key.toLowerCase().endsWith('.apk'))
+              .map((e) => e.value)
+              .toList() ??
+          [];
+
+      dynamic targetRelease;
+
+      for (int i = 0; i < releases.length; i++) {
+        if (!fallbackToOlderReleases && i > 0) break;
+        if (!includePrereleases && releases[i]['prerelease'] == true) {
+          continue;
+        }
+        if (releases[i]['draft'] == true) {
+          // Draft releases not supported
+        }
+        var nameToFilter = releases[i]['name'] as String?;
+        if (nameToFilter == null || nameToFilter.trim().isEmpty) {
+          // Some leave titles empty so tag is used
+          nameToFilter = releases[i]['tag_name'] as String;
+        }
+        if (regexFilter != null &&
+            !RegExp(regexFilter).hasMatch(nameToFilter.trim())) {
+          continue;
+        }
+        var apkUrls = getReleaseAPKUrls(releases[i]);
+        if (apkUrls.isEmpty && additionalSettings['trackOnly'] != true) {
+          continue;
+        }
+        targetRelease = releases[i];
+        targetRelease['apkUrls'] = apkUrls;
+        break;
+      }
+      if (targetRelease == null) {
+        throw NoReleasesError();
+      }
+      String? version = targetRelease['tag_name'];
+      if (version == null) {
+        throw NoVersionError();
+      }
+      return APKDetails(version, targetRelease['apkUrls'] as List<String>,
+          getAppNames(standardUrl));
+    } else {
+      throw getObtainiumHttpError(res);
+    }
+  }
+
+  AppNames getAppNames(String standardUrl) {
+    String temp = standardUrl.substring(standardUrl.indexOf('://') + 3);
+    List<String> names = temp.substring(temp.indexOf('/') + 1).split('/');
+    return AppNames(names[0], names[1]);
+  }
+
+  @override
+  Future<Map<String, String>> search(String query) async {
+    Response res = await get(Uri.parse(
+        'https://$host/api/v1/repos/search?q=${Uri.encodeQueryComponent(query)}&limit=100'));
+    if (res.statusCode == 200) {
+      Map<String, String> urlsWithDescriptions = {};
+      for (var e in (jsonDecode(res.body)['data'] as List<dynamic>)) {
+        urlsWithDescriptions.addAll({
+          e['html_url'] as String: e['description'] != null
+              ? e['description'] as String
+              : tr('noDescription')
+        });
+      }
+      return urlsWithDescriptions;
+    } else {
+      throw getObtainiumHttpError(res);
+    }
+  }
+}

lib/app_sources/github.dart

@@ -65,15 +65,7 @@ class GitHub extends AppSource {
             required: false,
             additionalValidators: [
               (value) {
-                if (value == null || value.isEmpty) {
-                  return null;
-                }
-                try {
-                  RegExp(value);
-                } catch (e) {
-                  return tr('invalidRegEx');
-                }
-                return null;
+                return regExValidator(value);
               }
             ])
       ]
@@ -119,7 +111,7 @@ class GitHub extends AppSource {
             ? additionalSettings['filterReleaseTitlesByRegEx']
             : null;
     Response res = await get(Uri.parse(
-        'https://${await getCredentialPrefixIfAny()}api.$host/repos${standardUrl.substring('https://$host'.length)}/releases'));
+        'https://${await getCredentialPrefixIfAny()}api.$host/repos${standardUrl.substring('https://$host'.length)}/releases?per_page=100'));
     if (res.statusCode == 200) {
       var releases = jsonDecode(res.body) as List<dynamic>;
 
@@ -141,10 +133,13 @@ class GitHub extends AppSource {
         if (!includePrereleases && releases[i]['prerelease'] == true) {
           continue;
         }
-
+        var nameToFilter = releases[i]['name'] as String?;
+        if (nameToFilter == null || nameToFilter.trim().isEmpty) {
+          // Some leave titles empty so tag is used
+          nameToFilter = releases[i]['tag_name'] as String;
+        }
         if (regexFilter != null &&
-            !RegExp(regexFilter)
-                .hasMatch((releases[i]['name'] as String).trim())) {
+            !RegExp(regexFilter).hasMatch(nameToFilter.trim())) {
           continue;
         }
         var apkUrls = getReleaseAPKUrls(releases[i]);

lib/app_sources/html.dart

@@ -0,0 +1,47 @@
+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';
+
+class HTML extends AppSource {
+  @override
+  String standardizeURL(String url) {
+    return url;
+  }
+
+  @override
+  String? changeLogPageFromStandardUrl(String standardUrl) => null;
+
+  @override
+  Future<APKDetails> getLatestAPKDetails(
+    String standardUrl,
+    Map<String, dynamic> additionalSettings,
+  ) async {
+    var uri = Uri.parse(standardUrl);
+    Response res = await get(uri);
+    if (res.statusCode == 200) {
+      List<String> links = parse(res.body)
+          .querySelectorAll('a')
+          .map((element) => element.attributes['href'] ?? '')
+          .where((element) => element.toLowerCase().endsWith('.apk'))
+          .toList();
+      links.sort((a, b) => a.split('/').last.compareTo(b.split('/').last));
+      if (links.isEmpty) {
+        throw NoReleasesError();
+      }
+      var rel = links.last;
+      var apkName = rel.split('/').last;
+      var version = apkName.substring(0, apkName.length - 4);
+      List<String> apkUrls = [rel]
+          .map((e) => e.toLowerCase().startsWith('http://') ||
+                  e.toLowerCase().startsWith('https://')
+              ? e
+              : '${uri.origin}/$e')
+          .toList();
+      return APKDetails(version, apkUrls, AppNames(uri.host, tr('app')));
+    } else {
+      throw getObtainiumHttpError(res);
+    }
+  }
+}

lib/custom_errors.dart

@@ -29,7 +29,7 @@ class NoReleasesError extends ObtainiumError {
 }
 
 class NoAPKError extends ObtainiumError {
-  NoAPKError() : super(tr('noReleaseFound'));
+  NoAPKError() : super(tr('noAPKFound'));
 }
 
 class NoVersionError extends ObtainiumError {

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.9.14';
+const String currentVersion = '0.10.5';
 const String currentReleaseTag =
     'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES
 

lib/pages/add_app.dart

@@ -24,6 +24,7 @@ class AddAppPage extends StatefulWidget {
 
 class _AddAppPageState extends State<AddAppPage> {
   bool gettingAppInfo = false;
+  bool searching = false;
 
   String userInput = '';
   String searchQuery = '';
@@ -37,6 +38,8 @@ class _AddAppPageState extends State<AddAppPage> {
     SourceProvider sourceProvider = SourceProvider();
     AppsProvider appsProvider = context.read<AppsProvider>();
 
+    bool doingSomething = gettingAppInfo || searching;
+
     changeUserInput(String input, bool valid, bool isBuilding) {
       userInput = input;
       if (!isBuilding) {
@@ -67,6 +70,7 @@ class _AddAppPageState extends State<AddAppPage> {
             additionalSettings['noVersionDetection'] == true;
         var cont = true;
         if ((userPickedTrackOnly || pickedSource!.enforceTrackOnly) &&
+            // ignore: use_build_context_synchronously
             await showDialog(
                     context: context,
                     builder: (BuildContext ctx) {
@@ -85,6 +89,7 @@ class _AddAppPageState extends State<AddAppPage> {
           cont = false;
         }
         if (userPickedNoVersionDetection &&
+            // ignore: use_build_context_synchronously
             await showDialog(
                     context: context,
                     builder: (BuildContext ctx) {
@@ -198,7 +203,7 @@ class _AddAppPageState extends State<AddAppPage> {
                           gettingAppInfo
                               ? const CircularProgressIndicator()
                               : ElevatedButton(
-                                  onPressed: gettingAppInfo ||
+                                  onPressed: doingSomething ||
                                           pickedSource == null ||
                                           (pickedSource!
                                                   .combinedAppSpecificSettingFormItems
@@ -249,9 +254,12 @@ class _AddAppPageState extends State<AddAppPage> {
                               width: 16,
                             ),
                             ElevatedButton(
-                                onPressed: searchQuery.isEmpty || gettingAppInfo
+                                onPressed: searchQuery.isEmpty || doingSomething
                                     ? null
                                     : () {
+                                        setState(() {
+                                          searching = true;
+                                        });
                                         Future.wait(sourceProvider.sources
                                                 .where((e) => e.canSearch)
                                                 .map((e) =>
@@ -293,6 +301,10 @@ class _AddAppPageState extends State<AddAppPage> {
                                           }
                                         }).catchError((e) {
                                           showError(e, context);
+                                        }).whenComplete(() {
+                                          setState(() {
+                                            searching = false;
+                                          });
                                         });
                                       },
                                 child: Text(tr('search')))

lib/pages/app.dart

@@ -317,7 +317,7 @@ class _AppPageState extends State<AppPage> {
                               tooltip: tr('more')),
                         const SizedBox(width: 16.0),
                         Expanded(
-                            child: ElevatedButton(
+                            child: TextButton(
                                 onPressed: (app?.app.installedVersion == null ||
                                             app?.app.installedVersion !=
                                                 app?.app.latestVersion) &&
@@ -356,7 +356,8 @@ class _AppPageState extends State<AppPage> {
                                         ? tr('update')
                                         : tr('markUpdated')))),
                         const SizedBox(width: 16.0),
-                        ElevatedButton(
+                        Expanded(
+                            child: TextButton(
                           onPressed: app?.downloadProgress != null
                               ? null
                               : () {
@@ -401,7 +402,7 @@ class _AppPageState extends State<AppPage> {
                               surfaceTintColor:
                                   Theme.of(context).colorScheme.error),
                           child: Text(tr('remove')),
-                        ),
+                        )),
                       ])),
               if (app?.downloadProgress != null)
                 Padding(

lib/pages/apps.dart

@@ -344,13 +344,15 @@ class AppsPageState extends State<AppsPage> {
                   ));
             }, childCount: sortedApps.length))
           ])),
-      persistentFooterButtons: [
+      persistentFooterButtons: appsProvider.apps.isEmpty
+          ? null
+          : [
               Row(
                 children: [
                   selectedApps.isEmpty
                       ? TextButton.icon(
-                    style:
-                        const ButtonStyle(visualDensity: VisualDensity.compact),
+                          style: const ButtonStyle(
+                              visualDensity: VisualDensity.compact),
                           onPressed: () {
                             selectThese(sortedApps.map((e) => e.app).toList());
                           },
@@ -360,11 +362,12 @@ class AppsPageState extends State<AppsPage> {
                           ),
                           label: Text(sortedApps.length.toString()))
                       : TextButton.icon(
-                    style:
-                        const ButtonStyle(visualDensity: VisualDensity.compact),
+                          style: const ButtonStyle(
+                              visualDensity: VisualDensity.compact),
                           onPressed: () {
                             selectedApps.isEmpty
-                          ? selectThese(sortedApps.map((e) => e.app).toList())
+                                ? selectThese(
+                                    sortedApps.map((e) => e.app).toList())
                                 : clearSelected();
                           },
                           icon: Icon(
@@ -390,15 +393,15 @@ class AppsPageState extends State<AppsPage> {
                                             context: context,
                                             builder: (BuildContext ctx) {
                                               return GeneratedFormModal(
-                                          title:
-                                              tr('removeSelectedAppsQuestion'),
+                                                title: tr(
+                                                    'removeSelectedAppsQuestion'),
                                                 items: const [],
                                                 initValid: true,
                                                 message: tr(
                                                     'xWillBeRemovedButRemainInstalled',
                                                     args: [
-                                                plural(
-                                                    'apps', selectedApps.length)
+                                                      plural('apps',
+                                                          selectedApps.length)
                                                     ]),
                                               );
                                             }).then((values) {
@@ -414,14 +417,19 @@ class AppsPageState extends State<AppsPage> {
                               ),
                               IconButton(
                                   visualDensity: VisualDensity.compact,
-                            onPressed: appsProvider.areDownloadsRunning() ||
-                                    (existingUpdateIdsAllOrSelected.isEmpty &&
-                                        newInstallIdsAllOrSelected.isEmpty &&
-                                        trackOnlyUpdateIdsAllOrSelected.isEmpty)
+                                  onPressed: appsProvider
+                                              .areDownloadsRunning() ||
+                                          (existingUpdateIdsAllOrSelected
+                                                  .isEmpty &&
+                                              newInstallIdsAllOrSelected
+                                                  .isEmpty &&
+                                              trackOnlyUpdateIdsAllOrSelected
+                                                  .isEmpty)
                                       ? null
                                       : () {
                                           HapticFeedback.heavyImpact();
-                                    List<GeneratedFormItem> formItems = [];
+                                          List<GeneratedFormItem> formItems =
+                                              [];
                                           if (existingUpdateIdsAllOrSelected
                                               .isNotEmpty) {
                                             formItems.add(GeneratedFormSwitch(
@@ -434,7 +442,8 @@ class AppsPageState extends State<AppsPage> {
                                                 ]),
                                                 defaultValue: true));
                                           }
-                                    if (newInstallIdsAllOrSelected.isNotEmpty) {
+                                          if (newInstallIdsAllOrSelected
+                                              .isNotEmpty) {
                                             formItems.add(GeneratedFormSwitch(
                                                 'installs',
                                                 label: tr('installX', args: [
@@ -451,7 +460,8 @@ class AppsPageState extends State<AppsPage> {
                                               .isNotEmpty) {
                                             formItems.add(GeneratedFormSwitch(
                                                 'trackonlies',
-                                          label: tr('markXTrackOnlyAsUpdated',
+                                                label: tr(
+                                                    'markXTrackOnlyAsUpdated',
                                                     args: [
                                                       plural(
                                                           'apps',
@@ -467,8 +477,8 @@ class AppsPageState extends State<AppsPage> {
                                           showDialog<Map<String, dynamic>?>(
                                               context: context,
                                               builder: (BuildContext ctx) {
-                                          var totalApps =
-                                              existingUpdateIdsAllOrSelected.length +
+                                                var totalApps = existingUpdateIdsAllOrSelected
+                                                        .length +
                                                     newInstallIdsAllOrSelected
                                                         .length +
                                                     trackOnlyUpdateIdsAllOrSelected
@@ -560,7 +570,8 @@ class AppsPageState extends State<AppsPage> {
                                             cont = await showDialog<
                                                         Map<String, dynamic>?>(
                                                     context: context,
-                                              builder: (BuildContext ctx) {
+                                                    builder:
+                                                        (BuildContext ctx) {
                                                       return GeneratedFormModal(
                                                         title: tr('categorize'),
                                                         items: const [],
@@ -572,7 +583,9 @@ class AppsPageState extends State<AppsPage> {
                                                 null;
                                           }
                                           if (cont) {
-                                      await showDialog<Map<String, dynamic>?>(
+                                            // ignore: use_build_context_synchronously
+                                            await showDialog<
+                                                    Map<String, dynamic>?>(
                                                 context: context,
                                                 builder: (BuildContext ctx) {
                                                   return GeneratedFormModal(
@@ -586,11 +599,15 @@ class AppsPageState extends State<AppsPage> {
                                                         preselected: !showPrompt
                                                             ? preselected ?? {}
                                                             : {},
-                                                  showLabelWhenNotEmpty: false,
-                                                  onSelected: (categories) {
+                                                        showLabelWhenNotEmpty:
+                                                            false,
+                                                        onSelected:
+                                                            (categories) {
                                                           appsProvider.saveApps(
-                                                        selectedApps.map((e) {
-                                                      e.categories = categories;
+                                                              selectedApps
+                                                                  .map((e) {
+                                                            e.categories =
+                                                                categories;
                                                             return e;
                                                           }).toList());
                                                         },
@@ -618,7 +635,8 @@ class AppsPageState extends State<AppsPage> {
                                                 scrollable: true,
                                                 content: Padding(
                                                   padding:
-                                                const EdgeInsets.only(top: 6),
+                                                      const EdgeInsets.only(
+                                                          top: 6),
                                                   child: Row(
                                                       mainAxisAlignment:
                                                           MainAxisAlignment
@@ -636,30 +654,23 @@ class AppsPageState extends State<AppsPage> {
                                                                             (BuildContext
                                                                                 ctx) {
                                                                           return AlertDialog(
-                                                                      title: Text(tr(
-                                                                          'markXSelectedAppsAsUpdated',
-                                                                          args: [
+                                                                            title:
+                                                                                Text(tr('markXSelectedAppsAsUpdated', args: [
                                                                               selectedApps.length.toString()
                                                                             ])),
                                                                             content:
                                                                                 Text(
                                                                               tr('onlyWorksWithNonEVDApps'),
-                                                                        style: const TextStyle(
-                                                                            fontWeight:
-                                                                                FontWeight.bold,
-                                                                            fontStyle: FontStyle.italic),
+                                                                              style: const TextStyle(fontWeight: FontWeight.bold, fontStyle: FontStyle.italic),
                                                                             ),
                                                                             actions: [
                                                                               TextButton(
-                                                                            onPressed:
-                                                                                () {
+                                                                                  onPressed: () {
                                                                                     Navigator.of(context).pop();
                                                                                   },
-                                                                            child:
-                                                                                Text(tr('no'))),
+                                                                                  child: Text(tr('no'))),
                                                                               TextButton(
-                                                                            onPressed:
-                                                                                () {
+                                                                                  onPressed: () {
                                                                                     HapticFeedback.selectionClick();
                                                                                     appsProvider.saveApps(selectedApps.map((a) {
                                                                                       if (a.installedVersion != null) {
@@ -670,8 +681,7 @@ class AppsPageState extends State<AppsPage> {
 
                                                                                     Navigator.of(context).pop();
                                                                                   },
-                                                                            child:
-                                                                                Text(tr('yes')))
+                                                                                  child: Text(tr('yes')))
                                                                             ],
                                                                           );
                                                                         }).whenComplete(() {
@@ -686,29 +696,36 @@ class AppsPageState extends State<AppsPage> {
                                                                 Icons.done)),
                                                         IconButton(
                                                           onPressed: () {
-                                                      var pinStatus =
-                                                          selectedApps
+                                                            var pinStatus = selectedApps
                                                                 .where((element) =>
                                                                     element
                                                                         .pinned)
                                                                 .isEmpty;
-                                                      appsProvider.saveApps(
-                                                          selectedApps.map((e) {
-                                                        e.pinned = pinStatus;
+                                                            appsProvider
+                                                                .saveApps(
+                                                                    selectedApps
+                                                                        .map(
+                                                                            (e) {
+                                                              e.pinned =
+                                                                  pinStatus;
                                                               return e;
                                                             }).toList());
-                                                      Navigator.of(context)
+                                                            Navigator.of(
+                                                                    context)
                                                                 .pop();
                                                           },
                                                           tooltip: selectedApps
                                                                   .where((element) =>
-                                                                element.pinned)
+                                                                      element
+                                                                          .pinned)
                                                                   .isEmpty
                                                               ? tr('pinToTop')
-                                                        : tr('unpinFromTop'),
+                                                              : tr(
+                                                                  'unpinFromTop'),
                                                           icon: Icon(selectedApps
                                                                   .where((element) =>
-                                                                element.pinned)
+                                                                      element
+                                                                          .pinned)
                                                                   .isEmpty
                                                               ? Icons
                                                                   .bookmark_outline_rounded
@@ -720,53 +737,63 @@ class AppsPageState extends State<AppsPage> {
                                                             String urls = '';
                                                             for (var a
                                                                 in selectedApps) {
-                                                        urls += '${a.url}\n';
+                                                              urls +=
+                                                                  '${a.url}\n';
                                                             }
-                                                      urls = urls.substring(
-                                                          0, urls.length - 1);
+                                                            urls =
+                                                                urls.substring(
+                                                                    0,
+                                                                    urls.length -
+                                                                        1);
                                                             Share.share(urls,
                                                                 subject: tr(
                                                                     'selectedAppURLsFromObtainium'));
-                                                      Navigator.of(context)
+                                                            Navigator.of(
+                                                                    context)
                                                                 .pop();
                                                           },
                                                           tooltip: tr(
                                                               'shareSelectedAppURLs'),
-                                                    icon:
-                                                        const Icon(Icons.share),
+                                                          icon: const Icon(
+                                                              Icons.share),
                                                         ),
                                                         IconButton(
                                                           onPressed: () {
                                                             showDialog(
-                                                          context: context,
-                                                          builder: (BuildContext
+                                                                context:
+                                                                    context,
+                                                                builder:
+                                                                    (BuildContext
                                                                         ctx) {
                                                                   return GeneratedFormModal(
                                                                     title: tr(
                                                                         'resetInstallStatusForSelectedAppsQuestion'),
                                                                     items: const [],
-                                                              initValid: true,
+                                                                    initValid:
+                                                                        true,
                                                                     message: tr(
                                                                         'installStatusOfXWillBeResetExplanation',
                                                                         args: [
                                                                           plural(
                                                                               'app',
-                                                                        selectedApps
-                                                                            .length)
+                                                                              selectedApps.length)
                                                                         ]),
                                                                   );
                                                                 }).then((values) {
-                                                        if (values != null) {
+                                                              if (values !=
+                                                                  null) {
                                                                 appsProvider.saveApps(
                                                                     selectedApps
-                                                                  .map((e) {
+                                                                        .map(
+                                                                            (e) {
                                                                   e.installedVersion =
                                                                       null;
                                                                   return e;
                                                                 }).toList());
                                                               }
                                                             }).whenComplete(() {
-                                                        Navigator.of(context)
+                                                              Navigator.of(
+                                                                      context)
                                                                   .pop();
                                                             });
                                                           },
@@ -807,11 +834,9 @@ class AppsPageState extends State<AppsPage> {
                       color: Theme.of(context).colorScheme.primary,
                     ),
                   ),
-            appsProvider.apps.isEmpty
-                ? const SizedBox()
-                : TextButton.icon(
-                    style:
-                        const ButtonStyle(visualDensity: VisualDensity.compact),
+                  TextButton.icon(
+                      style: const ButtonStyle(
+                          visualDensity: VisualDensity.compact),
                       label: Text(
                         filter.isIdenticalTo(neutralFilter, settingsProvider)
                             ? tr('filter')
@@ -859,7 +884,8 @@ class AppsPageState extends State<AppsPage> {
                                   CategoryEditorSelector(
                                     preselected: filter.categoryFilter,
                                     onSelected: (categories) {
-                                    filter.categoryFilter = categories.toSet();
+                                      filter.categoryFilter =
+                                          categories.toSet();
                                     },
                                   )
                                 ],

lib/pages/settings.dart

@@ -4,10 +4,8 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:obtainium/components/custom_app_bar.dart';
 import 'package:obtainium/components/generated_form.dart';
-import 'package:obtainium/components/generated_form_modal.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/main.dart';
-import 'package:obtainium/providers/apps_provider.dart';
 import 'package:obtainium/providers/logs_provider.dart';
 import 'package:obtainium/providers/settings_provider.dart';
 import 'package:obtainium/providers/source_provider.dart';

lib/providers/apps_provider.dart

@@ -247,10 +247,7 @@ class AppsProvider with ChangeNotifier {
         !(await canDowngradeApps())) {
       throw DowngradeError();
     }
-    if (appInfo == null ||
-        int.parse(newInfo.buildNumber) > appInfo.versionCode!) {
     await InstallPlugin.installApk(file.file.path, 'dev.imranr.obtainium');
-    }
     apps[file.appId]!.app.installedVersion =
         apps[file.appId]!.app.latestVersion;
     // Don't correct install status as installation may not be done yet
@@ -265,6 +262,7 @@ class AppsProvider with ChangeNotifier {
     List<String> archs = (await DeviceInfoPlugin().androidInfo).supportedAbis;
 
     if (app.apkUrls.length > 1 && context != null) {
+      // ignore: use_build_context_synchronously
       apkUrl = await showDialog(
           context: context,
           builder: (BuildContext ctx) {
@@ -284,6 +282,7 @@ class AppsProvider with ChangeNotifier {
     if (apkUrl != null &&
         getHost(apkUrl) != getHost(app.url) &&
         context != null) {
+      // ignore: use_build_context_synchronously
       if (await showDialog(
               context: context,
               builder: (BuildContext ctx) {

lib/providers/source_provider.dart

@@ -7,11 +7,13 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:html/dom.dart';
 import 'package:http/http.dart';
 import 'package:obtainium/app_sources/apkmirror.dart';
+import 'package:obtainium/app_sources/codeberg.dart';
 import 'package:obtainium/app_sources/fdroid.dart';
 import 'package:obtainium/app_sources/fdroidrepo.dart';
 import 'package:obtainium/app_sources/github.dart';
 import 'package:obtainium/app_sources/gitlab.dart';
 import 'package:obtainium/app_sources/izzyondroid.dart';
+import 'package:obtainium/app_sources/html.dart';
 import 'package:obtainium/app_sources/mullvad.dart';
 import 'package:obtainium/app_sources/signal.dart';
 import 'package:obtainium/app_sources/sourceforge.dart';
@@ -19,7 +21,6 @@ import 'package:obtainium/app_sources/steammobile.dart';
 import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/mass_app_sources/githubstars.dart';
-import 'package:obtainium/providers/settings_provider.dart';
 
 class AppNames {
   late String author;
@@ -154,6 +155,10 @@ class App {
 
 // Ensure the input is starts with HTTPS and has no WWW
 preStandardizeUrl(String url) {
+  var firstDotIndex = url.indexOf('.');
+  if (!(firstDotIndex >= 0 && firstDotIndex != url.length - 1)) {
+    throw UnsupportedURLError();
+  }
   if (url.toLowerCase().indexOf('http://') != 0 &&
       url.toLowerCase().indexOf('https://') != 0) {
     url = 'https://$url';
@@ -220,7 +225,19 @@ class AppSource {
         label: tr('trackOnly'),
       )
     ],
-    [GeneratedFormSwitch('noVersionDetection', label: tr('noVersionDetection'))]
+    [
+      GeneratedFormSwitch('noVersionDetection', label: tr('noVersionDetection'))
+    ],
+    [
+      GeneratedFormTextField('apkFilterRegEx',
+          label: tr('filterAPKsByRegEx'),
+          required: false,
+          additionalValidators: [
+            (value) {
+              return regExValidator(value);
+            }
+          ])
+    ]
   ];
 
   // Previous 2 variables combined into one at runtime for convenient usage
@@ -264,11 +281,24 @@ abstract class MassAppUrlSource {
   Future<Map<String, String>> getUrlsWithDescriptions(List<String> args);
 }
 
+regExValidator(String? value) {
+  if (value == null || value.isEmpty) {
+    return null;
+  }
+  try {
+    RegExp(value);
+  } catch (e) {
+    return tr('invalidRegEx');
+  }
+  return null;
+}
+
 class SourceProvider {
   // Add more source classes here so they are available via the service
   List<AppSource> sources = [
     GitHub(),
     GitLab(),
+    Codeberg(),
     FDroid(),
     IzzyOnDroid(),
     Mullvad(),
@@ -276,7 +306,8 @@ class SourceProvider {
     SourceForge(),
     APKMirror(),
     FDroidRepo(),
-    SteamMobile()
+    SteamMobile(),
+    HTML() // This should ALWAYS be the last option as they are tried in order
   ];
 
   // Add more mass url source classes here so they are available via the service
@@ -337,10 +368,13 @@ class SourceProvider {
   }
 
   Future<App> getApp(
-      AppSource source, String url, Map<String, dynamic> additionalSettings,
-      {App? currentApp,
+    AppSource source,
+    String url,
+    Map<String, dynamic> additionalSettings, {
+    App? currentApp,
     bool trackOnlyOverride = false,
-      noVersionDetectionOverride = false}) async {
+    noVersionDetectionOverride = false,
+  }) async {
     if (trackOnlyOverride || source.enforceTrackOnly) {
       additionalSettings['trackOnly'] = true;
     }
@@ -351,6 +385,11 @@ class SourceProvider {
     String standardUrl = source.standardizeURL(preStandardizeUrl(url));
     APKDetails apk =
         await source.getLatestAPKDetails(standardUrl, additionalSettings);
+    if (additionalSettings['apkFilterRegEx'] != null) {
+      var reg = RegExp(additionalSettings['apkFilterRegEx']);
+      apk.apkUrls =
+          apk.apkUrls.where((element) => reg.hasMatch(element)).toList();
+    }
     if (apk.apkUrls.isEmpty && !trackOnly) {
       throw NoAPKError();
     }

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.9.14+104 # When changing this, update the tag in main() accordingly
+version: 0.10.5+111 # When changing this, update the tag in main() accordingly
 
 environment:
   sdk: '>=2.18.2 <3.0.0'