Merge pull request #232 from ImranR98/dev

GitHub (and Codeberg) bugfix (#231)

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.

assets/translations/hu.json

@@ -207,9 +207,9 @@
     "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.",
     "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/ja.json

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

lib/app_sources/codeberg.dart

@@ -0,0 +1,157 @@
+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) {
+                if (value == null || value.isEmpty) {
+                  return null;
+                }
+                try {
+                  RegExp(value);
+                } catch (e) {
+                  return tr('invalidRegEx');
+                }
+                return null;
+              }
+            ])
+      ]
+    ];
+
+    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'));
+    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

@@ -15,6 +15,7 @@ class GitHub extends AppSource {
     additionalSourceSpecificSettingFormItems = [
       GeneratedFormTextField('github-creds',
           label: tr('githubPATLabel'),
+          password: true,
           required: false,
           additionalValidators: [
             (value) {
@@ -140,10 +141,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/components/generated_form.dart

@@ -3,7 +3,6 @@ import 'dart:math';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:obtainium/components/generated_form_modal.dart';
-import 'package:obtainium/providers/settings_provider.dart';
 
 abstract class GeneratedFormItem {
   late String key;
@@ -24,6 +23,7 @@ class GeneratedFormTextField extends GeneratedFormItem {
   late bool required;
   late int max;
   late String? hint;
+  late bool password;
 
   GeneratedFormTextField(String key,
       {String label = 'Input',
@@ -32,7 +32,8 @@ class GeneratedFormTextField extends GeneratedFormItem {
       List<String? Function(String? value)> additionalValidators = const [],
       this.required = true,
       this.max = 1,
-      this.hint})
+      this.hint,
+      this.password = false})
       : super(key,
             label: label,
             belowWidgets: belowWidgets,
@@ -129,6 +130,21 @@ class GeneratedForm extends StatefulWidget {
   State<GeneratedForm> createState() => _GeneratedFormState();
 }
 
+// Generates a random light color
+// Courtesy of ChatGPT 😭 (with a bugfix 🥳)
+Color generateRandomLightColor() {
+  // Create a random number generator
+  final Random random = Random();
+
+  // Generate random hue, saturation, and value values
+  final double hue = random.nextDouble() * 360;
+  final double saturation = 0.5 + random.nextDouble() * 0.5;
+  final double value = 0.9 + random.nextDouble() * 0.1;
+
+  // Create a HSV color with the random values
+  return HSVColor.fromAHSV(1.0, hue, saturation, value).toColor();
+}
+
 class _GeneratedFormState extends State<GeneratedForm> {
   final _formKey = GlobalKey<FormState>();
   Map<String, dynamic> values = {};
@@ -153,21 +169,6 @@ class _GeneratedFormState extends State<GeneratedForm> {
     widget.onValueChanges(returnValues, valid, isBuilding);
   }
 
-  // Generates a random light color
-  // Courtesy of ChatGPT 😭 (with a bugfix 🥳)
-  Color generateRandomLightColor() {
-    // Create a random number generator
-    final Random random = Random();
-
-    // Generate random hue, saturation, and value values
-    final double hue = random.nextDouble() * 360;
-    final double saturation = 0.5 + random.nextDouble() * 0.5;
-    final double value = 0.9 + random.nextDouble() * 0.1;
-
-    // Create a HSV color with the random values
-    return HSVColor.fromAHSV(1.0, hue, saturation, value).toColor();
-  }
-
   @override
   void initState() {
     super.initState();
@@ -188,6 +189,9 @@ class _GeneratedFormState extends State<GeneratedForm> {
         if (formItem is GeneratedFormTextField) {
           final formFieldKey = GlobalKey<FormFieldState>();
           return TextFormField(
+            obscureText: formItem.password,
+            autocorrect: !formItem.password,
+            enableSuggestions: !formItem.password,
             key: formFieldKey,
             initialValue: values[formItem.key],
             autovalidateMode: AutovalidateMode.onUserInteraction,

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.13';
+const String currentVersion = '0.10.3';
 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) {
@@ -198,7 +201,7 @@ class _AddAppPageState extends State<AddAppPage> {
                           gettingAppInfo
                               ? const CircularProgressIndicator()
                               : ElevatedButton(
-                                  onPressed: gettingAppInfo ||
+                                  onPressed: doingSomething ||
                                           pickedSource == null ||
                                           (pickedSource!
                                                   .combinedAppSpecificSettingFormItems
@@ -249,9 +252,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 +299,10 @@ class _AddAppPageState extends State<AddAppPage> {
                                           }
                                         }).catchError((e) {
                                           showError(e, context);
+                                        }).whenComplete(() {
+                                          setState(() {
+                                            searching = false;
+                                          });
                                         });
                                       },
                                 child: Text(tr('search')))

lib/pages/apps.dart

@@ -348,8 +348,9 @@ class AppsPageState extends State<AppsPage> {
         Row(
           children: [
             selectedApps.isEmpty
-                ? IconButton(
-                    visualDensity: VisualDensity.compact,
+                ? TextButton.icon(
+                    style:
+                        const ButtonStyle(visualDensity: VisualDensity.compact),
                     onPressed: () {
                       selectThese(sortedApps.map((e) => e.app).toList());
                     },
@@ -357,7 +358,7 @@ class AppsPageState extends State<AppsPage> {
                       Icons.select_all_outlined,
                       color: Theme.of(context).colorScheme.primary,
                     ),
-                    tooltip: tr('selectAll'))
+                    label: Text(sortedApps.length.toString()))
                 : TextButton.icon(
                     style:
                         const ButtonStyle(visualDensity: VisualDensity.compact),
@@ -375,31 +376,36 @@ class AppsPageState extends State<AppsPage> {
                     label: Text(selectedApps.length.toString())),
             const VerticalDivider(),
             Expanded(
+                child: SingleChildScrollView(
+                    scrollDirection: Axis.horizontal,
                     child: Row(
                       mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                       children: [
-                selectedApps.isEmpty
-                    ? const SizedBox()
-                    : IconButton(
+                        IconButton(
                           visualDensity: VisualDensity.compact,
-                        onPressed: () {
+                          onPressed: selectedApps.isEmpty
+                              ? null
+                              : () {
                                   showDialog<Map<String, dynamic>?>(
                                       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) {
                                     if (values != null) {
-                              appsProvider.removeApps(
-                                  selectedApps.map((e) => e.id).toList());
+                                      appsProvider.removeApps(selectedApps
+                                          .map((e) => e.id)
+                                          .toList());
                                     }
                                   });
                                 },
@@ -416,50 +422,71 @@ class AppsPageState extends State<AppsPage> {
                                 : () {
                                     HapticFeedback.heavyImpact();
                                     List<GeneratedFormItem> formItems = [];
-                            if (existingUpdateIdsAllOrSelected.isNotEmpty) {
-                              formItems.add(GeneratedFormSwitch('updates',
+                                    if (existingUpdateIdsAllOrSelected
+                                        .isNotEmpty) {
+                                      formItems.add(GeneratedFormSwitch(
+                                          'updates',
                                           label: tr('updateX', args: [
-                                    plural('apps',
-                                        existingUpdateIdsAllOrSelected.length)
+                                            plural(
+                                                'apps',
+                                                existingUpdateIdsAllOrSelected
+                                                    .length)
                                           ]),
                                           defaultValue: true));
                                     }
                                     if (newInstallIdsAllOrSelected.isNotEmpty) {
-                              formItems.add(GeneratedFormSwitch('installs',
+                                      formItems.add(GeneratedFormSwitch(
+                                          'installs',
                                           label: tr('installX', args: [
-                                    plural('apps',
-                                        newInstallIdsAllOrSelected.length)
+                                            plural(
+                                                'apps',
+                                                newInstallIdsAllOrSelected
+                                                    .length)
                                           ]),
-                                  defaultValue: existingUpdateIdsAllOrSelected
+                                          defaultValue:
+                                              existingUpdateIdsAllOrSelected
                                                   .isNotEmpty));
                                     }
-                            if (trackOnlyUpdateIdsAllOrSelected.isNotEmpty) {
-                              formItems.add(GeneratedFormSwitch('trackonlies',
-                                  label: tr('markXTrackOnlyAsUpdated', args: [
-                                    plural('apps',
-                                        trackOnlyUpdateIdsAllOrSelected.length)
+                                    if (trackOnlyUpdateIdsAllOrSelected
+                                        .isNotEmpty) {
+                                      formItems.add(GeneratedFormSwitch(
+                                          'trackonlies',
+                                          label: tr('markXTrackOnlyAsUpdated',
+                                              args: [
+                                                plural(
+                                                    'apps',
+                                                    trackOnlyUpdateIdsAllOrSelected
+                                                        .length)
                                               ]),
-                                  defaultValue: existingUpdateIdsAllOrSelected
+                                          defaultValue:
+                                              existingUpdateIdsAllOrSelected
                                                       .isNotEmpty ||
-                                      newInstallIdsAllOrSelected.isNotEmpty));
+                                                  newInstallIdsAllOrSelected
+                                                      .isNotEmpty));
                                     }
                                     showDialog<Map<String, dynamic>?>(
                                         context: context,
                                         builder: (BuildContext ctx) {
-                                  var totalApps = existingUpdateIdsAllOrSelected
+                                          var totalApps =
+                                              existingUpdateIdsAllOrSelected.length +
+                                                  newInstallIdsAllOrSelected
                                                       .length +
-                                      newInstallIdsAllOrSelected.length +
-                                      trackOnlyUpdateIdsAllOrSelected.length;
+                                                  trackOnlyUpdateIdsAllOrSelected
+                                                      .length;
                                           return GeneratedFormModal(
-                                    title: tr('changeX',
-                                        args: [plural('apps', totalApps)]),
-                                    items: formItems.map((e) => [e]).toList(),
+                                            title: tr('changeX', args: [
+                                              plural('apps', totalApps)
+                                            ]),
+                                            items: formItems
+                                                .map((e) => [e])
+                                                .toList(),
                                             initValid: true,
                                           );
                                         }).then((values) {
                                       if (values != null) {
                                         if (values.isEmpty) {
-                                  values = getDefaultValuesFromFormItems(
+                                          values =
+                                              getDefaultValuesFromFormItems(
                                                   [formItems]);
                                         }
                                         bool shouldInstallUpdates =
@@ -478,20 +505,22 @@ class AppsPageState extends State<AppsPage> {
                                             .then((_) {
                                           List<String> toInstall = [];
                                           if (shouldInstallUpdates) {
-                                    toInstall
-                                        .addAll(existingUpdateIdsAllOrSelected);
+                                            toInstall.addAll(
+                                                existingUpdateIdsAllOrSelected);
                                           }
                                           if (shouldInstallNew) {
-                                    toInstall
-                                        .addAll(newInstallIdsAllOrSelected);
+                                            toInstall.addAll(
+                                                newInstallIdsAllOrSelected);
                                           }
                                           if (shouldMarkTrackOnlies) {
                                             toInstall.addAll(
                                                 trackOnlyUpdateIdsAllOrSelected);
                                           }
                                           appsProvider
-                                      .downloadAndInstallLatestApps(toInstall,
-                                          globalNavigatorKey.currentContext)
+                                              .downloadAndInstallLatestApps(
+                                                  toInstall,
+                                                  globalNavigatorKey
+                                                      .currentContext)
                                               .catchError((e) {
                                             showError(e, context);
                                           });
@@ -505,16 +534,17 @@ class AppsPageState extends State<AppsPage> {
                             icon: const Icon(
                               Icons.file_download_outlined,
                             )),
-                selectedApps.isEmpty
-                    ? const SizedBox()
-                    : IconButton(
+                        IconButton(
                           visualDensity: VisualDensity.compact,
-                        onPressed: () async {
+                          onPressed: selectedApps.isEmpty
+                              ? null
+                              : () async {
                                   try {
                                     Set<String>? preselected;
                                     var showPrompt = false;
                                     for (var element in selectedApps) {
-                              var currentCats = element.categories.toSet();
+                                      var currentCats =
+                                          element.categories.toSet();
                                       if (preselected == null) {
                                         preselected = currentCats;
                                       } else {
@@ -527,15 +557,16 @@ class AppsPageState extends State<AppsPage> {
                                     }
                                     var cont = true;
                                     if (showPrompt) {
-                              cont = await showDialog<Map<String, dynamic>?>(
+                                      cont = await showDialog<
+                                                  Map<String, dynamic>?>(
                                               context: context,
                                               builder: (BuildContext ctx) {
                                                 return GeneratedFormModal(
                                                   title: tr('categorize'),
                                                   items: const [],
                                                   initValid: true,
-                                          message:
-                                              tr('selectedCategorizeWarning'),
+                                                  message: tr(
+                                                      'selectedCategorizeWarning'),
                                                 );
                                               }) !=
                                           null;
@@ -548,7 +579,8 @@ class AppsPageState extends State<AppsPage> {
                                               title: tr('categorize'),
                                               items: const [],
                                               initValid: true,
-                                      singleNullReturnButton: tr('continue'),
+                                              singleNullReturnButton:
+                                                  tr('continue'),
                                               additionalWidgets: [
                                                 CategoryEditorSelector(
                                                   preselected: !showPrompt
@@ -556,8 +588,8 @@ class AppsPageState extends State<AppsPage> {
                                                       : {},
                                                   showLabelWhenNotEmpty: false,
                                                   onSelected: (categories) {
-                                            appsProvider
-                                                .saveApps(selectedApps.map((e) {
+                                                    appsProvider.saveApps(
+                                                        selectedApps.map((e) {
                                                       e.categories = categories;
                                                       return e;
                                                     }).toList());
@@ -574,30 +606,32 @@ class AppsPageState extends State<AppsPage> {
                           tooltip: tr('categorize'),
                           icon: const Icon(Icons.category_outlined),
                         ),
-                selectedApps.isEmpty
-                    ? const SizedBox()
-                    : IconButton(
+                        IconButton(
                           visualDensity: VisualDensity.compact,
-                        onPressed: () {
+                          onPressed: selectedApps.isEmpty
+                              ? null
+                              : () {
                                   showDialog(
                                       context: context,
                                       builder: (BuildContext ctx) {
                                         return AlertDialog(
                                           scrollable: true,
                                           content: Padding(
-                                    padding: const EdgeInsets.only(top: 6),
+                                            padding:
+                                                const EdgeInsets.only(top: 6),
                                             child: Row(
                                                 mainAxisAlignment:
-                                            MainAxisAlignment.spaceAround,
+                                                    MainAxisAlignment
+                                                        .spaceAround,
                                                 children: [
                                                   IconButton(
-                                              onPressed:
-                                                  appsProvider
+                                                      onPressed: appsProvider
                                                               .areDownloadsRunning()
                                                           ? null
                                                           : () {
                                                               showDialog(
-                                                              context: context,
+                                                                  context:
+                                                                      context,
                                                                   builder:
                                                                       (BuildContext
                                                                           ctx) {
@@ -605,47 +639,39 @@ class AppsPageState extends State<AppsPage> {
                                                                       title: Text(tr(
                                                                           'markXSelectedAppsAsUpdated',
                                                                           args: [
-                                                                        selectedApps
-                                                                            .length
-                                                                            .toString()
+                                                                            selectedApps.length.toString()
                                                                           ])),
-                                                                  content: Text(
+                                                                      content:
+                                                                          Text(
                                                                         tr('onlyWorksWithNonEVDApps'),
                                                                         style: const TextStyle(
                                                                             fontWeight:
-                                                                            FontWeight
-                                                                                .bold,
-                                                                        fontStyle:
-                                                                            FontStyle.italic),
+                                                                                FontWeight.bold,
+                                                                            fontStyle: FontStyle.italic),
                                                                       ),
                                                                       actions: [
                                                                         TextButton(
                                                                             onPressed:
                                                                                 () {
-                                                                          Navigator.of(context)
-                                                                              .pop();
+                                                                              Navigator.of(context).pop();
                                                                             },
-                                                                        child: Text(
-                                                                            tr('no'))),
+                                                                            child:
+                                                                                Text(tr('no'))),
                                                                         TextButton(
                                                                             onPressed:
                                                                                 () {
-                                                                          HapticFeedback
-                                                                              .selectionClick();
-                                                                          appsProvider
-                                                                              .saveApps(selectedApps.map((a) {
-                                                                            if (a.installedVersion !=
-                                                                                null) {
+                                                                              HapticFeedback.selectionClick();
+                                                                              appsProvider.saveApps(selectedApps.map((a) {
+                                                                                if (a.installedVersion != null) {
                                                                                   a.installedVersion = a.latestVersion;
                                                                                 }
                                                                                 return a;
                                                                               }).toList());
 
-                                                                          Navigator.of(context)
-                                                                              .pop();
+                                                                              Navigator.of(context).pop();
                                                                             },
-                                                                        child: Text(
-                                                                            tr('yes')))
+                                                                            child:
+                                                                                Text(tr('yes')))
                                                                       ],
                                                                     );
                                                                   }).whenComplete(() {
@@ -654,21 +680,25 @@ class AppsPageState extends State<AppsPage> {
                                                                     .pop();
                                                               });
                                                             },
-                                              tooltip:
-                                                  tr('markSelectedAppsUpdated'),
-                                              icon: const Icon(Icons.done)),
+                                                      tooltip: tr(
+                                                          'markSelectedAppsUpdated'),
+                                                      icon: const Icon(
+                                                          Icons.done)),
                                                   IconButton(
                                                     onPressed: () {
-                                              var pinStatus = selectedApps
+                                                      var pinStatus =
+                                                          selectedApps
                                                               .where((element) =>
-                                                      element.pinned)
+                                                                  element
+                                                                      .pinned)
                                                               .isEmpty;
                                                       appsProvider.saveApps(
                                                           selectedApps.map((e) {
                                                         e.pinned = pinStatus;
                                                         return e;
                                                       }).toList());
-                                              Navigator.of(context).pop();
+                                                      Navigator.of(context)
+                                                          .pop();
                                                     },
                                                     tooltip: selectedApps
                                                             .where((element) =>
@@ -680,14 +710,16 @@ class AppsPageState extends State<AppsPage> {
                                                             .where((element) =>
                                                                 element.pinned)
                                                             .isEmpty
-                                                ? Icons.bookmark_outline_rounded
+                                                        ? Icons
+                                                            .bookmark_outline_rounded
                                                         : Icons
                                                             .bookmark_remove_outlined),
                                                   ),
                                                   IconButton(
                                                     onPressed: () {
                                                       String urls = '';
-                                              for (var a in selectedApps) {
+                                                      for (var a
+                                                          in selectedApps) {
                                                         urls += '${a.url}\n';
                                                       }
                                                       urls = urls.substring(
@@ -695,16 +727,20 @@ class AppsPageState extends State<AppsPage> {
                                                       Share.share(urls,
                                                           subject: tr(
                                                               'selectedAppURLsFromObtainium'));
-                                              Navigator.of(context).pop();
+                                                      Navigator.of(context)
+                                                          .pop();
                                                     },
-                                            tooltip: tr('shareSelectedAppURLs'),
-                                            icon: const Icon(Icons.share),
+                                                    tooltip: tr(
+                                                        'shareSelectedAppURLs'),
+                                                    icon:
+                                                        const Icon(Icons.share),
                                                   ),
                                                   IconButton(
                                                     onPressed: () {
                                                       showDialog(
                                                           context: context,
-                                                  builder: (BuildContext ctx) {
+                                                          builder: (BuildContext
+                                                              ctx) {
                                                             return GeneratedFormModal(
                                                               title: tr(
                                                                   'resetInstallStatusForSelectedAppsQuestion'),
@@ -722,18 +758,22 @@ class AppsPageState extends State<AppsPage> {
                                                           }).then((values) {
                                                         if (values != null) {
                                                           appsProvider.saveApps(
-                                                      selectedApps.map((e) {
-                                                    e.installedVersion = null;
+                                                              selectedApps
+                                                                  .map((e) {
+                                                            e.installedVersion =
+                                                                null;
                                                             return e;
                                                           }).toList());
                                                         }
                                                       }).whenComplete(() {
-                                                Navigator.of(context).pop();
+                                                        Navigator.of(context)
+                                                            .pop();
                                                       });
                                                     },
-                                            tooltip: tr('resetInstallStatus'),
-                                            icon: const Icon(
-                                                Icons.restore_page_outlined),
+                                                    tooltip: tr(
+                                                        'resetInstallStatus'),
+                                                    icon: const Icon(Icons
+                                                        .restore_page_outlined),
                                                   ),
                                                 ]),
                                           ),
@@ -744,7 +784,7 @@ class AppsPageState extends State<AppsPage> {
                           icon: const Icon(Icons.more_horiz),
                         ),
                       ],
-            )),
+                    ))),
             const VerticalDivider(),
             IconButton(
               visualDensity: VisualDensity.compact,

lib/pages/import_export.dart

@@ -9,6 +9,7 @@ import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/components/generated_form_modal.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/providers/apps_provider.dart';
+import 'package:obtainium/providers/settings_provider.dart';
 import 'package:obtainium/providers/source_provider.dart';
 import 'package:provider/provider.dart';
 import 'package:file_picker/file_picker.dart';
@@ -28,6 +29,7 @@ class _ImportExportPageState extends State<ImportExportPage> {
   Widget build(BuildContext context) {
     SourceProvider sourceProvider = SourceProvider();
     var appsProvider = context.read<AppsProvider>();
+    var settingsProvider = context.read<SettingsProvider>();
     var outlineButtonStyle = ButtonStyle(
       shape: MaterialStateProperty.all(
         StadiumBorder(
@@ -100,6 +102,21 @@ class _ImportExportPageState extends State<ImportExportPage> {
                                               appsProvider
                                                   .importApps(data)
                                                   .then((value) {
+                                                var cats =
+                                                    settingsProvider.categories;
+                                                appsProvider.apps
+                                                    .forEach((key, value) {
+                                                  for (var c
+                                                      in value.app.categories) {
+                                                    if (!cats.containsKey(c)) {
+                                                      cats[c] =
+                                                          generateRandomLightColor()
+                                                              .value;
+                                                    }
+                                                  }
+                                                });
+                                                settingsProvider.categories =
+                                                    cats;
                                                 showError(
                                                     tr('importedX', args: [
                                                       plural('apps', value)

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

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';
@@ -269,6 +274,7 @@ class SourceProvider {
   List<AppSource> sources = [
     GitHub(),
     GitLab(),
+    Codeberg(),
     FDroid(),
     IzzyOnDroid(),
     Mullvad(),
@@ -276,7 +282,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

pubspec.lock

@@ -28,7 +28,7 @@ packages:
       name: args
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.3.1"
+    version: "2.3.2"
   async:
     dependency: transitive
     description:
@@ -56,7 +56,7 @@ packages:
       name: checked_yaml
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.1"
+    version: "2.0.2"
   cli_util:
     dependency: transitive
     description:
@@ -182,7 +182,7 @@ packages:
       name: file_picker
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "5.2.4"
+    version: "5.2.5"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -286,7 +286,7 @@ packages:
       name: image
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.2.2"
+    version: "3.3.0"
   install_plugin_v2:
     dependency: "direct main"
     description:
@@ -321,7 +321,7 @@ packages:
       name: json_annotation
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.7.0"
+    version: "4.8.0"
   lints:
     dependency: transitive
     description:
@@ -356,7 +356,7 @@ packages:
       name: mime
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.3"
+    version: "1.0.4"
   nested:
     dependency: transitive
     description:
@@ -419,7 +419,7 @@ packages:
       name: path_provider_macos
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.6"
+    version: "2.0.7"
   path_provider_platform_interface:
     dependency: transitive
     description:
@@ -531,7 +531,7 @@ packages:
       name: shared_preferences
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.15"
+    version: "2.0.16"
   shared_preferences_android:
     dependency: transitive
     description:
@@ -539,10 +539,10 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.14"
-  shared_preferences_ios:
+  shared_preferences_foundation:
     dependency: transitive
     description:
-      name: shared_preferences_ios
+      name: shared_preferences_foundation
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.1"
@@ -553,13 +553,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.2"
-  shared_preferences_macos:
-    dependency: transitive
-    description:
-      name: shared_preferences_macos
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.4"
   shared_preferences_platform_interface:
     dependency: transitive
     description:
@@ -599,14 +592,14 @@ packages:
       name: sqflite
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.2.2"
+    version: "2.2.3"
   sqflite_common:
     dependency: transitive
     description:
       name: sqflite_common
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.4.0+2"
+    version: "2.4.1"
   stack_trace:
     dependency: transitive
     description:
@@ -634,7 +627,7 @@ packages:
       name: synchronized
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.0+3"
+    version: "3.0.1"
   term_glyph:
     dependency: transitive
     description:
@@ -655,7 +648,7 @@ packages:
       name: timezone
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.9.0"
+    version: "0.9.1"
   typed_data:
     dependency: transitive
     description:
@@ -746,21 +739,21 @@ packages:
       name: webview_flutter_android
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.1.1"
+    version: "3.2.0"
   webview_flutter_platform_interface:
     dependency: transitive
     description:
       name: webview_flutter_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "2.0.1"
   webview_flutter_wkwebview:
     dependency: transitive
     description:
       name: webview_flutter_wkwebview
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.1"
+    version: "3.0.2"
   win32:
     dependency: transitive
     description:
@@ -774,7 +767,7 @@ packages:
       name: xdg_directories
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.0+2"
+    version: "0.2.0+3"
   xml:
     dependency: transitive
     description:

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.13+103 # When changing this, update the tag in main() accordingly
+version: 0.10.3+109 # When changing this, update the tag in main() accordingly
 
 environment:
   sdk: '>=2.18.2 <3.0.0'