Increment version

* Fixes #14 (although detection is disabled in background processes due to the bug described in #60)
    * Added App icons and basic installed detection
    * Real Package Names Used as IDs + App Icons (INCONVENIENT FOR PREVIOUS VERSION USERS)
    * Switch to using extracted names (no custom names)

* Fixes #57

* Fixes #67

* Fixes #64

* Fixes #61

* Commented out APKMirror and added code to remove their Apps

* Updated README

* Switched to Flutter stable (causes some UI elements to switch back to the old material design style, but this will be fixed in later Flutter releases)

* BG task silently retries on network errors

* Updated screenshots

android/app/src/main/res/xml/file_paths.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths>
+    <external-path path="Android/data/dev.imranr.obtainium/" name="files_root" />
+    <external-path path="." name="external_storage_root" />
+</paths>

lib/app_sources/apkmirror.dart

@@ -0,0 +1,112 @@
+import 'package:html/parser.dart';
+import 'package:http/http.dart';
+import 'package:obtainium/components/generated_form.dart';
+import 'package:obtainium/providers/source_provider.dart';
+
+class APKMirror implements AppSource {
+  @override
+  late String host = 'apkmirror.com';
+
+  @override
+  String standardizeURL(String url) {
+    RegExp standardUrlRegEx = RegExp('^https?://$host/apk/[^/]+/[^/]+');
+    RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
+    if (match == null) {
+      throw notValidURL(runtimeType.toString());
+    }
+    return url.substring(0, match.end);
+  }
+
+  @override
+  String? changeLogPageFromStandardUrl(String standardUrl) =>
+      '$standardUrl#whatsnew';
+
+  @override
+  Future<String> apkUrlPrefetchModifier(String apkUrl) async {
+    var originalUri = Uri.parse(apkUrl);
+    var res = await get(originalUri);
+    if (res.statusCode != 200) {
+      throw false;
+    }
+    var href =
+        parse(res.body).querySelector('.downloadButton')?.attributes['href'];
+    if (href == null) {
+      throw false;
+    }
+    var res2 = await get(Uri.parse('${originalUri.origin}$href'), headers: {
+      'User-Agent':
+          'Mozilla/5.0 (X11; Linux x86_64; rv:105.0) Gecko/20100101 Firefox/105.0'
+    });
+    if (res2.statusCode != 200) {
+      throw false;
+    }
+    var links = parse(res2.body)
+        .querySelectorAll('a')
+        .where((element) => element.innerHtml == 'here')
+        .map((e) => e.attributes['href'])
+        .where((element) => element != null)
+        .toList();
+    if (links.isEmpty) {
+      throw false;
+    }
+    return '${originalUri.origin}${links[0]}';
+  }
+
+  @override
+  Future<APKDetails> getLatestAPKDetails(
+      String standardUrl, List<String> additionalData) async {
+    Response res = await get(Uri.parse('$standardUrl/feed'));
+    if (res.statusCode != 200) {
+      throw couldNotFindReleases;
+    }
+    var nextUrl = parse(res.body)
+        .querySelector('item')
+        ?.querySelector('link')
+        ?.nextElementSibling
+        ?.innerHtml;
+    if (nextUrl == null) {
+      throw couldNotFindReleases;
+    }
+    Response res2 = await get(Uri.parse(nextUrl), headers: {
+      'User-Agent':
+          'Mozilla/5.0 (X11; Linux x86_64; rv:105.0) Gecko/20100101 Firefox/105.0'
+    });
+    if (res2.statusCode != 200) {
+      throw couldNotFindReleases;
+    }
+    var html2 = parse(res2.body);
+    var origin = Uri.parse(standardUrl).origin;
+    List<String> apkUrls = html2
+        .querySelectorAll('.apkm-badge')
+        .map((e) => e.innerHtml != 'APK'
+            ? ''
+            : e.previousElementSibling?.attributes['href'] ?? '')
+        .where((element) => element.isNotEmpty)
+        .map((e) => '$origin$e')
+        .toList();
+    if (apkUrls.isEmpty) {
+      throw noAPKFound;
+    }
+    var version = html2.querySelector('span.active.accent_color')?.innerHtml;
+    if (version == null) {
+      throw couldNotFindLatestVersion;
+    }
+    return APKDetails(version, apkUrls);
+  }
+
+  @override
+  AppNames getAppNames(String standardUrl) {
+    String temp = standardUrl.substring(standardUrl.indexOf('://') + 3);
+    List<String> names = temp.substring(temp.indexOf('/') + 1).split('/');
+    return AppNames(names[1], names[2]);
+  }
+
+  @override
+  List<List<GeneratedFormItem>> additionalDataFormItems = [];
+
+  @override
+  List<String> additionalDataDefaults = [];
+
+  @override
+  List<GeneratedFormItem> moreSourceSettingsFormItems = [];
+}

lib/app_sources/fdroid.dart

@@ -9,36 +9,64 @@ class FDroid implements AppSource {
 
   @override
   String standardizeURL(String url) {
-    RegExp standardUrlRegEx = RegExp('^https?://$host/[^/]+/packages/[^/]+');
+    RegExp standardUrlRegExB =
-    RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
+        RegExp('^https?://$host/+[^/]+/+packages/+[^/]+');
+    RegExpMatch? match = standardUrlRegExB.firstMatch(url.toLowerCase());
+    if (match != null) {
+      url = 'https://$host/packages/${Uri.parse(url).pathSegments.last}';
+    }
+    RegExp standardUrlRegExA = RegExp('^https?://$host/+packages/+[^/]+');
+    match = standardUrlRegExA.firstMatch(url.toLowerCase());
     if (match == null) {
       throw notValidURL(runtimeType.toString());
     }
     return url.substring(0, match.end);
   }
 
+  @override
+  String? changeLogPageFromStandardUrl(String standardUrl) => null;
+
+  @override
+  Future<String> apkUrlPrefetchModifier(String apkUrl) async => apkUrl;
+
   @override
   Future<APKDetails> getLatestAPKDetails(
       String standardUrl, List<String> additionalData) async {
     Response res = await get(Uri.parse(standardUrl));
     if (res.statusCode == 200) {
-      var latestReleaseDiv =
+      var releases = parse(res.body).querySelectorAll('.package-version');
-          parse(res.body).querySelector('#latest.package-version');
+      if (releases.isEmpty) {
-      var apkUrl = latestReleaseDiv
+        throw couldNotFindReleases;
-          ?.querySelector('.package-version-download a')
-          ?.attributes['href'];
-      if (apkUrl == null) {
-        throw noAPKFound;
       }
-      var version = latestReleaseDiv
+      String? latestVersion = releases[0]
-          ?.querySelector('.package-version-header b')
+          .querySelector('.package-version-header b')
           ?.innerHtml
           .split(' ')
-          .last;
+          .sublist(1)
-      if (version == null) {
+          .join(' ');
+      if (latestVersion == null) {
         throw couldNotFindLatestVersion;
       }
-      return APKDetails(version, [apkUrl]);
+      List<String> apkUrls = releases
+          .where((element) =>
+              element
+                  .querySelector('.package-version-header b')
+                  ?.innerHtml
+                  .split(' ')
+                  .sublist(1)
+                  .join(' ') ==
+              latestVersion)
+          .map((e) =>
+              e
+                  .querySelector('.package-version-download a')
+                  ?.attributes['href'] ??
+              '')
+          .where((element) => element.isNotEmpty)
+          .toList();
+      if (apkUrls.isEmpty) {
+        throw noAPKFound;
+      }
+      return APKDetails(latestVersion, apkUrls);
     } else {
       throw couldNotFindReleases;
     }
@@ -54,4 +82,7 @@ class FDroid implements AppSource {
 
   @override
   List<String> additionalDataDefaults = [];
+
+  @override
+  List<GeneratedFormItem> moreSourceSettingsFormItems = [];
 }

lib/app_sources/github.dart

@@ -1,7 +1,11 @@
 import 'dart:convert';
+import 'package:flutter/material.dart';
 import 'package:http/http.dart';
 import 'package:obtainium/components/generated_form.dart';
+import 'package:obtainium/custom_errors.dart';
+import 'package:obtainium/providers/settings_provider.dart';
 import 'package:obtainium/providers/source_provider.dart';
+import 'package:url_launcher/url_launcher_string.dart';
 
 class GitHub implements AppSource {
   @override
@@ -17,18 +21,33 @@ class GitHub implements AppSource {
     return url.substring(0, match.end);
   }
 
+  Future<String> getCredentialPrefixIfAny() async {
+    SettingsProvider settingsProvider = SettingsProvider();
+    await settingsProvider.initializeSettings();
+    String? creds =
+        settingsProvider.getSettingString(moreSourceSettingsFormItems[0].id);
+    return creds != null && creds.isNotEmpty ? '$creds@' : '';
+  }
+
+  @override
+  String? changeLogPageFromStandardUrl(String standardUrl) =>
+      '$standardUrl/releases';
+
+  @override
+  Future<String> apkUrlPrefetchModifier(String apkUrl) async => apkUrl;
+
   @override
   Future<APKDetails> getLatestAPKDetails(
       String standardUrl, List<String> additionalData) async {
     var includePrereleases =
-        additionalData.isNotEmpty && additionalData[0] == "true";
+        additionalData.isNotEmpty && additionalData[0] == 'true';
     var fallbackToOlderReleases =
-        additionalData.length >= 2 && additionalData[1] == "true";
+        additionalData.length >= 2 && additionalData[1] == 'true';
     var regexFilter = additionalData.length >= 3 && additionalData[2].isNotEmpty
         ? additionalData[2]
         : null;
     Response res = await get(Uri.parse(
-        'https://api.$host/repos${standardUrl.substring('https://$host'.length)}/releases'));
+        'https://${await getCredentialPrefixIfAny()}api.$host/repos${standardUrl.substring('https://$host'.length)}/releases'));
     if (res.statusCode == 200) {
       var releases = jsonDecode(res.body) as List<dynamic>;
 
@@ -50,9 +69,10 @@ class GitHub implements AppSource {
         if (!includePrereleases && releases[i]['prerelease'] == true) {
           continue;
         }
+
         if (regexFilter != null &&
             !RegExp(regexFilter)
-                .hasMatch((releases[i]['name'] as String).trim())) {
+                .hasMatch((releases[i]['tag_name'] as String).trim())) {
           continue;
         }
         var apkUrls = getReleaseAPKUrls(releases[i]);
@@ -76,7 +96,10 @@ class GitHub implements AppSource {
       return APKDetails(version, targetRelease['apkUrls']);
     } else {
       if (res.headers['x-ratelimit-remaining'] == '0') {
-        throw 'Rate limit reached - try again in ${(int.parse(res.headers['x-ratelimit-reset'] ?? '1800000000') / 60000000).toString()} minutes';
+        throw RateLimitError(
+            (int.parse(res.headers['x-ratelimit-reset'] ?? '1800000000') /
+                    60000000)
+                .round());
       }
 
       throw couldNotFindReleases;
@@ -92,14 +115,14 @@ class GitHub implements AppSource {
 
   @override
   List<List<GeneratedFormItem>> additionalDataFormItems = [
-    [GeneratedFormItem(label: "Include prereleases", type: FormItemType.bool)],
+    [GeneratedFormItem(label: 'Include prereleases', type: FormItemType.bool)],
     [
       GeneratedFormItem(
-          label: "Fallback to older releases", type: FormItemType.bool)
+          label: 'Fallback to older releases', type: FormItemType.bool)
     ],
     [
       GeneratedFormItem(
-          label: "Filter Release Titles by Regular Expression",
+          label: 'Filter Release Titles by Regular Expression',
           type: FormItemType.string,
           required: false,
           additionalValidators: [
@@ -110,7 +133,7 @@ class GitHub implements AppSource {
               try {
                 RegExp(value);
               } catch (e) {
-                return "Invalid regular expression";
+                return 'Invalid regular expression';
               }
               return null;
             }
@@ -119,5 +142,44 @@ class GitHub implements AppSource {
   ];
 
   @override
-  List<String> additionalDataDefaults = ["true", "true", ""];
+  List<String> additionalDataDefaults = ['true', 'true', ''];
+
+  @override
+  List<GeneratedFormItem> moreSourceSettingsFormItems = [
+    GeneratedFormItem(
+        label: 'GitHub Personal Access Token (Increases Rate Limit)',
+        id: 'github-creds',
+        required: false,
+        additionalValidators: [
+          (value) {
+            if (value != null && value.trim().isNotEmpty) {
+              if (value
+                      .split(':')
+                      .where((element) => element.trim().isNotEmpty)
+                      .length !=
+                  2) {
+                return 'PAT must be in this format: username:token';
+              }
+            }
+            return null;
+          }
+        ],
+        hint: 'username:token',
+        belowWidgets: [
+          const SizedBox(
+            height: 8,
+          ),
+          GestureDetector(
+              onTap: () {
+                launchUrlString(
+                    'https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token',
+                    mode: LaunchMode.externalApplication);
+              },
+              child: const Text(
+                'About GitHub PATs',
+                style: TextStyle(
+                    decoration: TextDecoration.underline, fontSize: 12),
+              ))
+        ])
+  ];
 }

lib/app_sources/gitlab.dart

@@ -18,6 +18,13 @@ class GitLab implements AppSource {
     return url.substring(0, match.end);
   }
 
+  @override
+  String? changeLogPageFromStandardUrl(String standardUrl) =>
+      '$standardUrl/-/releases';
+
+  @override
+  Future<String> apkUrlPrefetchModifier(String apkUrl) async => apkUrl;
+
   @override
   Future<APKDetails> getLatestAPKDetails(
       String standardUrl, List<String> additionalData) async {
@@ -68,4 +75,7 @@ class GitLab implements AppSource {
 
   @override
   List<String> additionalDataDefaults = [];
+
+  @override
+  List<GeneratedFormItem> moreSourceSettingsFormItems = [];
 }

lib/app_sources/izzyondroid.dart

@@ -17,6 +17,12 @@ class IzzyOnDroid implements AppSource {
     return url.substring(0, match.end);
   }
 
+  @override
+  String? changeLogPageFromStandardUrl(String standardUrl) => null;
+
+  @override
+  Future<String> apkUrlPrefetchModifier(String apkUrl) async => apkUrl;
+
   @override
   Future<APKDetails> getLatestAPKDetails(
       String standardUrl, List<String> additionalData) async {
@@ -62,4 +68,7 @@ class IzzyOnDroid implements AppSource {
 
   @override
   List<String> additionalDataDefaults = [];
+
+  @override
+  List<GeneratedFormItem> moreSourceSettingsFormItems = [];
 }

lib/app_sources/mullvad.dart

@@ -17,6 +17,13 @@ class Mullvad implements AppSource {
     return url.substring(0, match.end);
   }
 
+  @override
+  String? changeLogPageFromStandardUrl(String standardUrl) =>
+      'https://github.com/mullvad/mullvadvpn-app/blob/master/CHANGELOG.md';
+
+  @override
+  Future<String> apkUrlPrefetchModifier(String apkUrl) async => apkUrl;
+
   @override
   Future<APKDetails> getLatestAPKDetails(
       String standardUrl, List<String> additionalData) async {
@@ -48,4 +55,7 @@ class Mullvad implements AppSource {
 
   @override
   List<String> additionalDataDefaults = [];
+
+  @override
+  List<GeneratedFormItem> moreSourceSettingsFormItems = [];
 }

lib/app_sources/signal.dart

@@ -12,6 +12,12 @@ class Signal implements AppSource {
     return 'https://$host';
   }
 
+  @override
+  String? changeLogPageFromStandardUrl(String standardUrl) => null;
+
+  @override
+  Future<String> apkUrlPrefetchModifier(String apkUrl) async => apkUrl;
+
   @override
   Future<APKDetails> getLatestAPKDetails(
       String standardUrl, List<String> additionalData) async {
@@ -41,4 +47,7 @@ class Signal implements AppSource {
 
   @override
   List<String> additionalDataDefaults = [];
+
+  @override
+  List<GeneratedFormItem> moreSourceSettingsFormItems = [];
 }

lib/app_sources/sourceforge.dart

@@ -0,0 +1,77 @@
+import 'package:html/parser.dart';
+import 'package:http/http.dart';
+import 'package:obtainium/components/generated_form.dart';
+import 'package:obtainium/providers/source_provider.dart';
+
+class SourceForge implements AppSource {
+  @override
+  late String host = 'sourceforge.net';
+
+  @override
+  String standardizeURL(String url) {
+    RegExp standardUrlRegEx = RegExp('^https?://$host/projects/[^/]+');
+    RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
+    if (match == null) {
+      throw notValidURL(runtimeType.toString());
+    }
+    return url.substring(0, match.end);
+  }
+
+  @override
+  String? changeLogPageFromStandardUrl(String standardUrl) => null;
+
+  @override
+  Future<String> apkUrlPrefetchModifier(String apkUrl) async => apkUrl;
+
+  @override
+  Future<APKDetails> getLatestAPKDetails(
+      String standardUrl, List<String> additionalData) async {
+    Response res = await get(Uri.parse('$standardUrl/rss?path=/'));
+    if (res.statusCode == 200) {
+      var parsedHtml = parse(res.body);
+      var allDownloadLinks =
+          parsedHtml.querySelectorAll('guid').map((e) => e.innerHtml).toList();
+      getVersion(String url) {
+        try {
+          var tokens = url.split('/');
+          return tokens[tokens.length - 3];
+        } catch (e) {
+          return null;
+        }
+      }
+
+      String? version = getVersion(allDownloadLinks[0]);
+      if (version == null) {
+        throw couldNotFindLatestVersion;
+      }
+      var apkUrlListAllReleases = allDownloadLinks
+          .where((element) => element.toLowerCase().endsWith('.apk/download'))
+          .toList();
+      var apkUrlList =
+          apkUrlListAllReleases // This can be used skipped for fallback support later
+              .where((element) => getVersion(element) == version)
+              .toList();
+      if (apkUrlList.isEmpty) {
+        throw noAPKFound;
+      }
+      return APKDetails(version, apkUrlList);
+    } else {
+      throw couldNotFindReleases;
+    }
+  }
+
+  @override
+  AppNames getAppNames(String standardUrl) {
+    return AppNames(runtimeType.toString(),
+        standardUrl.substring(standardUrl.lastIndexOf('/') + 1));
+  }
+
+  @override
+  List<List<GeneratedFormItem>> additionalDataFormItems = [];
+
+  @override
+  List<String> additionalDataDefaults = [];
+
+  @override
+  List<GeneratedFormItem> moreSourceSettingsFormItems = [];
+}

lib/components/generated_form.dart

@@ -10,13 +10,19 @@ class GeneratedFormItem {
   late bool required;
   late int max;
   late List<String? Function(String? value)> additionalValidators;
+  late String id;
+  late List<Widget> belowWidgets;
+  late String? hint;
 
   GeneratedFormItem(
-      {this.label = "Input",
+      {this.label = 'Input',
       this.type = FormItemType.string,
       this.required = true,
       this.max = 1,
-      this.additionalValidators = const []});
+      this.additionalValidators = const [],
+      this.id = 'input',
+      this.belowWidgets = const [],
+      this.hint});
 }
 
 class GeneratedForm extends StatefulWidget {
@@ -69,7 +75,7 @@ class _GeneratedFormState extends State<GeneratedForm> {
         .map((row) => row.map((e) {
               return j < widget.defaultValues.length
                   ? widget.defaultValues[j++]
-                  : "";
+                  : '';
             }).toList())
         .toList();
 
@@ -89,7 +95,8 @@ class _GeneratedFormState extends State<GeneratedForm> {
               });
             },
             decoration: InputDecoration(
-                helperText: e.value.label + (e.value.required ? " *" : "")),
+                helperText: e.value.label + (e.value.required ? ' *' : ''),
+                hintText: e.value.hint),
             minLines: e.value.max <= 1 ? null : e.value.max,
             maxLines: e.value.max <= 1 ? 1 : e.value.max,
             validator: (value) {
@@ -122,10 +129,10 @@ class _GeneratedFormState extends State<GeneratedForm> {
             children: [
               Text(widget.items[r][e].label),
               Switch(
-                  value: values[r][e] == "true",
+                  value: values[r][e] == 'true',
                   onChanged: (value) {
                     setState(() {
-                      values[r][e] = value ? "true" : "";
+                      values[r][e] = value ? 'true' : '';
                       someValueChanged();
                     });
                   })
@@ -155,7 +162,13 @@ class _GeneratedFormState extends State<GeneratedForm> {
             width: 20,
           ));
         }
-        rowItems.add(Expanded(child: rowInput.value));
+        rowItems.add(Expanded(
+            child: Column(
+                crossAxisAlignment: CrossAxisAlignment.stretch,
+                children: [
+              rowInput.value,
+              ...widget.items[rowInputs.key][rowInput.key].belowWidgets
+            ])));
       });
       rows.add(rowItems);
     });

lib/components/generated_form_modal.dart

@@ -7,11 +7,15 @@ class GeneratedFormModal extends StatefulWidget {
       {super.key,
       required this.title,
       required this.items,
-      required this.defaultValues});
+      required this.defaultValues,
+      this.initValid = false,
+      this.message = ''});
 
   final String title;
+  final String message;
   final List<List<GeneratedFormItem>> items;
   final List<String> defaultValues;
+  final bool initValid;
 
   @override
   State<GeneratedFormModal> createState() => _GeneratedFormModalState();
@@ -21,20 +25,34 @@ class _GeneratedFormModalState extends State<GeneratedFormModal> {
   List<String> values = [];
   bool valid = false;
 
+  @override
+  void initState() {
+    super.initState();
+    valid = widget.initValid;
+  }
+
   @override
   Widget build(BuildContext context) {
     return AlertDialog(
       scrollable: true,
       title: Text(widget.title),
-      content: GeneratedForm(
+      content:
-          items: widget.items,
+          Column(crossAxisAlignment: CrossAxisAlignment.stretch, children: [
-          onValueChanges: (values, valid) {
+        if (widget.message.isNotEmpty) Text(widget.message),
-            setState(() {
+        if (widget.message.isNotEmpty)
-              this.values = values;
+          const SizedBox(
-              this.valid = valid;
+            height: 16,
-            });
+          ),
-          },
+        GeneratedForm(
-          defaultValues: widget.defaultValues),
+            items: widget.items,
+            onValueChanges: (values, valid) {
+              setState(() {
+                this.values = values;
+                this.valid = valid;
+              });
+            },
+            defaultValues: widget.defaultValues)
+      ]),
       actions: [
         TextButton(
             onPressed: () {

lib/custom_errors.dart

@@ -0,0 +1,8 @@
+class RateLimitError {
+  late int remainingMinutes;
+  RateLimitError(this.remainingMinutes);
+
+  @override
+  String toString() =>
+      'Too many requests (rate limited) - try again in $remainingMinutes minutes';
+}

lib/main.dart

@@ -1,6 +1,8 @@
+import 'dart:io';
+
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:obtainium/app_sources/github.dart';
+import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/pages/home.dart';
 import 'package:obtainium/providers/apps_provider.dart';
 import 'package:obtainium/providers/notifications_provider.dart';
@@ -12,40 +14,93 @@ import 'package:workmanager/workmanager.dart';
 import 'package:dynamic_color/dynamic_color.dart';
 import 'package:device_info_plus/device_info_plus.dart';
 
+const String currentVersion = '0.6.3';
 const String currentReleaseTag =
-    'v0.3.0-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES
+    'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES
+
+const String bgUpdateCheckTaskName = 'bg-update-check';
+
+bgUpdateCheck(int? ignoreAfterMicroseconds) async {
+  WidgetsFlutterBinding.ensureInitialized();
+  DateTime? ignoreAfter = ignoreAfterMicroseconds != null
+      ? DateTime.fromMicrosecondsSinceEpoch(ignoreAfterMicroseconds)
+      : null;
+  var notificationsProvider = NotificationsProvider();
+  await notificationsProvider.notify(checkingUpdatesNotification);
+  try {
+    var appsProvider = AppsProvider();
+    await notificationsProvider.cancel(ErrorCheckingUpdatesNotification('').id);
+    await appsProvider.loadApps(shouldCorrectInstallStatus: false);
+    List<String> existingUpdateIds =
+        appsProvider.getExistingUpdates(installedOnly: true);
+    DateTime nextIgnoreAfter = DateTime.now();
+    String? err;
+    try {
+      await appsProvider.checkUpdates(
+          ignoreAfter: ignoreAfter,
+          immediatelyThrowRateLimitError: true,
+          immediatelyThrowSocketError: true,
+          shouldCorrectInstallStatus: false);
+    } catch (e) {
+      if (e is RateLimitError || e is SocketException) {
+        String nextTaskName =
+            '$bgUpdateCheckTaskName-${nextIgnoreAfter.microsecondsSinceEpoch.toString()}';
+        Workmanager().registerOneOffTask(nextTaskName, nextTaskName,
+            constraints: Constraints(networkType: NetworkType.connected),
+            initialDelay: Duration(
+                minutes: e is RateLimitError ? e.remainingMinutes : 15),
+            inputData: {'ignoreAfter': nextIgnoreAfter.microsecondsSinceEpoch});
+      } else {
+        err = e.toString();
+      }
+    }
+    List<App> newUpdates = appsProvider
+        .getExistingUpdates(installedOnly: true)
+        .where((id) => !existingUpdateIds.contains(id))
+        .map((e) => appsProvider.apps[e]!.app)
+        .toList();
+
+    // TODO: This silent update code doesn't work yet
+    // List<String> silentlyUpdated = await appsProvider
+    //     .downloadAndInstallLatestApp(
+    //         [...newUpdates.map((e) => e.id), ...existingUpdateIds], null);
+    // if (silentlyUpdated.isNotEmpty) {
+    //   newUpdates = newUpdates
+    //       .where((element) => !silentlyUpdated.contains(element.id))
+    //       .toList();
+    //   notificationsProvider.notify(
+    //       SilentUpdateNotification(
+    //           silentlyUpdated.map((e) => appsProvider.apps[e]!.app).toList()),
+    //       cancelExisting: true);
+    // }
+
+    if (newUpdates.isNotEmpty) {
+      notificationsProvider.notify(UpdateNotification(newUpdates));
+    }
+    if (err != null) {
+      throw err;
+    }
+    return Future.value(true);
+  } catch (e) {
+    notificationsProvider
+        .notify(ErrorCheckingUpdatesNotification(e.toString()));
+    return Future.error(false);
+  } finally {
+    await notificationsProvider.cancel(checkingUpdatesNotification.id);
+  }
+}
 
 @pragma('vm:entry-point')
 void bgTaskCallback() {
-  // Background update checking process
+  // Background process callback
-  Workmanager().executeTask((task, taskName) async {
+  Workmanager().executeTask((task, inputData) async {
-    var notificationsProvider = NotificationsProvider();
+    return await bgUpdateCheck(inputData?['ignoreAfter']);
-    await notificationsProvider.notify(checkingUpdatesNotification);
-    try {
-      var appsProvider = AppsProvider();
-      await notificationsProvider
-          .cancel(ErrorCheckingUpdatesNotification('').id);
-      await appsProvider.loadApps();
-      List<App> updates = await appsProvider.checkUpdates();
-      if (updates.isNotEmpty) {
-        notificationsProvider.notify(UpdateNotification(updates),
-            cancelExisting: true);
-      }
-      return Future.value(true);
-    } catch (e) {
-      notificationsProvider.notify(
-          ErrorCheckingUpdatesNotification(e.toString()),
-          cancelExisting: true);
-      return Future.value(false);
-    } finally {
-      await notificationsProvider.cancel(checkingUpdatesNotification.id);
-    }
   });
 }
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
-  if ((await DeviceInfoPlugin().androidInfo).version.sdkInt! >= 29) {
+  if ((await DeviceInfoPlugin().androidInfo).version.sdkInt >= 29) {
     SystemChrome.setSystemUIOverlayStyle(
       const SystemUiOverlayStyle(systemNavigationBarColor: Colors.transparent),
     );
@@ -64,14 +119,21 @@ void main() async {
       ChangeNotifierProvider(create: (context) => SettingsProvider()),
       Provider(create: (context) => NotificationsProvider())
     ],
-    child: const MyApp(),
+    child: const Obtainium(),
   ));
 }
 
 var defaultThemeColour = Colors.deepPurple;
 
-class MyApp extends StatelessWidget {
+class Obtainium extends StatefulWidget {
-  const MyApp({super.key});
+  const Obtainium({super.key});
+
+  @override
+  State<Obtainium> createState() => _ObtainiumState();
+}
+
+class _ObtainiumState extends State<Obtainium> {
+  var existingUpdateInterval = -1;
 
   @override
   Widget build(BuildContext context) {
@@ -81,30 +143,40 @@ class MyApp extends StatelessWidget {
     if (settingsProvider.prefs == null) {
       settingsProvider.initializeSettings();
     } else {
-      // Register the background update task according to the user's setting
-      if (settingsProvider.updateInterval > 0) {
-        Workmanager().registerPeriodicTask('bg-update-check', 'bg-update-check',
-            frequency: Duration(minutes: settingsProvider.updateInterval),
-            initialDelay: Duration(minutes: settingsProvider.updateInterval),
-            constraints: Constraints(networkType: NetworkType.connected),
-            existingWorkPolicy: ExistingWorkPolicy.replace);
-      } else {
-        Workmanager().cancelByUniqueName('bg-update-check');
-      }
       bool isFirstRun = settingsProvider.checkAndFlipFirstRun();
       if (isFirstRun) {
         // If this is the first run, ask for notification permissions and add Obtainium to the Apps list
         Permission.notification.request();
-        appsProvider.saveApp(App(
+        appsProvider.saveApps([
-            'imranr98_obtainium_${GitHub().host}',
+          App(
-            'https://github.com/ImranR98/Obtainium',
+              'dev.imranr.obtainium',
-            'ImranR98',
+              'https://github.com/ImranR98/Obtainium',
-            'Obtainium',
+              'ImranR98',
-            currentReleaseTag,
+              'Obtainium',
-            currentReleaseTag,
+              currentReleaseTag,
-            [],
+              currentReleaseTag,
-            0,
+              [],
-            ["true"]));
+              0,
+              ['true'],
+              null)
+        ]);
+      }
+      // Register the background update task according to the user's setting
+      if (existingUpdateInterval != settingsProvider.updateInterval) {
+        existingUpdateInterval = settingsProvider.updateInterval;
+        if (existingUpdateInterval == 0) {
+          Workmanager().cancelByUniqueName(bgUpdateCheckTaskName);
+        } else {
+          Workmanager().registerPeriodicTask(
+              bgUpdateCheckTaskName, bgUpdateCheckTaskName,
+              frequency: Duration(minutes: existingUpdateInterval),
+              initialDelay: Duration(minutes: existingUpdateInterval),
+              constraints: Constraints(networkType: NetworkType.connected),
+              existingWorkPolicy: ExistingWorkPolicy.replace,
+              backoffPolicy: BackoffPolicy.linear,
+              backoffPolicyDelay:
+                  const Duration(minutes: minUpdateIntervalMinutes));
+        }
       }
     }
 

lib/mass_app_sources/githubstars.dart

@@ -1,6 +1,8 @@
 import 'dart:convert';
 
 import 'package:http/http.dart';
+import 'package:obtainium/app_sources/github.dart';
+import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/providers/source_provider.dart';
 
 class GitHubStars implements MassAppSource {
@@ -10,23 +12,40 @@ class GitHubStars implements MassAppSource {
   @override
   late List<String> requiredArgs = ['Username'];
 
-  @override
+  Future<List<String>> getOnePageOfUserStarredUrls(
-  Future<List<String>> getUrls(List<String> args) async {
+      String username, int page) async {
-    if (args.length != requiredArgs.length) {
+    Response res = await get(Uri.parse(
-      throw 'Wrong number of arguments provided';
+        'https://${await GitHub().getCredentialPrefixIfAny()}api.github.com/users/$username/starred?per_page=100&page=$page'));
-    }
-    Response res =
-        await get(Uri.parse('https://api.github.com/users/${args[0]}/starred'));
     if (res.statusCode == 200) {
       return (jsonDecode(res.body) as List<dynamic>)
           .map((e) => e['html_url'] as String)
           .toList();
     } else {
       if (res.headers['x-ratelimit-remaining'] == '0') {
-        throw 'Rate limit reached - try again in ${(int.parse(res.headers['x-ratelimit-reset'] ?? '1800000000') / 60000000).toString()} minutes';
+        throw RateLimitError(
+            (int.parse(res.headers['x-ratelimit-reset'] ?? '1800000000') /
+                    60000000)
+                .round());
       }
 
       throw 'Unable to find user\'s starred repos';
     }
   }
+
+  @override
+  Future<List<String>> getUrls(List<String> args) async {
+    if (args.length != requiredArgs.length) {
+      throw 'Wrong number of arguments provided';
+    }
+    List<String> urls = [];
+    var page = 1;
+    while (true) {
+      var pageUrls = await getOnePageOfUserStarredUrls(args[0], page++);
+      urls.addAll(pageUrls);
+      if (pageUrls.length < 100) {
+        break;
+      }
+    }
+    return urls;
+  }
 }

lib/pages/add_app.dart

@@ -19,7 +19,7 @@ class AddAppPage extends StatefulWidget {
 class _AddAppPageState extends State<AddAppPage> {
   bool gettingAppInfo = false;
 
-  String userInput = "";
+  String userInput = '';
   AppSource? pickedSource;
   List<String> additionalData = [];
   bool validAdditionalData = true;
@@ -44,19 +44,19 @@ class _AddAppPageState extends State<AddAppPage> {
                                   items: [
                                     [
                                       GeneratedFormItem(
-                                          label: "App Source Url",
+                                          label: 'App Source Url',
                                           additionalValidators: [
                                             (value) {
                                               try {
                                                 sourceProvider
-                                                    .getSource(value ?? "")
+                                                    .getSource(value ?? '')
                                                     .standardizeURL(
-                                                        makeUrlHttps(
+                                                        preStandardizeUrl(
-                                                            value ?? ""));
+                                                            value ?? ''));
                                               } catch (e) {
                                                 return e is String
                                                     ? e
-                                                    : "Error";
+                                                    : 'Error';
                                               }
                                               return null;
                                             }
@@ -71,7 +71,9 @@ class _AddAppPageState extends State<AddAppPage> {
                                           : null;
                                       if (pickedSource != source) {
                                         pickedSource = source;
-                                        additionalData = [];
+                                        additionalData = source != null
+                                            ? source.additionalDataDefaults
+                                            : [];
                                         validAdditionalData = source != null
                                             ? sourceProvider
                                                 .doesSourceHaveRequiredAdditionalData(
@@ -84,58 +86,78 @@ class _AddAppPageState extends State<AddAppPage> {
                           const SizedBox(
                             width: 16,
                           ),
-                          ElevatedButton(
+                          gettingAppInfo
-                              onPressed: gettingAppInfo ||
+                              ? const CircularProgressIndicator()
-                                      pickedSource == null ||
+                              : ElevatedButton(
-                                      (pickedSource!.additionalDataFormItems
+                                  onPressed: gettingAppInfo ||
-                                              .isNotEmpty &&
+                                          pickedSource == null ||
-                                          !validAdditionalData)
+                                          (pickedSource!.additionalDataFormItems
-                                  ? null
+                                                  .isNotEmpty &&
-                                  : () {
+                                              !validAdditionalData)
-                                      HapticFeedback.selectionClick();
+                                      ? null
-                                      setState(() {
+                                      : () async {
-                                        gettingAppInfo = true;
+                                          setState(() {
-                                      });
+                                            gettingAppInfo = true;
-                                      sourceProvider
+                                          });
-                                          .getApp(pickedSource!, userInput,
+                                          var appsProvider =
-                                              additionalData)
+                                              context.read<AppsProvider>();
-                                          .then((app) {
+                                          var settingsProvider =
-                                        var appsProvider =
+                                              context.read<SettingsProvider>();
-                                            context.read<AppsProvider>();
+                                          () async {
-                                        var settingsProvider =
+                                            HapticFeedback.selectionClick();
-                                            context.read<SettingsProvider>();
+                                            App app =
-                                        if (appsProvider.apps
+                                                await sourceProvider.getApp(
-                                            .containsKey(app.id)) {
+                                                    pickedSource!,
-                                          throw 'App already added';
+                                                    userInput,
-                                        }
+                                                    additionalData);
-                                        settingsProvider
+                                            await settingsProvider
-                                            .getInstallPermission()
+                                                .getInstallPermission();
-                                            .then((_) {
+                                            // ignore: use_build_context_synchronously
-                                          appsProvider.saveApp(app).then((_) {
+                                            var apkUrl = await appsProvider
+                                                .selectApkUrl(app, context);
+                                            if (apkUrl == null) {
+                                              throw 'Cancelled';
+                                            }
+                                            app.preferredApkIndex =
+                                                app.apkUrls.indexOf(apkUrl);
+                                            var downloadedApk =
+                                                await appsProvider.downloadApp(
+                                                    app,
+                                                    showOccasionalProgressToast:
+                                                        true);
+                                            app.id = downloadedApk.appId;
+                                            if (appsProvider.apps
+                                                .containsKey(app.id)) {
+                                              throw 'App already added';
+                                            }
+                                            await appsProvider.saveApps([app]);
+
+                                            return app;
+                                          }()
+                                              .then((app) {
                                             Navigator.push(
                                                 context,
                                                 MaterialPageRoute(
                                                     builder: (context) =>
                                                         AppPage(
                                                             appId: app.id)));
+                                          }).catchError((e) {
+                                            ScaffoldMessenger.of(context)
+                                                .showSnackBar(
+                                              SnackBar(
+                                                  content: Text(e.toString())),
+                                            );
+                                          }).whenComplete(() {
+                                            setState(() {
+                                              gettingAppInfo = false;
+                                            });
                                           });
-                                        });
+                                        },
-                                      }).catchError((e) {
+                                  child: const Text('Add'))
-                                        ScaffoldMessenger.of(context)
-                                            .showSnackBar(
-                                          SnackBar(content: Text(e.toString())),
-                                        );
-                                      }).whenComplete(() {
-                                        setState(() {
-                                          gettingAppInfo = false;
-                                        });
-                                      });
-                                    },
-                              child: const Text('Add'))
                         ],
                       ),
                       if (pickedSource != null &&
-                          (pickedSource!.additionalDataFormItems.isNotEmpty))
+                          pickedSource!.additionalDataDefaults.isNotEmpty)
                         Column(
                           crossAxisAlignment: CrossAxisAlignment.stretch,
                           children: [
@@ -150,16 +172,23 @@ class _AddAppPageState extends State<AddAppPage> {
                             const SizedBox(
                               height: 16,
                             ),
-                            GeneratedForm(
+                            if (pickedSource!
-                                items: pickedSource!.additionalDataFormItems,
+                                .additionalDataFormItems.isNotEmpty)
-                                onValueChanges: (values, valid) {
+                              GeneratedForm(
-                                  setState(() {
+                                  items: pickedSource!.additionalDataFormItems,
-                                    additionalData = values;
+                                  onValueChanges: (values, valid) {
-                                    validAdditionalData = valid;
+                                    setState(() {
-                                  });
+                                      additionalData = values;
-                                },
+                                      validAdditionalData = valid;
-                                defaultValues:
+                                    });
-                                    pickedSource!.additionalDataDefaults)
+                                  },
+                                  defaultValues:
+                                      pickedSource!.additionalDataDefaults),
+                            if (pickedSource!
+                                .additionalDataFormItems.isNotEmpty)
+                              const SizedBox(
+                                height: 8,
+                              ),
                           ],
                         )
                       else

lib/pages/app.dart

@@ -18,71 +18,116 @@ class AppPage extends StatefulWidget {
 }
 
 class _AppPageState extends State<AppPage> {
+  AppInMemory? prevApp;
+
   @override
   Widget build(BuildContext context) {
     var appsProvider = context.watch<AppsProvider>();
     var settingsProvider = context.watch<SettingsProvider>();
+    getUpdate(String id) {
+      appsProvider.getUpdate(id).catchError((e) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text(e.toString())),
+        );
+      });
+    }
+
     var sourceProvider = SourceProvider();
     AppInMemory? app = appsProvider.apps[widget.appId];
     var source = app != null ? sourceProvider.getSource(app.app.url) : null;
-    if (app?.app.installedVersion != null) {
+    if (!appsProvider.areDownloadsRunning() && prevApp == null && app != null) {
-      appsProvider.getUpdate(app!.app.id);
+      prevApp = app;
+      getUpdate(app.app.id);
     }
     return Scaffold(
       appBar: settingsProvider.showAppWebpage ? AppBar() : null,
       backgroundColor: Theme.of(context).colorScheme.surface,
-      body: settingsProvider.showAppWebpage
+      body: RefreshIndicator(
-          ? WebView(
+          child: settingsProvider.showAppWebpage
-              initialUrl: app?.app.url,
+              ? WebView(
-              javascriptMode: JavascriptMode.unrestricted,
+                  backgroundColor: Theme.of(context).colorScheme.background,
-            )
+                  initialUrl: app?.app.url,
-          : Column(
+                  javascriptMode: JavascriptMode.unrestricted,
-              mainAxisAlignment: MainAxisAlignment.center,
+                )
-              crossAxisAlignment: CrossAxisAlignment.stretch,
+              : CustomScrollView(
-              children: [
+                  slivers: [
-                Text(
+                    SliverFillRemaining(
-                  app?.app.name ?? 'App',
+                        child: Column(
-                  textAlign: TextAlign.center,
+                      mainAxisAlignment: MainAxisAlignment.center,
-                  style: Theme.of(context).textTheme.displayLarge,
+                      crossAxisAlignment: CrossAxisAlignment.stretch,
-                ),
+                      children: [
-                Text(
+                        app?.installedInfo != null
-                  'By ${app?.app.author ?? 'Unknown'}',
+                            ? Row(
-                  textAlign: TextAlign.center,
+                                mainAxisAlignment: MainAxisAlignment.center,
-                  style: Theme.of(context).textTheme.headlineMedium,
+                                children: [
-                ),
+                                    Image.memory(
-                const SizedBox(
+                                      app!.installedInfo!.icon!,
-                  height: 32,
+                                      height: 150,
-                ),
+                                    )
-                GestureDetector(
+                                  ])
-                    onTap: () {
+                            : Container(),
-                      if (app?.app.url != null) {
+                        const SizedBox(
-                        launchUrlString(app?.app.url ?? '',
+                          height: 25,
-                            mode: LaunchMode.externalApplication);
+                        ),
-                      }
+                        Text(
-                    },
+                          app?.installedInfo?.name ?? app?.app.name ?? 'App',
-                    child: Text(
+                          textAlign: TextAlign.center,
-                      app?.app.url ?? '',
+                          style: Theme.of(context).textTheme.displayLarge,
-                      textAlign: TextAlign.center,
+                        ),
-                      style: const TextStyle(
+                        Text(
-                          decoration: TextDecoration.underline,
+                          'By ${app?.app.author ?? 'Unknown'}',
-                          fontStyle: FontStyle.italic,
+                          textAlign: TextAlign.center,
-                          fontSize: 12),
+                          style: Theme.of(context).textTheme.headlineMedium,
+                        ),
+                        const SizedBox(
+                          height: 32,
+                        ),
+                        GestureDetector(
+                            onTap: () {
+                              if (app?.app.url != null) {
+                                launchUrlString(app?.app.url ?? '',
+                                    mode: LaunchMode.externalApplication);
+                              }
+                            },
+                            child: Text(
+                              app?.app.url ?? '',
+                              textAlign: TextAlign.center,
+                              style: const TextStyle(
+                                  decoration: TextDecoration.underline,
+                                  fontStyle: FontStyle.italic,
+                                  fontSize: 12),
+                            )),
+                        const SizedBox(
+                          height: 32,
+                        ),
+                        Text(
+                          'Latest Version: ${app?.app.latestVersion ?? 'Unknown'}',
+                          textAlign: TextAlign.center,
+                          style: Theme.of(context).textTheme.bodyLarge,
+                        ),
+                        Text(
+                          'Installed Version: ${app?.app.installedVersion ?? 'None'}',
+                          textAlign: TextAlign.center,
+                          style: Theme.of(context).textTheme.bodyLarge,
+                        ),
+                        const SizedBox(
+                          height: 32,
+                        ),
+                        Text(
+                          'Last Update Check: ${app?.app.lastUpdateCheck == null ? 'Never' : '\n${app?.app.lastUpdateCheck?.toLocal()}'}',
+                          textAlign: TextAlign.center,
+                          style: const TextStyle(
+                              fontStyle: FontStyle.italic, fontSize: 12),
+                        )
+                      ],
                     )),
-                const SizedBox(
+                  ],
-                  height: 32,
                 ),
-                Text(
+          onRefresh: () async {
-                  'Latest Version: ${app?.app.latestVersion ?? 'Unknown'}',
+            if (app != null) {
-                  textAlign: TextAlign.center,
+              getUpdate(app.app.id);
-                  style: Theme.of(context).textTheme.bodyLarge,
+            }
-                ),
+          }),
-                Text(
-                  'Installed Version: ${app?.app.installedVersion ?? 'None'}',
-                  textAlign: TextAlign.center,
-                  style: Theme.of(context).textTheme.bodyLarge,
-                ),
-              ],
-            ),
       bottomSheet: Padding(
           padding: EdgeInsets.fromLTRB(
               0, 0, 0, MediaQuery.of(context).padding.bottom),
@@ -94,105 +139,78 @@ class _AppPageState extends State<AppPage> {
                   child: Row(
                       mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                       children: [
-                        if (app?.app.installedVersion != app?.app.latestVersion)
+                        if (app?.app.installedVersion != null &&
+                            app?.app.installedVersion != app?.app.latestVersion)
                           IconButton(
-                              onPressed: () {
+                              onPressed: app?.downloadProgress != null
-                                showDialog(
+                                  ? null
-                                    context: context,
+                                  : () {
-                                    builder: (BuildContext ctx) {
+                                      showDialog(
-                                      return AlertDialog(
+                                          context: context,
-                                        title: Text(
+                                          builder: (BuildContext ctx) {
-                                            'App Already ${app?.app.installedVersion == null ? 'Installed' : 'Updated'}?'),
+                                            return AlertDialog(
-                                        actions: [
+                                              title: const Text(
-                                          TextButton(
+                                                  'App Already up to Date?'),
-                                              onPressed: () {
+                                              actions: [
-                                                Navigator.of(context).pop();
+                                                TextButton(
-                                              },
+                                                    onPressed: () {
-                                              child: const Text('No')),
+                                                      Navigator.of(context)
-                                          TextButton(
+                                                          .pop();
-                                              onPressed: () {
+                                                    },
-                                                HapticFeedback.selectionClick();
+                                                    child: const Text('No')),
-                                                var updatedApp = app?.app;
+                                                TextButton(
-                                                if (updatedApp != null) {
+                                                    onPressed: () {
-                                                  updatedApp.installedVersion =
+                                                      HapticFeedback
-                                                      updatedApp.latestVersion;
+                                                          .selectionClick();
-                                                  appsProvider
+                                                      var updatedApp = app?.app;
-                                                      .saveApp(updatedApp);
+                                                      if (updatedApp != null) {
-                                                }
+                                                        updatedApp
-                                                Navigator.of(context).pop();
+                                                                .installedVersion =
-                                              },
+                                                            updatedApp
-                                              child: const Text(
+                                                                .latestVersion;
-                                                  'Yes, Mark as Installed'))
+                                                        appsProvider.saveApps(
-                                        ],
+                                                            [updatedApp]);
-                                      );
+                                                      }
-                                    });
+                                                      Navigator.of(context)
-                              },
+                                                          .pop();
-                              tooltip: 'Mark as Installed',
+                                                    },
-                              icon: const Icon(Icons.done))
+                                                    child: const Text(
-                        else
+                                                        'Yes, Mark as Updated'))
-                          IconButton(
+                                              ],
-                              onPressed: () {
+                                            );
-                                showDialog(
+                                          });
-                                    context: context,
+                                    },
-                                    builder: (BuildContext ctx) {
+                              tooltip: 'Mark as Updated',
-                                      return AlertDialog(
+                              icon: const Icon(Icons.done)),
-                                        title: const Text('App Not Installed?'),
-                                        actions: [
-                                          TextButton(
-                                              onPressed: () {
-                                                Navigator.of(context).pop();
-                                              },
-                                              child: const Text('No')),
-                                          TextButton(
-                                              onPressed: () {
-                                                HapticFeedback.selectionClick();
-                                                var updatedApp = app?.app;
-                                                if (updatedApp != null) {
-                                                  updatedApp.installedVersion =
-                                                      null;
-                                                  appsProvider
-                                                      .saveApp(updatedApp);
-                                                }
-                                                Navigator.of(context).pop();
-                                              },
-                                              child: const Text(
-                                                  'Yes, Mark as Not Installed'))
-                                        ],
-                                      );
-                                    });
-                              },
-                              tooltip: 'Mark as Not Installed',
-                              icon: const Icon(Icons.no_cell_outlined)),
                         if (source != null &&
                             source.additionalDataFormItems.isNotEmpty)
                           IconButton(
-                              onPressed: () {
+                              onPressed: app?.downloadProgress != null
-                                showDialog(
+                                  ? null
-                                    context: context,
+                                  : () {
-                                    builder: (BuildContext ctx) {
+                                      showDialog<List<String>>(
-                                      return GeneratedFormModal(
+                                          context: context,
-                                          title: 'Additional Options',
+                                          builder: (BuildContext ctx) {
-                                          items: source.additionalDataFormItems,
+                                            return GeneratedFormModal(
-                                          defaultValues:
+                                                title: 'Additional Options',
-                                              source.additionalDataDefaults);
+                                                items: source
-                                    }).then((values) {
+                                                    .additionalDataFormItems,
-                                  if (app != null && values != null) {
+                                                defaultValues: app != null
-                                    var changedApp = app.app;
+                                                    ? app.app.additionalData
-                                    changedApp.additionalData = values;
+                                                    : source
-                                    sourceProvider
+                                                        .additionalDataDefaults);
-                                        .getApp(source, changedApp.url,
+                                          }).then((values) {
-                                            changedApp.additionalData)
+                                        if (app != null && values != null) {
-                                        .then((finalChangedApp) {
+                                          var changedApp = app.app;
-                                      appsProvider.saveApp(finalChangedApp);
+                                          changedApp.additionalData = values;
-                                    }).catchError((e) {
+                                          appsProvider.saveApps(
-                                      ScaffoldMessenger.of(context)
+                                              [changedApp]).then((value) {
-                                          .showSnackBar(
+                                            getUpdate(changedApp.id);
-                                        SnackBar(content: Text(e.toString())),
+                                          });
-                                      );
+                                        }
-                                    });
+                                      });
-                                  }
+                                    },
-                                });
+                              tooltip: 'Additional Options',
-                              },
                               icon: const Icon(Icons.settings)),
                         const SizedBox(width: 16.0),
                         Expanded(
@@ -205,12 +223,18 @@ class _AppPageState extends State<AppPage> {
                                     ? () {
                                         HapticFeedback.heavyImpact();
                                         appsProvider
-                                            .downloadAndInstallLatestApp(
+                                            .downloadAndInstallLatestApps(
                                                 [app!.app.id],
                                                 context).then((res) {
-                                          if (res && mounted) {
+                                          if (res.isNotEmpty && mounted) {
                                             Navigator.of(context).pop();
                                           }
+                                        }).catchError((e) {
+                                          ScaffoldMessenger.of(context)
+                                              .showSnackBar(
+                                            SnackBar(
+                                                content: Text(e.toString())),
+                                          );
                                         });
                                       }
                                     : null,
@@ -228,15 +252,14 @@ class _AppPageState extends State<AppPage> {
                                         return AlertDialog(
                                           title: const Text('Remove App?'),
                                           content: Text(
-                                              'This will remove \'${app?.app.name}\' from Obtainium.${app?.app.installedVersion != null ? '\n\nNote that while Obtainium will no longer track its updates, the App will remain installed.' : ''}'),
+                                              'This will remove \'${app?.installedInfo?.name ?? app?.app.name}\' from Obtainium.${app?.app.installedVersion != null ? '\n\nNote that while Obtainium will no longer track its updates, the App will remain installed.' : ''}'),
                                           actions: [
                                             TextButton(
                                                 onPressed: () {
                                                   HapticFeedback
                                                       .selectionClick();
-                                                  appsProvider
+                                                  appsProvider.removeApps(
-                                                      .removeApp(app!.app.id)
+                                                      [app!.app.id]).then((_) {
-                                                      .then((_) {
                                                     int count = 0;
                                                     Navigator.of(context)
                                                         .popUntil((_) =>

lib/pages/apps.dart

@@ -6,29 +6,74 @@ import 'package:obtainium/components/generated_form_modal.dart';
 import 'package:obtainium/pages/app.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:share_plus/share_plus.dart';
+import 'package:url_launcher/url_launcher_string.dart';
 
 class AppsPage extends StatefulWidget {
   const AppsPage({super.key});
 
   @override
-  State<AppsPage> createState() => _AppsPageState();
+  State<AppsPage> createState() => AppsPageState();
 }
 
-class _AppsPageState extends State<AppsPage> {
+class AppsPageState extends State<AppsPage> {
   AppsFilter? filter;
+  var updatesOnlyFilter =
+      AppsFilter(includeUptodate: false, includeNonInstalled: false);
+  Set<String> selectedIds = {};
+
+  clearSelected() {
+    if (selectedIds.isNotEmpty) {
+      setState(() {
+        selectedIds.clear();
+      });
+      return true;
+    }
+    return false;
+  }
+
+  selectThese(List<String> appIds) {
+    if (selectedIds.isEmpty) {
+      setState(() {
+        for (var a in appIds) {
+          selectedIds.add(a);
+        }
+      });
+    }
+  }
 
   @override
   Widget build(BuildContext context) {
     var appsProvider = context.watch<AppsProvider>();
     var settingsProvider = context.watch<SettingsProvider>();
-    var existingUpdateAppIds = appsProvider.getExistingUpdates();
     var sortedApps = appsProvider.apps.values.toList();
+    var currentFilterIsUpdatesOnly =
+        filter?.isIdenticalTo(updatesOnlyFilter) ?? false;
+
+    selectedIds = selectedIds
+        .where((element) => sortedApps.map((e) => e.app.id).contains(element))
+        .toSet();
+
+    toggleAppSelected(String appId) {
+      setState(() {
+        if (selectedIds.contains(appId)) {
+          selectedIds.remove(appId);
+        } else {
+          selectedIds.add(appId);
+        }
+      });
+    }
 
     if (filter != null) {
       sortedApps = sortedApps.where((app) {
         if (app.app.installedVersion == app.app.latestVersion &&
-            filter!.onlyNonLatest) {
+            !(filter!.includeUptodate)) {
+          return false;
+        }
+        if (app.app.installedVersion == null &&
+            !(filter!.includeNonInstalled)) {
           return false;
         }
         if (filter!.nameFilter.isEmpty && filter!.authorFilter.isEmpty) {
@@ -44,7 +89,8 @@ class _AppsPageState extends State<AppsPage> {
             .toList();
 
         for (var t in nameTokens) {
-          if (!app.app.name.toLowerCase().contains(t.toLowerCase())) {
+          var name = app.installedInfo?.name ?? app.app.name;
+          if (!name.toLowerCase().contains(t.toLowerCase())) {
             return false;
           }
         }
@@ -58,152 +104,467 @@ class _AppsPageState extends State<AppsPage> {
     }
 
     sortedApps.sort((a, b) {
+      var nameA = a.installedInfo?.name ?? a.app.name;
+      var nameB = b.installedInfo?.name ?? b.app.name;
       int result = 0;
       if (settingsProvider.sortColumn == SortColumnSettings.authorName) {
-        result =
+        result = (a.app.author + nameA).compareTo(b.app.author + nameB);
-            (a.app.author + a.app.name).compareTo(b.app.author + b.app.name);
       } else if (settingsProvider.sortColumn == SortColumnSettings.nameAuthor) {
-        result =
+        result = (nameA + a.app.author).compareTo(nameB + b.app.author);
-            (a.app.name + a.app.author).compareTo(b.app.name + b.app.author);
       }
       return result;
     });
 
-    if (settingsProvider.sortOrder == SortOrderSettings.ascending) {
+    if (settingsProvider.sortOrder == SortOrderSettings.descending) {
       sortedApps = sortedApps.reversed.toList();
     }
 
+    var existingUpdateIdsAllOrSelected = appsProvider
+        .getExistingUpdates(installedOnly: true)
+        .where((element) => selectedIds.isEmpty
+            ? sortedApps.where((a) => a.app.id == element).isNotEmpty
+            : selectedIds.contains(element))
+        .toList();
+    var newInstallIdsAllOrSelected = appsProvider
+        .getExistingUpdates(nonInstalledOnly: true)
+        .where((element) => selectedIds.isEmpty
+            ? sortedApps.where((a) => a.app.id == element).isNotEmpty
+            : selectedIds.contains(element))
+        .toList();
+
     return Scaffold(
-        backgroundColor: Theme.of(context).colorScheme.surface,
+      backgroundColor: Theme.of(context).colorScheme.surface,
-        floatingActionButton:
+      body: RefreshIndicator(
-            Row(mainAxisAlignment: MainAxisAlignment.end, children: [
+          onRefresh: () {
-          existingUpdateAppIds.isEmpty || filter != null
+            HapticFeedback.lightImpact();
-              ? const SizedBox()
+            return appsProvider.checkUpdates().catchError((e) {
-              : ElevatedButton.icon(
+              ScaffoldMessenger.of(context).showSnackBar(
-                  onPressed: appsProvider.areDownloadsRunning()
+                SnackBar(content: Text(e.toString())),
-                      ? null
+              );
-                      : () {
+            });
-                          HapticFeedback.heavyImpact();
+          },
-                          settingsProvider.getInstallPermission().then((_) {
+          child: CustomScrollView(slivers: <Widget>[
-                            appsProvider.downloadAndInstallLatestApp(
+            const CustomAppBar(title: 'Apps'),
-                                existingUpdateAppIds, context);
+            if (appsProvider.loadingApps || sortedApps.isEmpty)
-                          });
+              SliverFillRemaining(
-                        },
+                  child: Center(
-                  icon: const Icon(Icons.install_mobile_outlined),
+                      child: appsProvider.loadingApps
-                  label: const Text('Install All')),
+                          ? const CircularProgressIndicator()
-          const SizedBox(
+                          : Text(
-            width: 16,
+                              appsProvider.apps.isEmpty
-          ),
+                                  ? 'No Apps'
-          appsProvider.apps.isEmpty
+                                  : 'No Apps for Filter',
-              ? const SizedBox()
+                              style: Theme.of(context).textTheme.headlineMedium,
-              : ElevatedButton.icon(
+                              textAlign: TextAlign.center,
-                  onPressed: () {
+                            ))),
-                    showDialog<List<String>?>(
+            SliverList(
-                        context: context,
+                delegate: SliverChildBuilderDelegate(
-                        builder: (BuildContext ctx) {
+                    (BuildContext context, int index) {
-                          return GeneratedFormModal(
+              return ListTile(
-                              title: 'Filter Apps',
+                selectedTileColor:
-                              items: [
+                    Theme.of(context).colorScheme.primary.withOpacity(0.1),
-                                [
+                selected: selectedIds.contains(sortedApps[index].app.id),
-                                  GeneratedFormItem(
+                onLongPress: () {
-                                      label: "App Name", required: false),
+                  toggleAppSelected(sortedApps[index].app.id);
-                                  GeneratedFormItem(
+                },
-                                      label: "Author", required: false)
+                leading: sortedApps[index].installedInfo != null
-                                ],
+                    ? Image.memory(sortedApps[index].installedInfo!.icon!)
-                                [
+                    : null,
-                                  GeneratedFormItem(
+                title: Text(sortedApps[index].installedInfo?.name ??
-                                      label: "Ignore Up-to-Date Apps",
+                    sortedApps[index].app.name),
-                                      type: FormItemType.bool)
+                subtitle: Text('By ${sortedApps[index].app.author}'),
-                                ]
+                trailing: sortedApps[index].downloadProgress != null
-                              ],
+                    ? Text(
-                              defaultValues: filter == null
+                        'Downloading - ${sortedApps[index].downloadProgress?.toInt()}%')
-                                  ? []
+                    : (sortedApps[index].app.installedVersion != null &&
-                                  : [
+                            sortedApps[index].app.installedVersion !=
-                                      filter!.nameFilter,
+                                sortedApps[index].app.latestVersion
-                                      filter!.authorFilter,
+                        ? Column(
-                                      filter!.onlyNonLatest ? 'true' : ''
+                            mainAxisAlignment: MainAxisAlignment.center,
-                                    ]);
+                            crossAxisAlignment: CrossAxisAlignment.end,
-                        }).then((values) {
+                            children: [
-                      if (values != null &&
+                              Text(appsProvider.areDownloadsRunning()
-                          values
+                                  ? 'Please Wait...'
-                              .where((element) => element.isNotEmpty)
+                                  : 'Update Available'),
-                              .isNotEmpty) {
+                              SourceProvider()
-                        setState(() {
+                                          .getSource(sortedApps[index].app.url)
-                          filter = AppsFilter(
+                                          .changeLogPageFromStandardUrl(
-                              nameFilter: values[0],
+                                              sortedApps[index].app.url) ==
-                              authorFilter: values[1],
+                                      null
-                              onlyNonLatest: values[2] == "true");
+                                  ? const SizedBox()
-                        });
+                                  : GestureDetector(
-                      } else {
+                                      onTap: () {
-                        setState(() {
+                                        launchUrlString(
-                          filter = null;
+                                            SourceProvider()
-                        });
+                                                .getSource(
-                      }
+                                                    sortedApps[index].app.url)
-                    });
+                                                .changeLogPageFromStandardUrl(
-                  },
+                                                    sortedApps[index].app.url)!,
-                  label: Text(filter == null ? 'Search' : 'Modify Search'),
+                                            mode:
-                  icon: Icon(
+                                                LaunchMode.externalApplication);
-                      filter == null ? Icons.search : Icons.manage_search)),
+                                      },
-        ]),
+                                      child: const Text(
-        body: RefreshIndicator(
+                                        'See Changes',
-            onRefresh: () {
+                                        style: TextStyle(
-              HapticFeedback.lightImpact();
+                                            fontStyle: FontStyle.italic,
-              return appsProvider.checkUpdates().catchError((e) {
+                                            decoration:
-                ScaffoldMessenger.of(context).showSnackBar(
+                                                TextDecoration.underline),
-                  SnackBar(content: Text(e.toString())),
+                                      )),
-                );
+                            ],
-              });
+                          )
-            },
+                        : SingleChildScrollView(
-            child: CustomScrollView(slivers: <Widget>[
+                            child: SizedBox(
-              const CustomAppBar(title: 'Apps'),
+                                width: 80,
-              if (appsProvider.loadingApps || sortedApps.isEmpty)
+                                child: Text(
-                SliverFillRemaining(
+                                  sortedApps[index].app.installedVersion ??
-                    child: Center(
+                                      'Not Installed',
-                        child: appsProvider.loadingApps
+                                  overflow: TextOverflow.fade,
-                            ? const CircularProgressIndicator()
+                                  textAlign: TextAlign.end,
-                            : Text(
+                                )))),
-                                appsProvider.apps.isEmpty
+                onTap: () {
-                                    ? 'No Apps'
+                  if (selectedIds.isNotEmpty) {
-                                    : 'No Search Results',
+                    toggleAppSelected(sortedApps[index].app.id);
-                                style:
+                  } else {
-                                    Theme.of(context).textTheme.headlineMedium,
-                              ))),
-              SliverList(
-                  delegate: SliverChildBuilderDelegate(
-                      (BuildContext context, int index) {
-                return ListTile(
-                  title: Text(sortedApps[index].app.name),
-                  subtitle: Text('By ${sortedApps[index].app.author}'),
-                  trailing: sortedApps[index].downloadProgress != null
-                      ? Text(
-                          'Downloading - ${sortedApps[index].downloadProgress?.toInt()}%')
-                      : (sortedApps[index].app.installedVersion != null &&
-                              sortedApps[index].app.installedVersion !=
-                                  sortedApps[index].app.latestVersion
-                          ? const Text('Update Available')
-                          : Text(sortedApps[index].app.installedVersion ??
-                              'Not Installed')),
-                  onTap: () {
                     Navigator.push(
                       context,
                       MaterialPageRoute(
                           builder: (context) =>
                               AppPage(appId: sortedApps[index].app.id)),
                     );
-                  },
+                  }
-                );
+                },
-              }, childCount: sortedApps.length))
+              );
-            ])));
+            }, childCount: sortedApps.length))
+          ])),
+      persistentFooterButtons: [
+        Row(
+          children: [
+            IconButton(
+                onPressed: () {
+                  selectedIds.isEmpty
+                      ? selectThese(sortedApps.map((e) => e.app.id).toList())
+                      : clearSelected();
+                },
+                icon: Icon(
+                  selectedIds.isEmpty
+                      ? Icons.select_all_outlined
+                      : Icons.deselect_outlined,
+                  color: Theme.of(context).colorScheme.primary,
+                ),
+                tooltip: selectedIds.isEmpty
+                    ? 'Select All'
+                    : 'Deselect ${selectedIds.length.toString()}'),
+            const VerticalDivider(),
+            Expanded(
+                child: Row(
+              mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+              children: [
+                selectedIds.isEmpty
+                    ? const SizedBox()
+                    : IconButton(
+                        visualDensity: VisualDensity.compact,
+                        onPressed: () {
+                          showDialog<List<String>?>(
+                              context: context,
+                              builder: (BuildContext ctx) {
+                                return GeneratedFormModal(
+                                  title: 'Remove Selected Apps?',
+                                  items: const [],
+                                  defaultValues: const [],
+                                  initValid: true,
+                                  message:
+                                      '${selectedIds.length} App${selectedIds.length == 1 ? '' : 's'} will be removed from Obtainium but remain installed. You still need to uninstall ${selectedIds.length == 1 ? 'it' : 'them'} manually.',
+                                );
+                              }).then((values) {
+                            if (values != null) {
+                              appsProvider.removeApps(selectedIds.toList());
+                            }
+                          });
+                        },
+                        tooltip: 'Remove Selected Apps',
+                        icon: const Icon(Icons.delete_outline_outlined),
+                      ),
+                IconButton(
+                    visualDensity: VisualDensity.compact,
+                    onPressed: appsProvider.areDownloadsRunning() ||
+                            (existingUpdateIdsAllOrSelected.isEmpty &&
+                                newInstallIdsAllOrSelected.isEmpty)
+                        ? null
+                        : () {
+                            HapticFeedback.heavyImpact();
+                            List<List<GeneratedFormItem>> formInputs = [];
+                            if (existingUpdateIdsAllOrSelected.isNotEmpty &&
+                                newInstallIdsAllOrSelected.isNotEmpty) {
+                              formInputs.add([
+                                GeneratedFormItem(
+                                    label:
+                                        'Update ${existingUpdateIdsAllOrSelected.length} App${existingUpdateIdsAllOrSelected.length == 1 ? '' : 's'}',
+                                    type: FormItemType.bool)
+                              ]);
+                              formInputs.add([
+                                GeneratedFormItem(
+                                    label:
+                                        'Install ${newInstallIdsAllOrSelected.length} new App${newInstallIdsAllOrSelected.length == 1 ? '' : 's'}',
+                                    type: FormItemType.bool)
+                              ]);
+                            }
+                            showDialog<List<String>?>(
+                                context: context,
+                                builder: (BuildContext ctx) {
+                                  return GeneratedFormModal(
+                                    title:
+                                        'Install${selectedIds.isEmpty ? ' ' : ' Selected '}Apps?',
+                                    message:
+                                        '${existingUpdateIdsAllOrSelected.length} update${existingUpdateIdsAllOrSelected.length == 1 ? '' : 's'} and ${newInstallIdsAllOrSelected.length} new install${newInstallIdsAllOrSelected.length == 1 ? '' : 's'}.',
+                                    items: formInputs,
+                                    defaultValues: [
+                                      'true',
+                                      existingUpdateIdsAllOrSelected.isEmpty
+                                          ? 'true'
+                                          : ''
+                                    ],
+                                    initValid: true,
+                                  );
+                                }).then((values) {
+                              if (values != null) {
+                                bool shouldInstallUpdates =
+                                    values.isEmpty || values[0] == 'true';
+                                bool shouldInstallNew = values.isEmpty ||
+                                    (values.length >= 2 && values[1] == 'true');
+                                settingsProvider
+                                    .getInstallPermission()
+                                    .then((_) {
+                                  List<String> toInstall = [];
+                                  if (shouldInstallUpdates) {
+                                    toInstall
+                                        .addAll(existingUpdateIdsAllOrSelected);
+                                  }
+                                  if (shouldInstallNew) {
+                                    toInstall
+                                        .addAll(newInstallIdsAllOrSelected);
+                                  }
+                                  appsProvider
+                                      .downloadAndInstallLatestApps(
+                                          toInstall, context)
+                                      .catchError((e) {
+                                    ScaffoldMessenger.of(context).showSnackBar(
+                                      SnackBar(content: Text(e.toString())),
+                                    );
+                                  });
+                                });
+                              }
+                            });
+                          },
+                    tooltip:
+                        'Install/Update${selectedIds.isEmpty ? ' ' : ' Selected '}Apps',
+                    icon: const Icon(
+                      Icons.file_download_outlined,
+                    )),
+                selectedIds.isEmpty
+                    ? const SizedBox()
+                    : IconButton(
+                        visualDensity: VisualDensity.compact,
+                        onPressed: () {
+                          showDialog(
+                              context: context,
+                              builder: (BuildContext ctx) {
+                                return AlertDialog(
+                                  scrollable: true,
+                                  content: Padding(
+                                    padding: const EdgeInsets.only(top: 6),
+                                    child: Row(
+                                        mainAxisAlignment:
+                                            MainAxisAlignment.spaceAround,
+                                        children: [
+                                          IconButton(
+                                              onPressed:
+                                                  appsProvider
+                                                          .areDownloadsRunning()
+                                                      ? null
+                                                      : () {
+                                                          showDialog(
+                                                              context: context,
+                                                              builder:
+                                                                  (BuildContext
+                                                                      ctx) {
+                                                                return AlertDialog(
+                                                                  title: Text(
+                                                                      'Mark ${selectedIds.length} Selected Apps as Updated?'),
+                                                                  content:
+                                                                      const Text(
+                                                                          'Only applies to installed but out of date Apps.'),
+                                                                  actions: [
+                                                                    TextButton(
+                                                                        onPressed:
+                                                                            () {
+                                                                          Navigator.of(context)
+                                                                              .pop();
+                                                                        },
+                                                                        child: const Text(
+                                                                            'No')),
+                                                                    TextButton(
+                                                                        onPressed:
+                                                                            () {
+                                                                          HapticFeedback
+                                                                              .selectionClick();
+                                                                          appsProvider
+                                                                              .saveApps(selectedIds.map((e) {
+                                                                            var a =
+                                                                                appsProvider.apps[e]!.app;
+                                                                            if (a.installedVersion !=
+                                                                                null) {
+                                                                              a.installedVersion = a.latestVersion;
+                                                                            }
+                                                                            return a;
+                                                                          }).toList());
+
+                                                                          Navigator.of(context)
+                                                                              .pop();
+                                                                        },
+                                                                        child: const Text(
+                                                                            'Yes'))
+                                                                  ],
+                                                                );
+                                                              });
+                                                        },
+                                              tooltip:
+                                                  'Mark Selected Apps as Updated',
+                                              icon: const Icon(Icons.done)),
+                                          IconButton(
+                                            onPressed: () {
+                                              String urls = '';
+                                              for (var id in selectedIds) {
+                                                urls +=
+                                                    '${appsProvider.apps[id]!.app.url}\n';
+                                              }
+                                              urls = urls.substring(
+                                                  0, urls.length - 1);
+                                              Share.share(urls,
+                                                  subject:
+                                                      '${selectedIds.length} Selected App URLs from Obtainium');
+                                            },
+                                            tooltip: 'Share Selected App URLs',
+                                            icon: const Icon(Icons.share),
+                                          ),
+                                        ]),
+                                  ),
+                                );
+                              });
+                        },
+                        tooltip: 'More',
+                        icon: const Icon(Icons.more_horiz),
+                      ),
+              ],
+            )),
+            const VerticalDivider(),
+            IconButton(
+              visualDensity: VisualDensity.compact,
+              onPressed: () {
+                setState(() {
+                  if (currentFilterIsUpdatesOnly) {
+                    filter = null;
+                  } else {
+                    filter = updatesOnlyFilter;
+                  }
+                });
+              },
+              tooltip: currentFilterIsUpdatesOnly
+                  ? 'Remove Out-of-Date App Filter'
+                  : 'Show Out-of-Date Apps Only',
+              icon: Icon(
+                currentFilterIsUpdatesOnly
+                    ? Icons.update_disabled_rounded
+                    : Icons.update_rounded,
+                color: Theme.of(context).colorScheme.primary,
+              ),
+            ),
+            appsProvider.apps.isEmpty
+                ? const SizedBox()
+                : TextButton.icon(
+                    label: Text(
+                      filter == null ? 'Filter' : 'Filter *',
+                      style: TextStyle(
+                          fontWeight: filter == null
+                              ? FontWeight.normal
+                              : FontWeight.bold),
+                    ),
+                    onPressed: () {
+                      showDialog<List<String>?>(
+                          context: context,
+                          builder: (BuildContext ctx) {
+                            return GeneratedFormModal(
+                                title: 'Filter Apps',
+                                items: [
+                                  [
+                                    GeneratedFormItem(
+                                        label: 'App Name', required: false),
+                                    GeneratedFormItem(
+                                        label: 'Author', required: false)
+                                  ],
+                                  [
+                                    GeneratedFormItem(
+                                        label: 'Up to Date Apps',
+                                        type: FormItemType.bool)
+                                  ],
+                                  [
+                                    GeneratedFormItem(
+                                        label: 'Non-Installed Apps',
+                                        type: FormItemType.bool)
+                                  ]
+                                ],
+                                defaultValues: filter == null
+                                    ? AppsFilter().toValuesArray()
+                                    : filter!.toValuesArray());
+                          }).then((values) {
+                        if (values != null) {
+                          setState(() {
+                            filter = AppsFilter.fromValuesArray(values);
+                            if (AppsFilter().isIdenticalTo(filter!)) {
+                              filter = null;
+                            }
+                          });
+                        }
+                      });
+                    },
+                    icon: const Icon(Icons.filter_list_rounded))
+          ],
+        ),
+      ],
+    );
   }
 }
 
 class AppsFilter {
   late String nameFilter;
   late String authorFilter;
-  late bool onlyNonLatest;
+  late bool includeUptodate;
+  late bool includeNonInstalled;
 
   AppsFilter(
-      {this.nameFilter = "",
+      {this.nameFilter = '',
-      this.authorFilter = "",
+      this.authorFilter = '',
-      this.onlyNonLatest = false});
+      this.includeUptodate = true,
+      this.includeNonInstalled = true});
+
+  List<String> toValuesArray() {
+    return [
+      nameFilter,
+      authorFilter,
+      includeUptodate ? 'true' : '',
+      includeNonInstalled ? 'true' : ''
+    ];
+  }
+
+  AppsFilter.fromValuesArray(List<String> values) {
+    nameFilter = values[0];
+    authorFilter = values[1];
+    includeUptodate = values[2] == 'true';
+    includeNonInstalled = values[3] == 'true';
+  }
+
+  bool isIdenticalTo(AppsFilter other) =>
+      authorFilter.trim() == other.authorFilter.trim() &&
+      nameFilter.trim() == other.nameFilter.trim() &&
+      includeUptodate == other.includeUptodate &&
+      includeNonInstalled == other.includeNonInstalled;
 }

lib/pages/home.dart

@@ -25,7 +25,8 @@ class _HomePageState extends State<HomePage> {
   List<int> selectedIndexHistory = [];
 
   List<NavigationPageItem> pages = [
-    NavigationPageItem('Apps', Icons.apps, const AppsPage()),
+    NavigationPageItem(
+        'Apps', Icons.apps, AppsPage(key: GlobalKey<AppsPageState>())),
     NavigationPageItem('Add App', Icons.add, const AddAppPage()),
     NavigationPageItem(
         'Import/Export', Icons.import_export, const ImportExportPage()),
@@ -88,7 +89,10 @@ class _HomePageState extends State<HomePage> {
             });
             return false;
           }
-          return true;
+          return !(pages[0].widget.key as GlobalKey<AppsPageState>)
+              .currentState
+              ?.clearSelected();
+          // return !appsPageKey.currentState?.clearSelected();
         });
   }
 }

lib/pages/import_export.dart

@@ -40,14 +40,15 @@ class _ImportExportPageState extends State<ImportExportPage> {
 
     Future<List<List<String>>> addApps(List<String> urls) async {
       await settingsProvider.getInstallPermission();
-      List<dynamic> results = await sourceProvider.getApps(urls);
+      List<dynamic> results = await sourceProvider.getApps(urls,
+          ignoreUrls: appsProvider.apps.values.map((e) => e.app.url).toList());
       List<App> apps = results[0];
       Map<String, dynamic> errorsMap = results[1];
       for (var app in apps) {
         if (appsProvider.apps.containsKey(app.id)) {
           errorsMap.addAll({app.id: 'App already added'});
         } else {
-          await appsProvider.saveApp(app);
+          await appsProvider.saveApps([app]);
         }
       }
       List<List<String>> errors =
@@ -266,42 +267,67 @@ class _ImportExportPageState extends State<ImportExportPage> {
                                                       );
                                                     }).then((values) {
                                                   if (values != null) {
+                                                    setState(() {
+                                                      importInProgress = true;
+                                                    });
                                                     source
                                                         .getUrls(values)
                                                         .then((urls) {
-                                                      setState(() {
+                                                      showDialog<List<String>?>(
-                                                        importInProgress = true;
-                                                      });
-                                                      addApps(urls)
-                                                          .then((errors) {
-                                                        if (errors.isEmpty) {
-                                                          ScaffoldMessenger.of(
-                                                                  context)
-                                                              .showSnackBar(
-                                                            SnackBar(
-                                                                content: Text(
-                                                                    'Imported ${urls.length} Apps')),
-                                                          );
-                                                        } else {
-                                                          showDialog(
                                                               context: context,
                                                               builder:
                                                                   (BuildContext
                                                                       ctx) {
-                                                                return ImportErrorDialog(
+                                                                return UrlSelectionModal(
-                                                                    urlsLength: urls
+                                                                    urls: urls);
-                                                                        .length,
+                                                              })
-                                                                    errors:
+                                                          .then((selectedUrls) {
-                                                                        errors);
+                                                        if (selectedUrls !=
-                                                              });
+                                                            null) {
+                                                          addApps(selectedUrls)
+                                                              .then((errors) {
+                                                            if (errors
+                                                                .isEmpty) {
+                                                              ScaffoldMessenger
+                                                                      .of(context)
+                                                                  .showSnackBar(
+                                                                SnackBar(
+                                                                    content: Text(
+                                                                        'Imported ${selectedUrls.length} Apps')),
+                                                              );
+                                                            } else {
+                                                              showDialog(
+                                                                  context:
+                                                                      context,
+                                                                  builder:
+                                                                      (BuildContext
+                                                                          ctx) {
+                                                                    return ImportErrorDialog(
+                                                                        urlsLength:
+                                                                            selectedUrls
+                                                                                .length,
+                                                                        errors:
+                                                                            errors);
+                                                                  });
+                                                            }
+                                                          }).whenComplete(() {
+                                                            setState(() {
+                                                              importInProgress =
+                                                                  false;
+                                                            });
+                                                          });
+                                                        } else {
+                                                          setState(() {
+                                                            importInProgress =
+                                                                false;
+                                                          });
                                                         }
-                                                      }).whenComplete(() {
-                                                        setState(() {
-                                                          importInProgress =
-                                                              false;
-                                                        });
                                                       });
                                                     }).catchError((e) {
+                                                      setState(() {
+                                                        importInProgress =
+                                                            false;
+                                                      });
                                                       ScaffoldMessenger.of(
                                                               context)
                                                           .showSnackBar(
@@ -375,3 +401,67 @@ class _ImportErrorDialogState extends State<ImportErrorDialog> {
     );
   }
 }
+
+// ignore: must_be_immutable
+class UrlSelectionModal extends StatefulWidget {
+  UrlSelectionModal({super.key, required this.urls});
+
+  List<String> urls;
+
+  @override
+  State<UrlSelectionModal> createState() => _UrlSelectionModalState();
+}
+
+class _UrlSelectionModalState extends State<UrlSelectionModal> {
+  Map<String, bool> urlSelections = {};
+  @override
+  void initState() {
+    super.initState();
+    for (var url in widget.urls) {
+      urlSelections.putIfAbsent(url, () => true);
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return AlertDialog(
+      scrollable: true,
+      title: const Text('Select URLs to Import'),
+      content: Column(children: [
+        ...urlSelections.keys.map((url) {
+          return Row(children: [
+            Checkbox(
+                value: urlSelections[url],
+                onChanged: (value) {
+                  setState(() {
+                    urlSelections[url] = value ?? false;
+                  });
+                }),
+            const SizedBox(
+              width: 8,
+            ),
+            Expanded(
+                child: Text(
+              Uri.parse(url).path.substring(1),
+            ))
+          ]);
+        })
+      ]),
+      actions: [
+        TextButton(
+            onPressed: () {
+              Navigator.of(context).pop();
+            },
+            child: const Text('Cancel')),
+        TextButton(
+            onPressed: () {
+              Navigator.of(context).pop(urlSelections.keys
+                  .where((url) => urlSelections[url] ?? false)
+                  .toList());
+            },
+            child: Text(
+                'Import ${urlSelections.values.where((b) => b).length} URLs'))
+      ],
+    );
+  }
+}

lib/pages/settings.dart

@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:obtainium/components/custom_app_bar.dart';
+import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/providers/settings_provider.dart';
+import 'package:obtainium/providers/source_provider.dart';
 import 'package:provider/provider.dart';
 import 'package:url_launcher/url_launcher_string.dart';
 
@@ -15,6 +17,7 @@ class _SettingsPageState extends State<SettingsPage> {
   @override
   Widget build(BuildContext context) {
     SettingsProvider settingsProvider = context.watch<SettingsProvider>();
+    SourceProvider sourceProvider = SourceProvider();
     if (settingsProvider.prefs == null) {
       settingsProvider.initializeSettings();
     }
@@ -22,8 +25,7 @@ class _SettingsPageState extends State<SettingsPage> {
         backgroundColor: Theme.of(context).colorScheme.surface,
         body: CustomScrollView(slivers: <Widget>[
           const CustomAppBar(title: 'Settings'),
-          SliverFillRemaining(
+          SliverToBoxAdapter(
-              hasScrollBody: true,
               child: Padding(
                   padding: const EdgeInsets.all(16),
                   child: settingsProvider.prefs == null
@@ -160,7 +162,7 @@ class _SettingsPageState extends State<SettingsPage> {
                               height: 16,
                             ),
                             Text(
-                              'More',
+                              'Updates',
                               style: TextStyle(
                                   color: Theme.of(context).colorScheme.primary),
                             ),
@@ -169,68 +171,108 @@ class _SettingsPageState extends State<SettingsPage> {
                                     labelText:
                                         'Background Update Checking Interval'),
                                 value: settingsProvider.updateInterval,
-                                items: const [
+                                items: updateIntervals.map((e) {
-                                  DropdownMenuItem(
+                                  int displayNum = (e < 60
-                                    value: 15,
+                                          ? e
-                                    child: Text('15 Minutes'),
+                                          : e < 1440
-                                  ),
+                                              ? e / 60
-                                  DropdownMenuItem(
+                                              : e / 1440)
-                                    value: 30,
+                                      .round();
-                                    child: Text('30 Minutes'),
+                                  var displayUnit = (e < 60
-                                  ),
+                                      ? 'Minute'
-                                  DropdownMenuItem(
+                                      : e < 1440
-                                    value: 60,
+                                          ? 'Hour'
-                                    child: Text('1 Hour'),
+                                          : 'Day');
-                                  ),
+
-                                  DropdownMenuItem(
+                                  String display = e == 0
-                                    value: 360,
+                                      ? 'Never - Manual Only'
-                                    child: Text('6 Hours'),
+                                      : '$displayNum $displayUnit${displayNum == 1 ? '' : 's'}';
-                                  ),
+                                  return DropdownMenuItem(
-                                  DropdownMenuItem(
+                                      value: e, child: Text(display));
-                                    value: 720,
+                                }).toList(),
-                                    child: Text('12 Hours'),
-                                  ),
-                                  DropdownMenuItem(
-                                    value: 1440,
-                                    child: Text('1 Day'),
-                                  ),
-                                  DropdownMenuItem(
-                                    value: 0,
-                                    child: Text('Never - Manual Only'),
-                                  ),
-                                ],
                                 onChanged: (value) {
                                   if (value != null) {
                                     settingsProvider.updateInterval = value;
                                   }
                                 }),
-                            const Spacer(),
+                            const SizedBox(
-                            Row(
+                              height: 8,
-                              mainAxisAlignment: MainAxisAlignment.center,
-                              children: [
-                                TextButton.icon(
-                                  style: ButtonStyle(
-                                    foregroundColor:
-                                        MaterialStateProperty.resolveWith<
-                                            Color>((Set<MaterialState> states) {
-                                      return Colors.grey;
-                                    }),
-                                  ),
-                                  onPressed: () {
-                                    launchUrlString(settingsProvider.sourceUrl,
-                                        mode: LaunchMode.externalApplication);
-                                  },
-                                  icon: const Icon(Icons.code),
-                                  label: Text(
-                                    'Source',
-                                    style:
-                                        Theme.of(context).textTheme.bodySmall,
-                                  ),
-                                )
-                              ],
                             ),
+                            Text(
+                              'Longer intervals recommended for large App collections',
+                              style: Theme.of(context)
+                                  .textTheme
+                                  .labelMedium!
+                                  .merge(const TextStyle(
+                                      fontStyle: FontStyle.italic)),
+                            ),
+                            const Divider(
+                              height: 48,
+                            ),
+                            Text(
+                              'Source-Specific',
+                              style: TextStyle(
+                                  color: Theme.of(context).colorScheme.primary),
+                            ),
+                            ...sourceProvider.sources.map((e) {
+                              if (e.moreSourceSettingsFormItems.isNotEmpty) {
+                                return GeneratedForm(
+                                    items: e.moreSourceSettingsFormItems
+                                        .map((e) => [e])
+                                        .toList(),
+                                    onValueChanges: (values, valid) {
+                                      if (valid) {
+                                        for (var i = 0;
+                                            i < values.length;
+                                            i++) {
+                                          settingsProvider.setSettingString(
+                                              e.moreSourceSettingsFormItems[i]
+                                                  .id,
+                                              values[i]);
+                                        }
+                                      }
+                                    },
+                                    defaultValues:
+                                        e.moreSourceSettingsFormItems.map((e) {
+                                      return settingsProvider
+                                              .getSettingString(e.id) ??
+                                          '';
+                                    }).toList());
+                              } else {
+                                return Container();
+                              }
+                            }),
                           ],
-                        )))
+                        ))),
+          SliverToBoxAdapter(
+            child: Column(
+              children: [
+                const SizedBox(
+                  height: 16,
+                ),
+                TextButton.icon(
+                  style: ButtonStyle(
+                    foregroundColor: MaterialStateProperty.resolveWith<Color>(
+                        (Set<MaterialState> states) {
+                      return Colors.grey;
+                    }),
+                  ),
+                  onPressed: () {
+                    launchUrlString(settingsProvider.sourceUrl,
+                        mode: LaunchMode.externalApplication);
+                  },
+                  icon: const Icon(Icons.code),
+                  label: Text(
+                    'Source',
+                    style: Theme.of(context).textTheme.bodySmall,
+                  ),
+                ),
+                const SizedBox(
+                  height: 16,
+                ),
+              ],
+            ),
+          )
         ]));
   }
 }

lib/pages/test_page.dart

@@ -1,53 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:obtainium/components/generated_form.dart';
-
-class TestPage extends StatefulWidget {
-  const TestPage({super.key});
-
-  @override
-  State<TestPage> createState() => _TestPageState();
-}
-
-class _TestPageState extends State<TestPage> {
-  List<String?>? sourceSpecificData;
-  bool valid = false;
-
-  List<List<GeneratedFormItem>> sourceSpecificInputs = [
-    [GeneratedFormItem(label: 'Test Item 1')],
-    [
-      GeneratedFormItem(label: 'Test Item 2', required: false),
-      GeneratedFormItem(label: 'Test Item 3')
-    ],
-    [GeneratedFormItem(label: 'Test Item 4', type: FormItemType.bool)]
-  ];
-
-  List<String> defaultInputValues = ["ABC"];
-
-  void onSourceSpecificDataChanges(
-      List<String?> valuesFromForm, bool formValid) {
-    setState(() {
-      sourceSpecificData = valuesFromForm;
-      valid = formValid;
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-        appBar: AppBar(title: const Text('Test Page')),
-        backgroundColor: Theme.of(context).colorScheme.surface,
-        body: Padding(
-            padding: const EdgeInsets.symmetric(horizontal: 16),
-            child: Column(children: [
-              GeneratedForm(
-                items: sourceSpecificInputs,
-                onValueChanges: onSourceSpecificDataChanges,
-                defaultValues: defaultInputValues,
-              ),
-              ...(sourceSpecificData != null
-                  ? (sourceSpecificData as List<String?>)
-                      .map((e) => Text(e ?? ""))
-                  : [Container()])
-            ])));
-  }
-}

lib/providers/apps_provider.dart

@@ -5,27 +5,35 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 
+import 'package:device_info_plus/device_info_plus.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:fluttertoast/fluttertoast.dart';
+import 'package:install_plugin_v2/install_plugin_v2.dart';
+import 'package:installed_apps/app_info.dart';
+import 'package:installed_apps/installed_apps.dart';
+import 'package:obtainium/app_sources/github.dart';
+import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/providers/notifications_provider.dart';
+import 'package:package_archive_info/package_archive_info.dart';
 import 'package:provider/provider.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:flutter_fgbg/flutter_fgbg.dart';
 import 'package:obtainium/providers/source_provider.dart';
 import 'package:http/http.dart';
-import 'package:install_plugin_v2/install_plugin_v2.dart';
 
 class AppInMemory {
   late App app;
   double? downloadProgress;
+  AppInfo? installedInfo; // Also indicates that an App is installed
 
-  AppInMemory(this.app, this.downloadProgress);
+  AppInMemory(this.app, this.downloadProgress, this.installedInfo);
 }
 
-class ApkFile {
+class DownloadedApp {
   String appId;
   File file;
-  ApkFile(this.appId, this.file);
+  DownloadedApp(this.appId, this.file);
 }
 
 class AppsProvider with ChangeNotifier {
@@ -36,24 +44,24 @@ class AppsProvider with ChangeNotifier {
 
   // Variables to keep track of the app foreground status (installs can't run in the background)
   bool isForeground = true;
-  late Stream<FGBGType> foregroundStream;
+  late Stream<FGBGType>? foregroundStream;
-  late StreamSubscription<FGBGType> foregroundSubscription;
+  late StreamSubscription<FGBGType>? foregroundSubscription;
 
   AppsProvider(
       {bool shouldLoadApps = false,
       bool shouldCheckUpdatesAfterLoad = false,
       bool shouldDeleteAPKs = false}) {
-    // Subscribe to changes in the app foreground status
-    foregroundStream = FGBGEvents.stream.asBroadcastStream();
-    foregroundSubscription = foregroundStream.listen((event) async {
-      isForeground = event == FGBGType.foreground;
-      if (isForeground) await loadApps();
-    });
-    if (shouldDeleteAPKs) {
-      deleteSavedAPKs();
-    }
     if (shouldLoadApps) {
+      // Subscribe to changes in the app foreground status
+      foregroundStream = FGBGEvents.stream.asBroadcastStream();
+      foregroundSubscription = foregroundStream?.listen((event) async {
+        isForeground = event == FGBGType.foreground;
+        if (isForeground) await loadApps();
+      });
       loadApps().then((_) {
+        if (shouldDeleteAPKs) {
+          deleteSavedAPKs();
+        }
         if (shouldCheckUpdatesAfterLoad) {
           checkUpdates();
         }
@@ -61,108 +69,289 @@ class AppsProvider with ChangeNotifier {
     }
   }
 
-  Future<ApkFile> downloadApp(String apkUrl, String appId) async {
+  downloadApk(String apkUrl, String fileName, Function? onProgress,
+      Function? urlModifier,
+      {bool useExistingIfExists = true}) async {
+    var destDir = (await getExternalStorageDirectory())!.path;
+    if (urlModifier != null) {
+      apkUrl = await urlModifier(apkUrl);
+    }
     StreamedResponse response =
         await Client().send(Request('GET', Uri.parse(apkUrl)));
-    File downloadFile =
+    File downloadFile = File('$destDir/$fileName.apk');
-        File('${(await getExternalStorageDirectory())!.path}/$appId.apk');
+    var alreadyExists = downloadFile.existsSync();
-    if (downloadFile.existsSync()) {
+    if (!alreadyExists || !useExistingIfExists) {
-      downloadFile.deleteSync();
+      if (alreadyExists) {
-    }
+        downloadFile.deleteSync();
-    var length = response.contentLength;
+      }
-    var received = 0;
-    var sink = downloadFile.openWrite();
 
-    await response.stream.map((s) {
+      var length = response.contentLength;
-      received += s.length;
+      var received = 0;
-      apps[appId]!.downloadProgress =
+      double? progress;
-          (length != null ? received / length * 100 : 30);
+      var sink = downloadFile.openWrite();
+
+      await response.stream.map((s) {
+        received += s.length;
+        progress = (length != null ? received / length * 100 : 30);
+        if (onProgress != null) {
+          onProgress(progress);
+        }
+        return s;
+      }).pipe(sink);
+
+      await sink.close();
+      progress = null;
+      if (onProgress != null) {
+        onProgress(progress);
+      }
+
+      if (response.statusCode != 200) {
+        downloadFile.deleteSync();
+        throw response.reasonPhrase ?? 'Unknown Error';
+      }
+    }
+    return downloadFile;
+  }
+
+  // Downloads the App (preferred URL) and returns an ApkFile object
+  // If the app was already saved, updates it's download progress % in memory
+  // But also works for Apps that are not saved
+  Future<DownloadedApp> downloadApp(App app,
+      {bool showOccasionalProgressToast = false}) async {
+    int? prevProg;
+    var fileName = '${app.id}-${app.latestVersion}-${app.preferredApkIndex}';
+    File downloadFile = await downloadApk(app.apkUrls[app.preferredApkIndex],
+        '${app.id}-${app.latestVersion}-${app.preferredApkIndex}',
+        (double? progress) {
+      if (apps[app.id] != null) {
+        apps[app.id]!.downloadProgress = progress;
+      }
+      int? prog = progress?.ceil();
+      if (showOccasionalProgressToast &&
+          (prog == 25 || prog == 50 || prog == 75) &&
+          prevProg != prog) {
+        Fluttertoast.showToast(
+            msg: 'Progress: $prog%', toastLength: Toast.LENGTH_SHORT);
+      }
+      prevProg = prog;
       notifyListeners();
-      return s;
+    }, SourceProvider().getSource(app.url).apkUrlPrefetchModifier);
-    }).pipe(sink);
+    // Delete older versions of the APK if any
-
+    for (var file in downloadFile.parent.listSync()) {
-    await sink.close();
+      var fn = file.path.split('/').last;
-    apps[appId]!.downloadProgress = null;
+      if (fn.startsWith('${app.id}-') &&
-    notifyListeners();
+          fn.endsWith('.apk') &&
-
+          fn != '$fileName.apk') {
-    if (response.statusCode != 200) {
+        file.delete();
-      downloadFile.deleteSync();
+      }
-      throw response.reasonPhrase ?? 'Unknown Error';
     }
-    return ApkFile(appId, downloadFile);
+    // If the ID has changed (as it should on first download), replace it
+    var newInfo = await PackageArchiveInfo.fromPath(downloadFile.path);
+    if (app.id != newInfo.packageName) {
+      var originalAppId = app.id;
+      app.id = newInfo.packageName;
+      downloadFile = downloadFile.renameSync(
+          '${downloadFile.parent.path}/${app.id}-${app.latestVersion}-${app.preferredApkIndex}.apk');
+      if (apps[originalAppId] != null) {
+        await removeApps([originalAppId]);
+        await saveApps([app]);
+      }
+    }
+    return DownloadedApp(app.id, downloadFile);
   }
 
   bool areDownloadsRunning() => apps.values
       .where((element) => element.downloadProgress != null)
       .isNotEmpty;
 
-  // Given an AppId, uses stored info about the app to download an APK (with user input if needed) and install it
+  Future<bool> canInstallSilently(App app) async {
-  // Installs can only be done in the foreground, so a notification is sent to get the user's attention if needed
+    // TODO: This is unreliable - try to get from OS in the future
-  // Returns upon successful download, regardless of installation result
+    var osInfo = await DeviceInfoPlugin().androidInfo;
-  Future<bool> downloadAndInstallLatestApp(
+    return app.installedVersion != null &&
-      List<String> appIds, BuildContext context) async {
+        osInfo.version.sdkInt >= 30 &&
+        osInfo.version.release.compareTo('12') >= 0;
+  }
+
+  Future<void> askUserToReturnToForeground(BuildContext context,
+      {bool waitForFG = false}) async {
     NotificationsProvider notificationsProvider =
         context.read<NotificationsProvider>();
-    Map<String, String> appsToInstall = {};
+    if (!isForeground) {
+      await notificationsProvider.notify(completeInstallationNotification,
+          cancelExisting: true);
+      if (waitForFG) {
+        await FGBGEvents.stream.first == FGBGType.foreground;
+        await notificationsProvider.cancel(completeInstallationNotification.id);
+      }
+    }
+  }
+
+  // Unfortunately this 'await' does not actually wait for the APK to finish installing
+  // So we only know that the install prompt was shown, but the user could still cancel w/o us knowing
+  // If appropriate criteria are met, the update (never a fresh install) happens silently  in the background
+  // But even then, we don't know if it actually succeeded
+  Future<void> installApk(DownloadedApp file) async {
+    var newInfo = await PackageArchiveInfo.fromPath(file.file.path);
+    AppInfo? appInfo;
+    try {
+      appInfo = await InstalledApps.getAppInfo(apps[file.appId]!.app.id);
+    } catch (e) {
+      // OK
+    }
+    if (appInfo != null &&
+        int.parse(newInfo.buildNumber) < appInfo.versionCode!) {
+      throw 'Can\'t install an older version';
+    }
+    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
+    await saveApps([apps[file.appId]!.app], shouldCorrectInstallStatus: false);
+  }
+
+  Future<String?> selectApkUrl(App app, BuildContext? context) async {
+    // If the App has more than one APK, the user should pick one (if context provided)
+    String? apkUrl = app.apkUrls[app.preferredApkIndex];
+    if (app.apkUrls.length > 1 && context != null) {
+      apkUrl = await showDialog(
+          context: context,
+          builder: (BuildContext ctx) {
+            return APKPicker(app: app, initVal: apkUrl);
+          });
+    }
+    // If the picked APK comes from an origin different from the source, get user confirmation (if context provided)
+    if (apkUrl != null &&
+        Uri.parse(apkUrl).origin != Uri.parse(app.url).origin &&
+        context != null) {
+      if (await showDialog(
+              context: context,
+              builder: (BuildContext ctx) {
+                return APKOriginWarningDialog(
+                    sourceUrl: app.url, apkUrl: apkUrl!);
+              }) !=
+          true) {
+        apkUrl = null;
+      }
+    }
+    return apkUrl;
+  }
+
+  Map<String, List<String>> addToErrorMap(
+      Map<String, List<String>> errors, String appId, String error) {
+    var tempIds = errors.remove(error);
+    tempIds ??= [];
+    tempIds.add(appId);
+    errors.putIfAbsent(error, () => tempIds!);
+    return errors;
+  }
+
+  // Given a list of AppIds, uses stored info about the apps to download APKs and install them
+  // If the APKs can be installed silently, they are
+  // If no BuildContext is provided, apps that require user interaction are ignored
+  // If user input is needed and the App is in the background, a notification is sent to get the user's attention
+  // Returns an array of Ids for Apps that were successfully downloaded, regardless of installation result
+  Future<List<String>> downloadAndInstallLatestApps(
+      List<String> appIds, BuildContext? context) async {
+    List<String> appsToInstall = [];
     for (var id in appIds) {
       if (apps[id] == null) {
         throw 'App not found';
       }
-      // If the App has more than one APK, the user should pick one
+
-      String? apkUrl = apps[id]!.app.apkUrls[apps[id]!.app.preferredApkIndex];
+      String? apkUrl = await selectApkUrl(apps[id]!.app, context);
-      if (apps[id]!.app.apkUrls.length > 1) {
+
-        apkUrl = await showDialog(
-            context: context,
-            builder: (BuildContext ctx) {
-              return APKPicker(app: apps[id]!.app, initVal: apkUrl);
-            });
-      }
-      // If the picked APK comes from an origin different from the source, get user confirmation
-      if (apkUrl != null &&
-          Uri.parse(apkUrl).origin != Uri.parse(apps[id]!.app.url).origin) {
-        if (await showDialog(
-                context: context,
-                builder: (BuildContext ctx) {
-                  return APKOriginWarningDialog(
-                      sourceUrl: apps[id]!.app.url, apkUrl: apkUrl!);
-                }) !=
-            true) {
-          apkUrl = null;
-        }
-      }
       if (apkUrl != null) {
         int urlInd = apps[id]!.app.apkUrls.indexOf(apkUrl);
         if (urlInd != apps[id]!.app.preferredApkIndex) {
           apps[id]!.app.preferredApkIndex = urlInd;
-          await saveApp(apps[id]!.app);
+          await saveApps([apps[id]!.app]);
         }
-        appsToInstall.putIfAbsent(id, () => apkUrl!);
+        if (context != null ||
+            (await canInstallSilently(apps[id]!.app) &&
+                apps[id]!.app.apkUrls.length == 1)) {
+          appsToInstall.add(id);
+        }
+      }
+    }
+    Map<String, List<String>> errors = {};
+
+    List<DownloadedApp?> downloadedFiles =
+        await Future.wait(appsToInstall.map((id) async {
+      try {
+        return await downloadApp(apps[id]!.app);
+      } catch (e) {
+        addToErrorMap(errors, id, e.toString());
+      }
+      return null;
+    }));
+    downloadedFiles =
+        downloadedFiles.where((element) => element != null).toList();
+
+    List<DownloadedApp> silentUpdates = [];
+    List<DownloadedApp> regularInstalls = [];
+    for (var f in downloadedFiles) {
+      bool willBeSilent = await canInstallSilently(apps[f!.appId]!.app);
+      if (willBeSilent) {
+        silentUpdates.add(f);
+      } else {
+        regularInstalls.add(f);
       }
     }
 
-    List<ApkFile> downloadedFiles = await Future.wait(appsToInstall.entries
+    // If Obtainium is being installed, it should be the last one
-        .map((entry) => downloadApp(entry.value, entry.key)));
+    List<DownloadedApp> moveObtainiumToEnd(List<DownloadedApp> items) {
-
+      String obtainiumId = 'imranr98_obtainium_${GitHub().host}';
-    if (!isForeground) {
+      DownloadedApp? temp;
-      await notificationsProvider.notify(completeInstallationNotification,
+      items.removeWhere((element) {
-          cancelExisting: true);
+        bool res = element.appId == obtainiumId;
-      await FGBGEvents.stream.first == FGBGType.foreground;
+        if (res) {
-      await notificationsProvider.cancel(completeInstallationNotification.id);
+          temp = element;
-      // We need to wait for the App to come to the foreground to install it
+        }
-      // Can't try to call install plugin in a background isolate (may not have worked anyways) because of:
+        return res;
-      // https://github.com/flutter/flutter/issues/13937
+      });
+      if (temp != null) {
+        items.add(temp!);
+      }
+      return items;
     }
 
-    // Unfortunately this 'await' does not actually wait for the APK to finish installing
+    // TODO: Remove below line if silentupdates are ever figured out
-    // So we only know that the install prompt was shown, but the user could still cancel w/o us knowing
+    regularInstalls.addAll(silentUpdates);
-    // This also does not use the 'session-based' installer API, so background/silent updates are impossible
+
-    for (var f in downloadedFiles) {
+    silentUpdates = moveObtainiumToEnd(silentUpdates);
-      await InstallPlugin.installApk(f.file.path, 'dev.imranr.obtainium');
+    regularInstalls = moveObtainiumToEnd(regularInstalls);
-      apps[f.appId]!.app.installedVersion = apps[f.appId]!.app.latestVersion;
+
-      await saveApp(apps[f.appId]!.app);
+    // TODO: Uncomment below if silentupdates are ever figured out
+    // for (var u in silentUpdates) {
+    //   await installApk(u, silent: true); // Would need to add silent option
+    // }
+
+    if (context != null) {
+      if (regularInstalls.isNotEmpty) {
+        // ignore: use_build_context_synchronously
+        await askUserToReturnToForeground(context, waitForFG: true);
+      }
+      for (var i in regularInstalls) {
+        try {
+          await installApk(i);
+        } catch (e) {
+          addToErrorMap(errors, i.appId, e.toString());
+        }
+      }
+    }
+    if (errors.isNotEmpty) {
+      String finalError = '';
+      for (var e in errors.keys) {
+        finalError +=
+            '$e ${errors[e]!.map((e) => apps[e]!.app.name).toString()}. ';
+      }
+      throw finalError;
     }
 
-    return downloadedFiles.isNotEmpty;
+    return downloadedFiles.map((e) => e!.appId).toList();
   }
 
   Future<Directory> getAppsDir() async {
@@ -174,16 +363,83 @@ class AppsProvider with ChangeNotifier {
     return appsDir;
   }
 
+  // Delete all stored APKs except those likely to still be needed
   Future<void> deleteSavedAPKs() async {
-    (await getExternalStorageDirectory())
+    List<FileSystemEntity>? apks = (await getExternalStorageDirectory())
         ?.listSync()
         .where((element) => element.path.endsWith('.apk'))
-        .forEach((element) {
+        .toList();
-      element.deleteSync();
+    if (apks != null && apks.isNotEmpty) {
-    });
+      for (var apk in apks) {
+        var shouldDelete = true;
+        var temp = apk.path.split('/').last;
+        temp = temp.substring(0, temp.length - 4);
+        var fn = temp.split('-');
+        if (fn.length == 3) {
+          var possibleId = fn[0];
+          var possibleVersion = fn[1];
+          var possibleApkUrlIndex = fn[2];
+          if (apps[possibleId] != null) {
+            if (apps[possibleId] != null &&
+                apps[possibleId]?.app != null &&
+                apps[possibleId]!.app.installedVersion !=
+                    apps[possibleId]!.app.latestVersion &&
+                apps[possibleId]!.app.latestVersion == possibleVersion &&
+                apps[possibleId]!.app.preferredApkIndex.toString() ==
+                    possibleApkUrlIndex) {
+              shouldDelete = false;
+            }
+          }
+        }
+
+        if (shouldDelete) apk.delete();
+      }
+    }
   }
 
-  Future<void> loadApps() async {
+  Future<AppInfo?> getInstalledInfo(String? packageName) async {
+    if (packageName != null) {
+      try {
+        return await InstalledApps.getAppInfo(packageName);
+      } catch (e) {
+        // OK
+      }
+    }
+    return null;
+  }
+
+  String standardizeVersionString(String versionString) {
+    return versionString.characters
+        .where((p0) => ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '.']
+            .contains(p0))
+        .join('');
+  }
+
+  // If the App says it is installed by installedInfo is null, set it to not installed
+  // If the App says is is not installed but installedInfo exists, try to set it to installed as latest version...
+  // ...if the latestVersion seems to match the version in installedInfo (not guaranteed)
+  App? correctInstallStatus(App app, AppInfo? installedInfo) {
+    var modded = false;
+    if (installedInfo == null && app.installedVersion != null) {
+      app.installedVersion = null;
+      modded = true;
+    }
+    if (installedInfo != null && app.installedVersion == null) {
+      if (standardizeVersionString(app.latestVersion) ==
+          installedInfo.versionName) {
+        app.installedVersion = app.latestVersion;
+      } else {
+        app.installedVersion = installedInfo.versionName;
+      }
+      modded = true;
+    }
+    return modded ? app : null;
+  }
+
+  Future<void> loadApps({shouldCorrectInstallStatus = true}) async {
+    while (loadingApps) {
+      await Future.delayed(const Duration(microseconds: 1));
+    }
     loadingApps = true;
     notifyListeners();
     List<FileSystemEntity> appFiles = (await getAppsDir())
@@ -191,32 +447,71 @@ class AppsProvider with ChangeNotifier {
         .where((item) => item.path.toLowerCase().endsWith('.json'))
         .toList();
     apps.clear();
+    var sp = SourceProvider();
+    List<List<String>> errors = [];
     for (int i = 0; i < appFiles.length; i++) {
       App app =
           App.fromJson(jsonDecode(File(appFiles[i].path).readAsStringSync()));
-      apps.putIfAbsent(app.id, () => AppInMemory(app, null));
+      var info = await getInstalledInfo(app.id);
+      try {
+        sp.getSource(app.url);
+        apps.putIfAbsent(app.id, () => AppInMemory(app, null, info));
+      } catch (e) {
+        errors.add([app.id, app.name, e.toString()]);
+      }
+    }
+    if (errors.isNotEmpty) {
+      removeApps(errors.map((e) => e[0]).toList());
+      NotificationsProvider().notify(
+          AppsRemovedNotification(errors.map((e) => [e[1], e[2]]).toList()));
     }
     loadingApps = false;
     notifyListeners();
+    // For any that are not installed (by ID == package name), set to not installed if needed
+    if (shouldCorrectInstallStatus) {
+      List<App> modifiedApps = [];
+      for (var app in apps.values) {
+        var moddedApp = correctInstallStatus(app.app, app.installedInfo);
+        if (moddedApp != null) {
+          modifiedApps.add(moddedApp);
+        }
+      }
+      if (modifiedApps.isNotEmpty) {
+        await saveApps(modifiedApps, shouldCorrectInstallStatus: false);
+      }
+    }
   }
 
-  Future<void> saveApp(App app) async {
+  Future<void> saveApps(List<App> apps,
-    File('${(await getAppsDir()).path}/${app.id}.json')
+      {bool shouldCorrectInstallStatus = true}) async {
-        .writeAsStringSync(jsonEncode(app.toJson()));
+    for (var app in apps) {
-    apps.update(app.id, (value) => AppInMemory(app, value.downloadProgress),
+      AppInfo? info = await getInstalledInfo(app.id);
-        ifAbsent: () => AppInMemory(app, null));
+      app.name = info?.name ?? app.name;
+      if (shouldCorrectInstallStatus) {
+        app = correctInstallStatus(app, info) ?? app;
+      }
+      File('${(await getAppsDir()).path}/${app.id}.json')
+          .writeAsStringSync(jsonEncode(app.toJson()));
+      this.apps.update(
+          app.id, (value) => AppInMemory(app, value.downloadProgress, info),
+          ifAbsent: () => AppInMemory(app, null, info));
+    }
     notifyListeners();
   }
 
-  Future<void> removeApp(String appId) async {
+  Future<void> removeApps(List<String> appIds) async {
-    File file = File('${(await getAppsDir()).path}/$appId.json');
+    for (var appId in appIds) {
-    if (file.existsSync()) {
+      File file = File('${(await getAppsDir()).path}/$appId.json');
-      file.deleteSync();
+      if (file.existsSync()) {
+        file.deleteSync();
+      }
+      if (apps.containsKey(appId)) {
+        apps.remove(appId);
+      }
     }
-    if (apps.containsKey(appId)) {
+    if (appIds.isNotEmpty) {
-      apps.remove(appId);
+      notifyListeners();
     }
-    notifyListeners();
   }
 
   bool checkAppObjectForUpdate(App app) {
@@ -226,48 +521,99 @@ class AppsProvider with ChangeNotifier {
     return app.latestVersion != apps[app.id]?.app.installedVersion;
   }
 
-  Future<App?> getUpdate(String appId) async {
+  Future<App?> getUpdate(String appId,
+      {bool shouldCorrectInstallStatus = true}) async {
     App? currentApp = apps[appId]!.app;
     SourceProvider sourceProvider = SourceProvider();
     App newApp = await sourceProvider.getApp(
         sourceProvider.getSource(currentApp.url),
         currentApp.url,
-        currentApp.additionalData);
+        currentApp.additionalData,
-    if (newApp.latestVersion != currentApp.latestVersion) {
+        name: currentApp.name,
-      newApp.installedVersion = currentApp.installedVersion;
+        id: currentApp.id);
-      if (currentApp.preferredApkIndex < newApp.apkUrls.length) {
+    newApp.installedVersion = currentApp.installedVersion;
-        newApp.preferredApkIndex = currentApp.preferredApkIndex;
+    if (currentApp.preferredApkIndex < newApp.apkUrls.length) {
-      }
+      newApp.preferredApkIndex = currentApp.preferredApkIndex;
-      await saveApp(newApp);
-      return newApp;
     }
-    return null;
+    await saveApps([newApp],
+        shouldCorrectInstallStatus: shouldCorrectInstallStatus);
+    return newApp.latestVersion != currentApp.latestVersion ? newApp : null;
   }
 
-  Future<List<App>> checkUpdates() async {
+  Future<List<App>> checkUpdates(
+      {DateTime? ignoreAfter,
+      bool immediatelyThrowRateLimitError = false,
+      bool shouldCorrectInstallStatus = true,
+      bool immediatelyThrowSocketError = false}) async {
     List<App> updates = [];
+    Map<String, List<String>> errors = {};
     if (!gettingUpdates) {
       gettingUpdates = true;
 
-      List<String> appIds = apps.keys.toList();
+      try {
-      for (int i = 0; i < appIds.length; i++) {
+        List<String> appIds = apps.keys.toList();
-        App? newApp = await getUpdate(appIds[i]);
+        if (ignoreAfter != null) {
-        if (newApp != null) {
+          appIds = appIds
-          updates.add(newApp);
+              .where((id) =>
+                  apps[id]!.app.lastUpdateCheck == null ||
+                  apps[id]!.app.lastUpdateCheck!.isBefore(ignoreAfter))
+              .toList();
         }
+        appIds.sort((a, b) => (apps[a]!.app.lastUpdateCheck ??
+                DateTime.fromMicrosecondsSinceEpoch(0))
+            .compareTo(apps[b]!.app.lastUpdateCheck ??
+                DateTime.fromMicrosecondsSinceEpoch(0)));
+
+        for (int i = 0; i < appIds.length; i++) {
+          App? newApp;
+          try {
+            newApp = await getUpdate(appIds[i],
+                shouldCorrectInstallStatus: shouldCorrectInstallStatus);
+          } catch (e) {
+            if (e is RateLimitError && immediatelyThrowRateLimitError) {
+              rethrow;
+            }
+            if (e is SocketException && immediatelyThrowSocketError) {
+              rethrow;
+            }
+            var tempIds = errors.remove(e.toString());
+            tempIds ??= [];
+            tempIds.add(appIds[i]);
+            errors.putIfAbsent(e.toString(), () => tempIds!);
+          }
+          if (newApp != null) {
+            updates.add(newApp);
+          }
+        }
+      } finally {
+        gettingUpdates = false;
       }
-      gettingUpdates = false;
+    }
+    if (errors.isNotEmpty) {
+      String finalError = '';
+      for (var e in errors.keys) {
+        finalError +=
+            '$e ${errors[e]!.map((e) => apps[e]!.app.name).toString()}. ';
+      }
+      throw finalError;
     }
     return updates;
   }
 
-  List<String> getExistingUpdates() {
+  List<String> getExistingUpdates(
+      {bool installedOnly = false, bool nonInstalledOnly = false}) {
     List<String> updateAppIds = [];
     List<String> appIds = apps.keys.toList();
     for (int i = 0; i < appIds.length; i++) {
       App? app = apps[appIds[i]]!.app;
-      if (app.installedVersion != app.latestVersion) {
+      if (app.installedVersion != app.latestVersion &&
-        updateAppIds.add(app.id);
+          (!installedOnly || !nonInstalledOnly)) {
+        if ((app.installedVersion == null &&
+                (nonInstalledOnly || !installedOnly) ||
+            (app.installedVersion != null &&
+                (installedOnly || !nonInstalledOnly)))) {
+          updateAppIds.add(app.id);
+        }
       }
     }
     return updateAppIds;
@@ -292,18 +638,22 @@ class AppsProvider with ChangeNotifier {
     List<App> importedApps = (jsonDecode(appsJSON) as List<dynamic>)
         .map((e) => App.fromJson(e))
         .toList();
-    for (App a in importedApps) {
+    while (loadingApps) {
-      a.installedVersion =
+      await Future.delayed(const Duration(microseconds: 1));
-          apps.containsKey(a.id) ? apps[a]?.app.installedVersion : null;
-      await saveApp(a);
     }
+    for (App a in importedApps) {
+      if (apps[a.id]?.app.installedVersion != null) {
+        a.installedVersion = apps[a.id]?.app.installedVersion;
+      }
+    }
+    await saveApps(importedApps);
     notifyListeners();
     return importedApps.length;
   }
 
   @override
   void dispose() {
-    foregroundSubscription.cancel();
+    foregroundSubscription?.cancel();
     super.dispose();
   }
 }
@@ -331,7 +681,10 @@ class _APKPickerState extends State<APKPicker> {
         Text('${widget.app.name} has more than one package:'),
         const SizedBox(height: 16),
         ...widget.app.apkUrls.map((u) => RadioListTile<String>(
-            title: Text(Uri.parse(u).pathSegments.last),
+            title: Text(Uri.parse(u)
+                .pathSegments
+                .where((element) => element.isNotEmpty)
+                .last),
             value: u,
             groupValue: apkUrl,
             onChanged: (String? val) {

lib/providers/notifications_provider.dart

@@ -33,6 +33,22 @@ class UpdateNotification extends ObtainiumNotification {
   }
 }
 
+class SilentUpdateNotification extends ObtainiumNotification {
+  SilentUpdateNotification(List<App> updates)
+      : super(
+            3,
+            'Apps Updated',
+            '',
+            'APPS_UPDATED',
+            'Apps Updated',
+            'Notifies the user that updates to one or more Apps were applied in the background',
+            Importance.defaultImportance) {
+    message = updates.length == 1
+        ? '${updates[0].name} was updated to ${updates[0].latestVersion}.'
+        : '${(updates.length == 2 ? '${updates[0].name} and ${updates[1].name}' : '${updates[0].name} and ${updates.length - 1} more apps')} were updated.';
+  }
+}
+
 class ErrorCheckingUpdatesNotification extends ObtainiumNotification {
   ErrorCheckingUpdatesNotification(String error)
       : super(
@@ -45,6 +61,24 @@ class ErrorCheckingUpdatesNotification extends ObtainiumNotification {
             Importance.high);
 }
 
+class AppsRemovedNotification extends ObtainiumNotification {
+  AppsRemovedNotification(List<List<String>> namedReasons)
+      : super(
+            6,
+            'Apps Removed',
+            '',
+            'APPS_REMOVED',
+            'Apps Removed',
+            'Notifies the user that one or more Apps were removed due to errors while loading them',
+            Importance.max) {
+    message = '';
+    for (var r in namedReasons) {
+      message += '${r[0]} was removed due to this error: ${r[1]}. \n';
+    }
+    message = message.trim();
+  }
+}
+
 final completeInstallationNotification = ObtainiumNotification(
     1,
     'Complete App Installation',

lib/providers/settings_provider.dart

@@ -13,6 +13,16 @@ enum SortColumnSettings { added, nameAuthor, authorName }
 
 enum SortOrderSettings { ascending, descending }
 
+const maxAPIRateLimitMinutes = 30;
+const minUpdateIntervalMinutes = maxAPIRateLimitMinutes + 30;
+const maxUpdateIntervalMinutes = 4320;
+List<int> updateIntervals = [15, 30, 60, 120, 180, 360, 720, 1440, 4320, 0]
+    .where((element) =>
+        (element >= minUpdateIntervalMinutes &&
+            element <= maxUpdateIntervalMinutes) ||
+        element == 0)
+    .toList();
+
 class SettingsProvider with ChangeNotifier {
   SharedPreferences? prefs;
 
@@ -45,7 +55,17 @@ class SettingsProvider with ChangeNotifier {
   }
 
   int get updateInterval {
-    return prefs?.getInt('updateInterval') ?? 1440;
+    var min = prefs?.getInt('updateInterval') ?? 180;
+    if (!updateIntervals.contains(min)) {
+      var temp = updateIntervals[0];
+      for (var i in updateIntervals) {
+        if (min > i && i != 0) {
+          temp = i;
+        }
+      }
+      min = temp;
+    }
+    return min;
   }
 
   set updateInterval(int min) {
@@ -54,8 +74,8 @@ class SettingsProvider with ChangeNotifier {
   }
 
   SortColumnSettings get sortColumn {
-    return SortColumnSettings
+    return SortColumnSettings.values[
-        .values[prefs?.getInt('sortColumn') ?? SortColumnSettings.added.index];
+        prefs?.getInt('sortColumn') ?? SortColumnSettings.nameAuthor.index];
   }
 
   set sortColumn(SortColumnSettings s) {
@@ -65,7 +85,7 @@ class SettingsProvider with ChangeNotifier {
 
   SortOrderSettings get sortOrder {
     return SortOrderSettings.values[
-        prefs?.getInt('sortOrder') ?? SortOrderSettings.descending.index];
+        prefs?.getInt('sortOrder') ?? SortOrderSettings.ascending.index];
   }
 
   set sortOrder(SortOrderSettings s) {
@@ -95,11 +115,20 @@ class SettingsProvider with ChangeNotifier {
   }
 
   bool get showAppWebpage {
-    return prefs?.getBool('showAppWebpage') ?? true;
+    return prefs?.getBool('showAppWebpage') ?? false;
   }
 
   set showAppWebpage(bool show) {
     prefs?.setBool('showAppWebpage', show);
     notifyListeners();
   }
+
+  String? getSettingString(String settingId) {
+    return prefs?.getString(settingId);
+  }
+
+  void setSettingString(String settingId, String value) {
+    prefs?.setString(settingId, value);
+    notifyListeners();
+  }
 }

lib/providers/source_provider.dart

@@ -10,6 +10,7 @@ import 'package:obtainium/app_sources/gitlab.dart';
 import 'package:obtainium/app_sources/izzyondroid.dart';
 import 'package:obtainium/app_sources/mullvad.dart';
 import 'package:obtainium/app_sources/signal.dart';
+import 'package:obtainium/app_sources/sourceforge.dart';
 import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/mass_app_sources/githubstars.dart';
 
@@ -37,6 +38,7 @@ class App {
   List<String> apkUrls = [];
   late int preferredApkIndex;
   late List<String> additionalData;
+  late DateTime? lastUpdateCheck;
   App(
       this.id,
       this.url,
@@ -46,11 +48,12 @@ class App {
       this.latestVersion,
       this.apkUrls,
       this.preferredApkIndex,
-      this.additionalData);
+      this.additionalData,
+      this.lastUpdateCheck);
 
   @override
   String toString() {
-    return 'ID: $id URL: $url INSTALLED: $installedVersion LATEST: $latestVersion APK: $apkUrls';
+    return 'ID: $id URL: $url INSTALLED: $installedVersion LATEST: $latestVersion APK: $apkUrls PREFERREDAPK: $preferredApkIndex ADDITIONALDATA: ${additionalData.toString()} LASTCHECK: ${lastUpdateCheck.toString()}';
   }
 
   factory App.fromJson(Map<String, dynamic> json) => App(
@@ -68,7 +71,10 @@ class App {
       json['preferredApkIndex'] == null ? 0 : json['preferredApkIndex'] as int,
       json['additionalData'] == null
           ? SourceProvider().getSource(json['url']).additionalDataDefaults
-          : List<String>.from(jsonDecode(json['additionalData'])));
+          : List<String>.from(jsonDecode(json['additionalData'])),
+      json['lastUpdateCheck'] == null
+          ? null
+          : DateTime.fromMicrosecondsSinceEpoch(json['lastUpdateCheck']));
 
   Map<String, dynamic> toJson() => {
         'id': id,
@@ -79,17 +85,18 @@ class App {
         'latestVersion': latestVersion,
         'apkUrls': jsonEncode(apkUrls),
         'preferredApkIndex': preferredApkIndex,
-        'additionalData': jsonEncode(additionalData)
+        'additionalData': jsonEncode(additionalData),
+        'lastUpdateCheck': lastUpdateCheck?.microsecondsSinceEpoch
       };
 }
 
 escapeRegEx(String s) {
   return s.replaceAllMapped(RegExp(r'[.*+?^${}()|[\]\\]'), (x) {
-    return "\\${x[0]}";
+    return '\\${x[0]}';
   });
 }
 
-makeUrlHttps(String url) {
+preStandardizeUrl(String url) {
   if (url.toLowerCase().indexOf('http://') != 0 &&
       url.toLowerCase().indexOf('https://') != 0) {
     url = 'https://$url';
@@ -97,6 +104,11 @@ makeUrlHttps(String url) {
   if (url.toLowerCase().indexOf('https://www.') == 0) {
     url = 'https://${url.substring(12)}';
   }
+  url = url
+      .split('/')
+      .where((e) => e.isNotEmpty)
+      .join('/')
+      .replaceFirst(':/', '://');
   return url;
 }
 
@@ -128,6 +140,9 @@ abstract class AppSource {
   AppNames getAppNames(String standardUrl);
   late List<List<GeneratedFormItem>> additionalDataFormItems;
   late List<String> additionalDataDefaults;
+  late List<GeneratedFormItem> moreSourceSettingsFormItems;
+  String? changeLogPageFromStandardUrl(String standardUrl);
+  Future<String> apkUrlPrefetchModifier(String apkUrl);
 }
 
 abstract class MassAppSource {
@@ -144,14 +159,16 @@ class SourceProvider {
     FDroid(),
     IzzyOnDroid(),
     Mullvad(),
-    Signal()
+    Signal(),
+    SourceForge(),
+    // APKMirror()
   ];
 
   // Add more mass source classes here so they are available via the service
   List<MassAppSource> massSources = [GitHubStars()];
 
   AppSource getSource(String url) {
-    url = makeUrlHttps(url);
+    url = preStandardizeUrl(url);
     AppSource? source;
     for (var s in sources) {
       if (url.toLowerCase().contains('://${s.host}')) {
@@ -176,30 +193,37 @@ class SourceProvider {
     return false;
   }
 
-  Future<App> getApp(
+  String generateTempID(AppNames names, AppSource source) =>
-      AppSource source, String url, List<String> additionalData) async {
+      '${names.author.toLowerCase()}_${names.name.toLowerCase()}_${source.host}';
-    String standardUrl = source.standardizeURL(makeUrlHttps(url));
+
+  Future<App> getApp(AppSource source, String url, List<String> additionalData,
+      {String name = '', String? id}) async {
+    String standardUrl = source.standardizeURL(preStandardizeUrl(url));
     AppNames names = source.getAppNames(standardUrl);
     APKDetails apk =
         await source.getLatestAPKDetails(standardUrl, additionalData);
     return App(
-        '${names.author.toLowerCase()}_${names.name.toLowerCase()}_${source.host}',
+        id ?? generateTempID(names, source),
         standardUrl,
         names.author[0].toUpperCase() + names.author.substring(1),
-        names.name[0].toUpperCase() + names.name.substring(1),
+        name.trim().isNotEmpty
+            ? name
+            : names.name[0].toUpperCase() + names.name.substring(1),
         null,
-        apk.version,
+        apk.version.replaceAll('/', '-'),
         apk.apkUrls,
         apk.apkUrls.length - 1,
-        additionalData);
+        additionalData,
+        DateTime.now());
   }
 
   /// Returns a length 2 list, where the first element is a list of Apps and
   /// the second is a Map<String, dynamic> of URLs and errors
-  Future<List<dynamic>> getApps(List<String> urls) async {
+  Future<List<dynamic>> getApps(List<String> urls,
+      {List<String> ignoreUrls = const []}) async {
     List<App> apps = [];
     Map<String, dynamic> errors = {};
-    for (var url in urls) {
+    for (var url in urls.where((element) => !ignoreUrls.contains(element))) {
       try {
         var source = getSource(url);
         apps.add(await getApp(source, url, source.additionalDataDefaults));

pubspec.lock

@@ -7,14 +7,14 @@ packages:
       name: animations
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.4"
+    version: "2.0.7"
   archive:
     dependency: transitive
     description:
       name: archive
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.3.1"
+    version: "3.3.2"
   args:
     dependency: transitive
     description:
@@ -71,6 +71,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.16.0"
+  cross_file:
+    dependency: transitive
+    description:
+      name: cross_file
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.3.3+2"
   crypto:
     dependency: transitive
     description:
@@ -105,42 +112,14 @@ packages:
       name: device_info_plus
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.1.2"
+    version: "8.0.0"
-  device_info_plus_linux:
-    dependency: transitive
-    description:
-      name: device_info_plus_linux
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.0.0"
-  device_info_plus_macos:
-    dependency: transitive
-    description:
-      name: device_info_plus_macos
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.0.0"
   device_info_plus_platform_interface:
     dependency: transitive
     description:
       name: device_info_plus_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.0"
+    version: "7.0.0"
-  device_info_plus_web:
-    dependency: transitive
-    description:
-      name: device_info_plus_web
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.0.0"
-  device_info_plus_windows:
-    dependency: transitive
-    description:
-      name: device_info_plus_windows
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "4.1.0"
   dynamic_color:
     dependency: "direct main"
     description:
@@ -175,7 +154,7 @@ packages:
       name: file_picker
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "5.1.0"
+    version: "5.2.2"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -208,14 +187,14 @@ packages:
       name: flutter_local_notifications
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "10.0.0"
+    version: "12.0.3"
   flutter_local_notifications_linux:
     dependency: transitive
     description:
       name: flutter_local_notifications_linux
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.0"
+    version: "2.0.0"
   flutter_local_notifications_platform_interface:
     dependency: transitive
     description:
@@ -246,14 +225,14 @@ packages:
       name: fluttertoast
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "8.0.9"
+    version: "8.1.1"
   html:
     dependency: "direct main"
     description:
       name: html
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.15.0"
+    version: "0.15.1"
   http:
     dependency: "direct main"
     description:
@@ -267,14 +246,14 @@ packages:
       name: http_parser
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.0.1"
+    version: "4.0.2"
   image:
     dependency: transitive
     description:
       name: image
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.2.0"
+    version: "3.2.2"
   install_plugin_v2:
     dependency: "direct main"
     description:
@@ -282,6 +261,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.0"
+  installed_apps:
+    dependency: "direct main"
+    description:
+      name: installed_apps
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.3.1"
   js:
     dependency: transitive
     description:
@@ -295,14 +281,14 @@ packages:
       name: json_annotation
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.6.0"
+    version: "4.7.0"
   lints:
     dependency: transitive
     description:
       name: lints
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "2.0.1"
   matcher:
     dependency: transitive
     description:
@@ -316,7 +302,7 @@ packages:
       name: material_color_utilities
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.0"
+    version: "0.1.5"
   meta:
     dependency: transitive
     description:
@@ -324,6 +310,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.8.0"
+  mime:
+    dependency: transitive
+    description:
+      name: mime
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.2"
   nested:
     dependency: transitive
     description:
@@ -331,6 +324,20 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.0"
+  package_archive_info:
+    dependency: "direct main"
+    description:
+      name: package_archive_info
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.0"
+  package_info:
+    dependency: transitive
+    description:
+      name: package_info
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.2"
   path:
     dependency: transitive
     description:
@@ -379,7 +386,7 @@ packages:
       name: path_provider_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.4"
+    version: "2.0.5"
   path_provider_windows:
     dependency: transitive
     description:
@@ -393,42 +400,42 @@ packages:
       name: permission_handler
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "10.0.0"
+    version: "10.2.0"
   permission_handler_android:
     dependency: transitive
     description:
       name: permission_handler_android
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "10.0.0"
+    version: "10.2.0"
   permission_handler_apple:
     dependency: transitive
     description:
       name: permission_handler_apple
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "9.0.4"
+    version: "9.0.7"
   permission_handler_platform_interface:
     dependency: transitive
     description:
       name: permission_handler_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.7.0"
+    version: "3.9.0"
   permission_handler_windows:
     dependency: transitive
     description:
       name: permission_handler_windows
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.0"
+    version: "0.1.2"
   petitparser:
     dependency: transitive
     description:
       name: petitparser
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "5.0.0"
+    version: "5.1.0"
   platform:
     dependency: transitive
     description:
@@ -456,7 +463,21 @@ packages:
       name: provider
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.0.3"
+    version: "6.0.4"
+  share_plus:
+    dependency: "direct main"
+    description:
+      name: share_plus
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "6.1.0"
+  share_plus_platform_interface:
+    dependency: transitive
+    description:
+      name: share_plus_platform_interface
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.2.0"
   shared_preferences:
     dependency: "direct main"
     description:
@@ -470,7 +491,7 @@ packages:
       name: shared_preferences_android
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.13"
+    version: "2.0.14"
   shared_preferences_ios:
     dependency: transitive
     description:
@@ -524,7 +545,7 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.9.1"
+    version: "1.9.0"
   stack_trace:
     dependency: transitive
     description:
@@ -559,14 +580,14 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.14"
+    version: "0.4.12"
   timezone:
     dependency: transitive
     description:
       name: timezone
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.8.0"
+    version: "0.9.0"
   typed_data:
     dependency: transitive
     description:
@@ -580,14 +601,14 @@ packages:
       name: url_launcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.1.5"
+    version: "6.1.6"
   url_launcher_android:
     dependency: transitive
     description:
       name: url_launcher_android
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.0.19"
+    version: "6.0.21"
   url_launcher_ios:
     dependency: transitive
     description:
@@ -615,7 +636,7 @@ packages:
       name: url_launcher_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   url_launcher_web:
     dependency: transitive
     description:
@@ -630,13 +651,20 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "3.0.1"
+  uuid:
+    dependency: transitive
+    description:
+      name: uuid
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.0.6"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.3"
+    version: "2.1.2"
   webview_flutter:
     dependency: "direct main"
     description:
@@ -650,35 +678,35 @@ packages:
       name: webview_flutter_android
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.10.1"
+    version: "2.10.4"
   webview_flutter_platform_interface:
     dependency: transitive
     description:
       name: webview_flutter_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.9.3"
+    version: "1.9.5"
   webview_flutter_wkwebview:
     dependency: transitive
     description:
       name: webview_flutter_wkwebview
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.9.4"
+    version: "2.9.5"
   win32:
     dependency: transitive
     description:
       name: win32
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.0"
+    version: "3.0.1"
   workmanager:
     dependency: "direct main"
     description:
       name: workmanager
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.5.0"
+    version: "0.5.1"
   xdg_directories:
     dependency: transitive
     description:
@@ -701,5 +729,5 @@ packages:
     source: hosted
     version: "3.1.1"
 sdks:
-  dart: ">=2.19.0-79.0.dev <3.0.0"
+  dart: ">=2.18.2 <3.0.0"
   flutter: ">=3.3.0"

pubspec.yaml

@@ -17,10 +17,10 @@ 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.3.0+16 # When changing this, update the tag in main() accordingly
+version: 0.6.3+47 # When changing this, update the tag in main() accordingly
 
 environment:
-  sdk: '>=2.19.0-79.0.dev <3.0.0'
+  sdk: '>=2.18.2 <3.0.0'
 
 # Dependencies specify other packages that your package needs in order to work.
 # To automatically upgrade your package dependencies to the latest versions
@@ -38,21 +38,24 @@ dependencies:
   cupertino_icons: ^1.0.5
   path_provider: ^2.0.11
   flutter_fgbg: ^0.2.0 # Try removing reliance on this
-  flutter_local_notifications: ^10.0.0
+  flutter_local_notifications: ^12.0.0
   provider: ^6.0.3
   http: ^0.13.5
   webview_flutter: ^3.0.4
   workmanager: ^0.5.0
   dynamic_color: ^1.5.4
-  install_plugin_v2: ^1.0.0 # Try replacing this
   html: ^0.15.0
   shared_preferences: ^2.0.15
   url_launcher: ^6.1.5
   permission_handler: ^10.0.0
   fluttertoast: ^8.0.9
-  device_info_plus: ^4.1.2
+  device_info_plus: ^8.0.0
   file_picker: ^5.1.0
   animations: ^2.0.4
+  install_plugin_v2: ^1.0.0
+  share_plus: ^6.0.1
+  installed_apps: ^1.3.1
+  package_archive_info: ^0.1.0
 
 
 dev_dependencies:

test/widget_test.dart

@@ -13,7 +13,7 @@ import 'package:obtainium/main.dart';
 void main() {
   testWidgets('Counter increments smoke test', (WidgetTester tester) async {
     // Build our app and trigger a frame.
-    await tester.pumpWidget(const MyApp());
+    await tester.pumpWidget(const Obtainium());
 
     // Verify that our counter starts at 0.
     expect(find.text('0'), findsOneWidget);