Increment version

With partial APKs avoided (#113)

README.md

@@ -13,7 +13,6 @@ Currently supported App sources:
 - [IzzyOnDroid](https://android.izzysoft.de/)
 - [Mullvad](https://mullvad.net/en/)
 - [Signal](https://signal.org/)
-- [APKMirror](https://apkmirror.com/)
 
 ## Limitations
 - App installs are assumed to have succeeded; failures and cancelled installs cannot be detected.

android/app/src/main/AndroidManifest.xml

@@ -30,7 +30,25 @@
         <meta-data
             android:name="flutterEmbedding"
             android:value="2" />
+        <service
+            android:name="dev.fluttercommunity.plus.androidalarmmanager.AlarmService"
+            android:permission="android.permission.BIND_JOB_SERVICE"
+            android:exported="false"/>
+        <receiver
+            android:name="dev.fluttercommunity.plus.androidalarmmanager.AlarmBroadcastReceiver"
+            android:exported="false"/>
+        <receiver
+            android:name="dev.fluttercommunity.plus.androidalarmmanager.RebootBroadcastReceiver"
+            android:enabled="false"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+            </intent-filter>
+        </receiver>
     </application>
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+    <uses-permission android:name="android.permission.WAKE_LOCK"/>
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"/>
 </manifest>

lib/app_sources/apkmirror.dart

@@ -1,112 +0,0 @@
-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

@@ -1,11 +1,14 @@
+import 'dart:convert';
+
 import 'package:html/parser.dart';
 import 'package:http/http.dart';
-import 'package:obtainium/components/generated_form.dart';
+import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/providers/source_provider.dart';
 
-class FDroid implements AppSource {
+class FDroid extends AppSource {
-  @override
+  FDroid() {
-  late String host = 'f-droid.org';
+    host = 'f-droid.org';
+  }
 
   @override
   String standardizeURL(String url) {
@@ -18,7 +21,7 @@ class FDroid implements AppSource {
     RegExp standardUrlRegExA = RegExp('^https?://$host/+packages/+[^/]+');
     match = standardUrlRegExA.firstMatch(url.toLowerCase());
     if (match == null) {
-      throw notValidURL(runtimeType.toString());
+      throw InvalidURLError(runtimeType.toString());
     }
     return url.substring(0, match.end);
   }
@@ -27,46 +30,45 @@ class FDroid implements AppSource {
   String? changeLogPageFromStandardUrl(String standardUrl) => null;
 
   @override
-  Future<String> apkUrlPrefetchModifier(String apkUrl) async => apkUrl;
+  String? tryInferringAppId(String standardUrl) {
+    return Uri.parse(standardUrl).pathSegments.last;
+  }
+
+  APKDetails getAPKUrlsFromFDroidPackagesAPIResponse(
+      Response res, String apkUrlPrefix) {
+    if (res.statusCode == 200) {
+      List<dynamic> releases = jsonDecode(res.body)['packages'] ?? [];
+      if (releases.isEmpty) {
+        throw NoReleasesError();
+      }
+      String? latestVersion = releases[0]['versionName'];
+      if (latestVersion == null) {
+        throw NoVersionError();
+      }
+      List<String> apkUrls = releases
+          .where((element) => element['versionName'] == latestVersion)
+          .map((e) => '${apkUrlPrefix}_${e['versionCode']}.apk')
+          .toList();
+      if (apkUrls.isEmpty) {
+        throw NoAPKError();
+      }
+      return APKDetails(latestVersion, apkUrls);
+    } else {
+      throw NoReleasesError();
+    }
+  }
 
   @override
   Future<APKDetails> getLatestAPKDetails(
       String standardUrl, List<String> additionalData) async {
-    Response res = await get(Uri.parse(standardUrl));
+    String? appId = tryInferringAppId(standardUrl);
-    if (res.statusCode == 200) {
+    return getAPKUrlsFromFDroidPackagesAPIResponse(
-      var latestReleaseDiv =
+        await get(Uri.parse('https://f-droid.org/api/v1/packages/$appId')),
-          parse(res.body).querySelector('#latest.package-version');
+        'https://f-droid.org/repo/$appId');
-      var apkUrl = latestReleaseDiv
-          ?.querySelector('.package-version-download a')
-          ?.attributes['href'];
-      if (apkUrl == null) {
-        throw noAPKFound;
-      }
-      var version = latestReleaseDiv
-          ?.querySelector('.package-version-header b')
-          ?.innerHtml
-          .split(' ')
-          .last;
-      if (version == null) {
-        throw couldNotFindLatestVersion;
-      }
-      return APKDetails(version, [apkUrl]);
-    } else {
-      throw couldNotFindReleases;
-    }
   }
 
   @override
   AppNames getAppNames(String standardUrl) {
     return AppNames('F-Droid', Uri.parse(standardUrl).pathSegments.last);
   }
-
-  @override
-  List<List<GeneratedFormItem>> additionalDataFormItems = [];
-
-  @override
-  List<String> additionalDataDefaults = [];
-
-  @override
-  List<GeneratedFormItem> moreSourceSettingsFormItems = [];
 }

lib/app_sources/github.dart

@@ -7,16 +7,88 @@ 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 {
+class GitHub extends AppSource {
-  @override
+  GitHub() {
-  late String host = 'github.com';
+    host = 'github.com';
+
+    additionalDataDefaults = ['true', 'true', ''];
+
+    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),
+                ))
+          ])
+    ];
+
+    additionalDataFormItems = [
+      [
+        GeneratedFormItem(label: 'Include prereleases', type: FormItemType.bool)
+      ],
+      [
+        GeneratedFormItem(
+            label: 'Fallback to older releases', type: FormItemType.bool)
+      ],
+      [
+        GeneratedFormItem(
+            label: 'Filter Release Titles by Regular Expression',
+            type: FormItemType.string,
+            required: false,
+            additionalValidators: [
+              (value) {
+                if (value == null || value.isEmpty) {
+                  return null;
+                }
+                try {
+                  RegExp(value);
+                } catch (e) {
+                  return 'Invalid regular expression';
+                }
+                return null;
+              }
+            ])
+      ]
+    ];
+
+    canSearch = true;
+  }
 
   @override
   String standardizeURL(String url) {
     RegExp standardUrlRegEx = RegExp('^https?://$host/[^/]+/[^/]+');
     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
     if (match == null) {
-      throw notValidURL(runtimeType.toString());
+      throw InvalidURLError(runtimeType.toString());
     }
     return url.substring(0, match.end);
   }
@@ -33,9 +105,6 @@ class GitHub implements AppSource {
   String? changeLogPageFromStandardUrl(String standardUrl) =>
       '$standardUrl/releases';
 
-  @override
-  Future<String> apkUrlPrefetchModifier(String apkUrl) async => apkUrl;
-
   @override
   Future<APKDetails> getLatestAPKDetails(
       String standardUrl, List<String> additionalData) async {
@@ -69,6 +138,7 @@ class GitHub implements AppSource {
         if (!includePrereleases && releases[i]['prerelease'] == true) {
           continue;
         }
+
         if (regexFilter != null &&
             !RegExp(regexFilter)
                 .hasMatch((releases[i]['name'] as String).trim())) {
@@ -83,25 +153,19 @@ class GitHub implements AppSource {
         break;
       }
       if (targetRelease == null) {
-        throw couldNotFindReleases;
+        throw NoReleasesError();
       }
       if ((targetRelease['apkUrls'] as List<String>).isEmpty) {
-        throw noAPKFound;
+        throw NoAPKError();
       }
       String? version = targetRelease['tag_name'];
       if (version == null) {
-        throw couldNotFindLatestVersion;
+        throw NoVersionError();
       }
       return APKDetails(version, targetRelease['apkUrls']);
     } else {
-      if (res.headers['x-ratelimit-remaining'] == '0') {
+      rateLimitErrorCheck(res);
-        throw RateLimitError(
+      throw getObtainiumHttpError(res);
-            (int.parse(res.headers['x-ratelimit-reset'] ?? '1800000000') /
-                    60000000)
-                .round());
-      }
-
-      throw couldNotFindReleases;
     }
   }
 
@@ -113,72 +177,31 @@ class GitHub implements AppSource {
   }
 
   @override
-  List<List<GeneratedFormItem>> additionalDataFormItems = [
+  Future<Map<String, String>> search(String query) async {
-    [GeneratedFormItem(label: 'Include prereleases', type: FormItemType.bool)],
+    Response res = await get(Uri.parse(
-    [
+        'https://${await getCredentialPrefixIfAny()}api.$host/search/repositories?q=${Uri.encodeQueryComponent(query)}&per_page=100'));
-      GeneratedFormItem(
+    if (res.statusCode == 200) {
-          label: 'Fallback to older releases', type: FormItemType.bool)
+      Map<String, String> urlsWithDescriptions = {};
-    ],
+      for (var e in (jsonDecode(res.body)['items'] as List<dynamic>)) {
-    [
+        urlsWithDescriptions.addAll({
-      GeneratedFormItem(
+          e['html_url'] as String: e['description'] != null
-          label: 'Filter Release Titles by Regular Expression',
+              ? e['description'] as String
-          type: FormItemType.string,
+              : 'No description'
-          required: false,
+        });
-          additionalValidators: [
+      }
-            (value) {
+      return urlsWithDescriptions;
-              if (value == null || value.isEmpty) {
+    } else {
-                return null;
+      rateLimitErrorCheck(res);
-              }
+      throw getObtainiumHttpError(res);
-              try {
+    }
-                RegExp(value);
+  }
-              } catch (e) {
-                return 'Invalid regular expression';
-              }
-              return null;
-            }
-          ])
-    ]
-  ];
 
-  @override
+  rateLimitErrorCheck(Response res) {
-  List<String> additionalDataDefaults = ['true', 'true', ''];
+    if (res.headers['x-ratelimit-remaining'] == '0') {
-
+      throw RateLimitError(
-  @override
+          (int.parse(res.headers['x-ratelimit-reset'] ?? '1800000000') /
-  List<GeneratedFormItem> moreSourceSettingsFormItems = [
+                  60000000)
-    GeneratedFormItem(
+              .round());
-        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

@@ -1,19 +1,20 @@
 import 'package:html/parser.dart';
 import 'package:http/http.dart';
 import 'package:obtainium/app_sources/github.dart';
-import 'package:obtainium/components/generated_form.dart';
+import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/providers/source_provider.dart';
 
-class GitLab implements AppSource {
+class GitLab extends AppSource {
-  @override
+  GitLab() {
-  late String host = 'gitlab.com';
+    host = 'gitlab.com';
+  }
 
   @override
   String standardizeURL(String url) {
     RegExp standardUrlRegEx = RegExp('^https?://$host/[^/]+/[^/]+');
     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
     if (match == null) {
-      throw notValidURL(runtimeType.toString());
+      throw InvalidURLError(runtimeType.toString());
     }
     return url.substring(0, match.end);
   }
@@ -22,9 +23,6 @@ class GitLab implements AppSource {
   String? changeLogPageFromStandardUrl(String standardUrl) =>
       '$standardUrl/-/releases';
 
-  @override
-  Future<String> apkUrlPrefetchModifier(String apkUrl) async => apkUrl;
-
   @override
   Future<APKDetails> getLatestAPKDetails(
       String standardUrl, List<String> additionalData) async {
@@ -39,7 +37,9 @@ class GitLab implements AppSource {
         ...getLinksFromParsedHTML(
             entryContent,
             RegExp(
-                '^${escapeRegEx(standardUri.path)}/uploads/[^/]+/[^/]+\\.apk\$',
+                '^${standardUri.path.replaceAllMapped(RegExp(r'[.*+?^${}()|[\]\\]'), (x) {
+                  return '\\${x[0]}';
+                })}/uploads/[^/]+/[^/]+\\.apk\$',
                 caseSensitive: false),
             standardUri.origin),
         // GitLab releases may contain links to externally hosted APKs
@@ -49,18 +49,18 @@ class GitLab implements AppSource {
             .toList()
       ];
       if (apkUrlList.isEmpty) {
-        throw noAPKFound;
+        throw NoAPKError();
       }
 
       var entryId = entry?.querySelector('id')?.innerHtml;
       var version =
           entryId == null ? null : Uri.parse(entryId).pathSegments.last;
       if (version == null) {
-        throw couldNotFindLatestVersion;
+        throw NoVersionError();
       }
       return APKDetails(version, apkUrlList);
     } else {
-      throw couldNotFindReleases;
+      throw NoReleasesError();
     }
   }
 
@@ -69,13 +69,4 @@ class GitLab implements AppSource {
     // Same as GitHub
     return GitHub().getAppNames(standardUrl);
   }
-
-  @override
-  List<List<GeneratedFormItem>> additionalDataFormItems = [];
-
-  @override
-  List<String> additionalDataDefaults = [];
-
-  @override
-  List<GeneratedFormItem> moreSourceSettingsFormItems = [];
 }

lib/app_sources/izzyondroid.dart

@@ -1,18 +1,20 @@
 import 'package:html/parser.dart';
 import 'package:http/http.dart';
-import 'package:obtainium/components/generated_form.dart';
+import 'package:obtainium/app_sources/fdroid.dart';
+import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/providers/source_provider.dart';
 
-class IzzyOnDroid implements AppSource {
+class IzzyOnDroid extends AppSource {
-  @override
+  IzzyOnDroid() {
-  late String host = 'android.izzysoft.de';
+    host = 'android.izzysoft.de';
+  }
 
   @override
   String standardizeURL(String url) {
     RegExp standardUrlRegEx = RegExp('^https?://$host/repo/apk/[^/]+');
     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
     if (match == null) {
-      throw notValidURL(runtimeType.toString());
+      throw InvalidURLError(runtimeType.toString());
     }
     return url.substring(0, match.end);
   }
@@ -21,54 +23,22 @@ class IzzyOnDroid implements AppSource {
   String? changeLogPageFromStandardUrl(String standardUrl) => null;
 
   @override
-  Future<String> apkUrlPrefetchModifier(String apkUrl) async => apkUrl;
+  String? tryInferringAppId(String standardUrl) {
+    return FDroid().tryInferringAppId(standardUrl);
+  }
 
   @override
   Future<APKDetails> getLatestAPKDetails(
       String standardUrl, List<String> additionalData) async {
-    Response res = await get(Uri.parse(standardUrl));
+    String? appId = tryInferringAppId(standardUrl);
-    if (res.statusCode == 200) {
+    return FDroid().getAPKUrlsFromFDroidPackagesAPIResponse(
-      var parsedHtml = parse(res.body);
+        await get(
-      var multipleVersionApkUrls = parsedHtml
+            Uri.parse('https://apt.izzysoft.de/fdroid/api/v1/packages/$appId')),
-          .querySelectorAll('a')
+        'https://android.izzysoft.de/frepo/$appId');
-          .where((element) =>
-              element.attributes['href']?.toLowerCase().endsWith('.apk') ??
-              false)
-          .map((e) => 'https://$host${e.attributes['href'] ?? ''}')
-          .toList();
-      if (multipleVersionApkUrls.isEmpty) {
-        throw noAPKFound;
-      }
-      var version = parsedHtml
-          .querySelector('#keydata')
-          ?.querySelectorAll('b')
-          .where(
-              (element) => element.innerHtml.toLowerCase().contains('version'))
-          .toList()[0]
-          .parentNode
-          ?.parentNode
-          ?.children[1]
-          .innerHtml;
-      if (version == null) {
-        throw couldNotFindLatestVersion;
-      }
-      return APKDetails(version, [multipleVersionApkUrls[0]]);
-    } else {
-      throw couldNotFindReleases;
-    }
   }
 
   @override
   AppNames getAppNames(String standardUrl) {
     return AppNames('IzzyOnDroid', Uri.parse(standardUrl).pathSegments.last);
   }
-
-  @override
-  List<List<GeneratedFormItem>> additionalDataFormItems = [];
-
-  @override
-  List<String> additionalDataDefaults = [];
-
-  @override
-  List<GeneratedFormItem> moreSourceSettingsFormItems = [];
 }

lib/app_sources/mullvad.dart

@@ -1,18 +1,19 @@
 import 'package:html/parser.dart';
 import 'package:http/http.dart';
-import 'package:obtainium/components/generated_form.dart';
+import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/providers/source_provider.dart';
 
-class Mullvad implements AppSource {
+class Mullvad extends AppSource {
-  @override
+  Mullvad() {
-  late String host = 'mullvad.net';
+    host = 'mullvad.net';
+  }
 
   @override
   String standardizeURL(String url) {
     RegExp standardUrlRegEx = RegExp('^https?://$host');
     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
     if (match == null) {
-      throw notValidURL(runtimeType.toString());
+      throw InvalidURLError(runtimeType.toString());
     }
     return url.substring(0, match.end);
   }
@@ -21,9 +22,6 @@ class Mullvad implements AppSource {
   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 {
@@ -36,12 +34,12 @@ class Mullvad implements AppSource {
           ?.split('/')
           .last;
       if (version == null) {
-        throw couldNotFindLatestVersion;
+        throw NoVersionError();
       }
       return APKDetails(
           version, ['https://mullvad.net/download/app/apk/latest']);
     } else {
-      throw couldNotFindReleases;
+      throw NoReleasesError();
     }
   }
 
@@ -49,13 +47,4 @@ class Mullvad implements AppSource {
   AppNames getAppNames(String standardUrl) {
     return AppNames('Mullvad-VPN', 'Mullvad-VPN');
   }
-
-  @override
-  List<List<GeneratedFormItem>> additionalDataFormItems = [];
-
-  @override
-  List<String> additionalDataDefaults = [];
-
-  @override
-  List<GeneratedFormItem> moreSourceSettingsFormItems = [];
 }

lib/app_sources/signal.dart

@@ -1,11 +1,12 @@
 import 'dart:convert';
 import 'package:http/http.dart';
-import 'package:obtainium/components/generated_form.dart';
+import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/providers/source_provider.dart';
 
-class Signal implements AppSource {
+class Signal extends AppSource {
-  @override
+  Signal() {
-  late String host = 'signal.org';
+    host = 'signal.org';
+  }
 
   @override
   String standardizeURL(String url) {
@@ -15,9 +16,6 @@ class Signal implements AppSource {
   @override
   String? changeLogPageFromStandardUrl(String standardUrl) => null;
 
-  @override
-  Future<String> apkUrlPrefetchModifier(String apkUrl) async => apkUrl;
-
   @override
   Future<APKDetails> getLatestAPKDetails(
       String standardUrl, List<String> additionalData) async {
@@ -27,27 +25,18 @@ class Signal implements AppSource {
       var json = jsonDecode(res.body);
       String? apkUrl = json['url'];
       if (apkUrl == null) {
-        throw noAPKFound;
+        throw NoAPKError();
       }
       String? version = json['versionName'];
       if (version == null) {
-        throw couldNotFindLatestVersion;
+        throw NoVersionError();
       }
       return APKDetails(version, [apkUrl]);
     } else {
-      throw couldNotFindReleases;
+      throw NoReleasesError();
     }
   }
 
   @override
   AppNames getAppNames(String standardUrl) => AppNames('Signal', 'Signal');
-
-  @override
-  List<List<GeneratedFormItem>> additionalDataFormItems = [];
-
-  @override
-  List<String> additionalDataDefaults = [];
-
-  @override
-  List<GeneratedFormItem> moreSourceSettingsFormItems = [];
 }

lib/app_sources/sourceforge.dart

@@ -1,18 +1,19 @@
 import 'package:html/parser.dart';
 import 'package:http/http.dart';
-import 'package:obtainium/components/generated_form.dart';
+import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/providers/source_provider.dart';
 
-class SourceForge implements AppSource {
+class SourceForge extends AppSource {
-  @override
+  SourceForge() {
-  late String host = 'sourceforge.net';
+    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());
+      throw InvalidURLError(runtimeType.toString());
     }
     return url.substring(0, match.end);
   }
@@ -20,9 +21,6 @@ class SourceForge implements AppSource {
   @override
   String? changeLogPageFromStandardUrl(String standardUrl) => null;
 
-  @override
-  Future<String> apkUrlPrefetchModifier(String apkUrl) async => apkUrl;
-
   @override
   Future<APKDetails> getLatestAPKDetails(
       String standardUrl, List<String> additionalData) async {
@@ -42,7 +40,7 @@ class SourceForge implements AppSource {
 
       String? version = getVersion(allDownloadLinks[0]);
       if (version == null) {
-        throw couldNotFindLatestVersion;
+        throw NoVersionError();
       }
       var apkUrlListAllReleases = allDownloadLinks
           .where((element) => element.toLowerCase().endsWith('.apk/download'))
@@ -52,11 +50,11 @@ class SourceForge implements AppSource {
               .where((element) => getVersion(element) == version)
               .toList();
       if (apkUrlList.isEmpty) {
-        throw noAPKFound;
+        throw NoAPKError();
       }
       return APKDetails(version, apkUrlList);
     } else {
-      throw couldNotFindReleases;
+      throw NoReleasesError();
     }
   }
 
@@ -65,13 +63,4 @@ class SourceForge implements AppSource {
     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_modal.dart

@@ -28,6 +28,7 @@ class _GeneratedFormModalState extends State<GeneratedFormModal> {
   @override
   void initState() {
     super.initState();
+    values = widget.defaultValues;
     valid = widget.initValid;
   }
 

lib/custom_errors.dart

@@ -1,3 +1,17 @@
+import 'package:flutter/material.dart';
+import 'package:obtainium/providers/logs_provider.dart';
+import 'package:provider/provider.dart';
+
+class ObtainiumError {
+  late String message;
+  bool unexpected;
+  ObtainiumError(this.message, {this.unexpected = false});
+  @override
+  String toString() {
+    return message;
+  }
+}
+
 class RateLimitError {
   late int remainingMinutes;
   RateLimitError(this.remainingMinutes);
@@ -6,3 +20,103 @@ class RateLimitError {
   String toString() =>
       'Too many requests (rate limited) - try again in $remainingMinutes minutes';
 }
+
+class InvalidURLError extends ObtainiumError {
+  InvalidURLError(String sourceName) : super('Not a valid $sourceName App URL');
+}
+
+class NoReleasesError extends ObtainiumError {
+  NoReleasesError() : super('Could not find a suitable release');
+}
+
+class NoAPKError extends ObtainiumError {
+  NoAPKError() : super('Could not find a suitable release');
+}
+
+class NoVersionError extends ObtainiumError {
+  NoVersionError() : super('Could not determine release version');
+}
+
+class UnsupportedURLError extends ObtainiumError {
+  UnsupportedURLError() : super('URL does not match a known source');
+}
+
+class DowngradeError extends ObtainiumError {
+  DowngradeError() : super('Cannot install an older version of an App');
+}
+
+class IDChangedError extends ObtainiumError {
+  IDChangedError()
+      : super('Downloaded package ID does not match existing App ID');
+}
+
+class NotImplementedError extends ObtainiumError {
+  NotImplementedError() : super('This class has not implemented this function');
+}
+
+class MultiAppMultiError extends ObtainiumError {
+  Map<String, List<String>> content = {};
+
+  MultiAppMultiError() : super('Multiple Errors Placeholder', unexpected: true);
+
+  add(String appId, String string) {
+    var tempIds = content.remove(string);
+    tempIds ??= [];
+    tempIds.add(appId);
+    content.putIfAbsent(string, () => tempIds!);
+  }
+
+  @override
+  String toString() {
+    String finalString = '';
+    for (var e in content.keys) {
+      finalString += '$e: ${content[e].toString()}\n\n';
+    }
+    return finalString;
+  }
+}
+
+showError(dynamic e, BuildContext context) {
+  Provider.of<LogsProvider>(context, listen: false)
+      .add(e.toString(), level: LogLevels.error);
+  if (e is String || (e is ObtainiumError && !e.unexpected)) {
+    ScaffoldMessenger.of(context).showSnackBar(
+      SnackBar(content: Text(e.toString())),
+    );
+  } else {
+    showDialog(
+        context: context,
+        builder: (BuildContext ctx) {
+          return AlertDialog(
+            scrollable: true,
+            title: Text(e is MultiAppMultiError
+                ? 'Some Errors Occurred'
+                : 'Unexpected Error'),
+            content: Text(e.toString()),
+            actions: [
+              TextButton(
+                  onPressed: () {
+                    Navigator.of(context).pop(null);
+                  },
+                  child: const Text('Ok')),
+            ],
+          );
+        });
+  }
+}
+
+String list2FriendlyString(List<String> list) {
+  return list.length == 2
+      ? '${list[0]} and ${list[1]}'
+      : list
+          .asMap()
+          .entries
+          .map((e) =>
+              e.value +
+              (e.key == list.length - 1
+                  ? ''
+                  : e.key == list.length - 2
+                      ? ', and '
+                      : ', '))
+          .join('');
+}

lib/main.dart

@@ -1,52 +1,67 @@
+import 'dart:io';
+import 'dart:math';
+
 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/logs_provider.dart';
 import 'package:obtainium/providers/notifications_provider.dart';
 import 'package:obtainium/providers/settings_provider.dart';
 import 'package:obtainium/providers/source_provider.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:provider/provider.dart';
-import 'package:workmanager/workmanager.dart';
 import 'package:dynamic_color/dynamic_color.dart';
 import 'package:device_info_plus/device_info_plus.dart';
+import 'package:android_alarm_manager_plus/android_alarm_manager_plus.dart';
 
+const String currentVersion = '0.7.4';
 const String currentReleaseTag =
-    'v0.5.8-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES
+    'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES
 
-const String bgUpdateCheckTaskName = 'bg-update-check';
+const int bgUpdateCheckAlarmId = 666;
 
-bgUpdateCheck(int? ignoreAfterMicroseconds) async {
+@pragma('vm:entry-point')
+Future<void> bgUpdateCheck(int taskId, Map<String, dynamic>? params) async {
+  LogsProvider logs = LogsProvider();
+  logs.add('Started BG update check task');
+  int? ignoreAfterMicroseconds = params?['ignoreAfterMicroseconds'];
+  WidgetsFlutterBinding.ensureInitialized();
+  await AndroidAlarmManager.initialize();
   DateTime? ignoreAfter = ignoreAfterMicroseconds != null
       ? DateTime.fromMicrosecondsSinceEpoch(ignoreAfterMicroseconds)
       : null;
+  logs.add('Bg update ignoreAfter is $ignoreAfter');
   var notificationsProvider = NotificationsProvider();
   await notificationsProvider.notify(checkingUpdatesNotification);
   try {
-    var appsProvider = AppsProvider();
+    var appsProvider = AppsProvider(forBGTask: true);
     await notificationsProvider.cancel(ErrorCheckingUpdatesNotification('').id);
     await appsProvider.loadApps();
     List<String> existingUpdateIds =
-        appsProvider.getExistingUpdates(installedOnly: true);
+        appsProvider.findExistingUpdates(installedOnly: true);
     DateTime nextIgnoreAfter = DateTime.now();
+    String? err;
     try {
-      await appsProvider.checkUpdates(ignoreAfter: ignoreAfter);
+      logs.add('Started actual BG update checking');
+      await appsProvider.checkUpdates(
+          ignoreAppsCheckedAfter: ignoreAfter, throwErrorsForRetry: true);
     } catch (e) {
-      if (e is RateLimitError) {
+      if (e is RateLimitError || e is SocketException) {
-        String nextTaskName =
+        var remainingMinutes = e is RateLimitError ? e.remainingMinutes : 15;
-            '$bgUpdateCheckTaskName-${nextIgnoreAfter.microsecondsSinceEpoch.toString()}';
+        logs.add(
-        Workmanager().registerOneOffTask(nextTaskName, nextTaskName,
+            'BG update checking encountered a ${e.runtimeType}, will schedule a retry check in $remainingMinutes minutes');
-            constraints: Constraints(networkType: NetworkType.connected),
+        AndroidAlarmManager.oneShot(Duration(minutes: remainingMinutes),
-            initialDelay: Duration(minutes: e.remainingMinutes),
+            Random().nextInt(pow(2, 31) as int), bgUpdateCheck, params: {
-            inputData: {'ignoreAfter': nextIgnoreAfter.microsecondsSinceEpoch});
+          'ignoreAfterMicroseconds': nextIgnoreAfter.microsecondsSinceEpoch
+        });
       } else {
-        rethrow;
+        err = e.toString();
       }
     }
     List<App> newUpdates = appsProvider
-        .getExistingUpdates(installedOnly: true)
+        .findExistingUpdates(installedOnly: true)
         .where((id) => !existingUpdateIds.contains(id))
         .map((e) => appsProvider.apps[e]!.app)
         .toList();
@@ -64,49 +79,38 @@ bgUpdateCheck(int? ignoreAfterMicroseconds) async {
     //           silentlyUpdated.map((e) => appsProvider.apps[e]!.app).toList()),
     //       cancelExisting: true);
     // }
-
+    logs.add(
+        'BG update checking found ${newUpdates.length} updates - will notify user if needed');
     if (newUpdates.isNotEmpty) {
-      notificationsProvider.notify(UpdateNotification(newUpdates),
+      notificationsProvider.notify(UpdateNotification(newUpdates));
-          cancelExisting: true);
+    }
+    if (err != null) {
+      throw err;
     }
-    return Future.value(true);
   } catch (e) {
-    notificationsProvider.notify(ErrorCheckingUpdatesNotification(e.toString()),
+    notificationsProvider
-        cancelExisting: true);
+        .notify(ErrorCheckingUpdatesNotification(e.toString()));
-    return Future.error(false);
   } finally {
+    logs.add('Finished BG update check task');
     await notificationsProvider.cancel(checkingUpdatesNotification.id);
   }
 }
 
-@pragma('vm:entry-point')
-void bgTaskCallback() {
-  // Background process callback
-  Workmanager().executeTask((task, inputData) async {
-    return await bgUpdateCheck(inputData?['ignoreAfter']);
-  });
-}
-
 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),
     );
     SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
   }
-  Workmanager().initialize(
+  await AndroidAlarmManager.initialize();
-    bgTaskCallback,
-  );
   runApp(MultiProvider(
     providers: [
-      ChangeNotifierProvider(
+      ChangeNotifierProvider(create: (context) => AppsProvider()),
-          create: (context) => AppsProvider(
-              shouldLoadApps: true,
-              shouldCheckUpdatesAfterLoad: false,
-              shouldDeleteAPKs: true)),
       ChangeNotifierProvider(create: (context) => SettingsProvider()),
-      Provider(create: (context) => NotificationsProvider())
+      Provider(create: (context) => NotificationsProvider()),
+      Provider(create: (context) => LogsProvider())
     ],
     child: const Obtainium(),
   ));
@@ -128,17 +132,19 @@ class _ObtainiumState extends State<Obtainium> {
   Widget build(BuildContext context) {
     SettingsProvider settingsProvider = context.watch<SettingsProvider>();
     AppsProvider appsProvider = context.read<AppsProvider>();
+    LogsProvider logs = context.read<LogsProvider>();
 
     if (settingsProvider.prefs == null) {
       settingsProvider.initializeSettings();
     } else {
       bool isFirstRun = settingsProvider.checkAndFlipFirstRun();
       if (isFirstRun) {
+        logs.add('This is the first ever run of Obtainium');
         // If this is the first run, ask for notification permissions and add Obtainium to the Apps list
         Permission.notification.request();
         appsProvider.saveApps([
           App(
-              'imranr98_obtainium_${GitHub().host}',
+              obtainiumId,
               'https://github.com/ImranR98/Obtainium',
               'ImranR98',
               'Obtainium',
@@ -147,24 +153,26 @@ class _ObtainiumState extends State<Obtainium> {
               [],
               0,
               ['true'],
-              null)
+              null,
+              false)
         ]);
       }
       // Register the background update task according to the user's setting
       if (existingUpdateInterval != settingsProvider.updateInterval) {
+        if (existingUpdateInterval != -1) {
+          logs.add(
+              'Setting update interval to ${settingsProvider.updateInterval}');
+        }
         existingUpdateInterval = settingsProvider.updateInterval;
         if (existingUpdateInterval == 0) {
-          Workmanager().cancelByUniqueName(bgUpdateCheckTaskName);
+          AndroidAlarmManager.cancel(bgUpdateCheckAlarmId);
         } else {
-          Workmanager().registerPeriodicTask(
+          AndroidAlarmManager.periodic(
-              bgUpdateCheckTaskName, bgUpdateCheckTaskName,
+              Duration(minutes: existingUpdateInterval),
-              frequency: Duration(minutes: existingUpdateInterval),
+              bgUpdateCheckAlarmId,
-              initialDelay: Duration(minutes: existingUpdateInterval),
+              bgUpdateCheck,
-              constraints: Constraints(networkType: NetworkType.connected),
+              rescheduleOnReboot: true,
-              existingWorkPolicy: ExistingWorkPolicy.replace,
+              wakeup: true);
-              backoffPolicy: BackoffPolicy.linear,
-              backoffPolicyDelay:
-                  const Duration(minutes: minUpdateIntervalMinutes));
         }
       }
     }

lib/mass_app_sources/githubstars.dart

@@ -5,47 +5,49 @@ import 'package:obtainium/app_sources/github.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/providers/source_provider.dart';
 
-class GitHubStars implements MassAppSource {
+class GitHubStars implements MassAppUrlSource {
   @override
   late String name = 'GitHub Starred Repos';
 
   @override
   late List<String> requiredArgs = ['Username'];
 
-  Future<List<String>> getOnePageOfUserStarredUrls(
+  Future<Map<String, String>> getOnePageOfUserStarredUrlsWithDescriptions(
       String username, int page) async {
     Response res = await get(Uri.parse(
         'https://${await GitHub().getCredentialPrefixIfAny()}api.github.com/users/$username/starred?per_page=100&page=$page'));
     if (res.statusCode == 200) {
-      return (jsonDecode(res.body) as List<dynamic>)
+      Map<String, String> urlsWithDescriptions = {};
-          .map((e) => e['html_url'] as String)
+      for (var e in (jsonDecode(res.body) as List<dynamic>)) {
-          .toList();
+        urlsWithDescriptions.addAll({
-    } else {
+          e['html_url'] as String: e['description'] != null
-      if (res.headers['x-ratelimit-remaining'] == '0') {
+              ? e['description'] as String
-        throw RateLimitError(
+              : 'No description'
-            (int.parse(res.headers['x-ratelimit-reset'] ?? '1800000000') /
+        });
-                    60000000)
-                .round());
       }
-
+      return urlsWithDescriptions;
-      throw 'Unable to find user\'s starred repos';
+    } else {
+      var gh = GitHub();
+      gh.rateLimitErrorCheck(res);
+      throw getObtainiumHttpError(res);
     }
   }
 
   @override
-  Future<List<String>> getUrls(List<String> args) async {
+  Future<Map<String, String>> getUrlsWithDescriptions(List<String> args) async {
     if (args.length != requiredArgs.length) {
-      throw 'Wrong number of arguments provided';
+      throw ObtainiumError('Wrong number of arguments provided');
     }
-    List<String> urls = [];
+    Map<String, String> urlsWithDescriptions = {};
     var page = 1;
     while (true) {
-      var pageUrls = await getOnePageOfUserStarredUrls(args[0], page++);
+      var pageUrls =
-      urls.addAll(pageUrls);
+          await getOnePageOfUserStarredUrlsWithDescriptions(args[0], page++);
+      urlsWithDescriptions.addAll(pageUrls);
       if (pageUrls.length < 100) {
         break;
       }
     }
-    return urls;
+    return urlsWithDescriptions;
   }
 }

lib/pages/add_app.dart

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:obtainium/components/custom_app_bar.dart';
 import 'package:obtainium/components/generated_form.dart';
+import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/pages/app.dart';
 import 'package:obtainium/providers/apps_provider.dart';
 import 'package:obtainium/providers/settings_provider.dart';
@@ -22,7 +23,6 @@ class _AddAppPageState extends State<AddAppPage> {
   String userInput = '';
   AppSource? pickedSource;
   List<String> additionalData = [];
-  String customName = '';
   bool validAdditionalData = true;
 
   @override
@@ -57,7 +57,9 @@ class _AddAppPageState extends State<AddAppPage> {
                                               } catch (e) {
                                                 return e is String
                                                     ? e
-                                                    : 'Error';
+                                                    : e is ObtainiumError
+                                                        ? e.toString()
+                                                        : 'Error';
                                               }
                                               return null;
                                             }
@@ -77,12 +79,9 @@ class _AddAppPageState extends State<AddAppPage> {
                                             : [];
                                         validAdditionalData = source != null
                                             ? sourceProvider
-                                                .doesSourceHaveRequiredAdditionalData(
+                                                .ifSourceAppsRequireAdditionalData(
                                                     source)
                                             : true;
-                                        if (source == null) {
-                                          customName = '';
-                                        }
                                       }
                                     });
                                   },
@@ -90,59 +89,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>();
-                                              customName: customName)
+                                          var settingsProvider =
-                                          .then((app) {
+                                              context.read<SettingsProvider>();
-                                        var appsProvider =
+                                          () async {
-                                            context.read<AppsProvider>();
+                                            HapticFeedback.selectionClick();
-                                        var settingsProvider =
+                                            App app =
-                                            context.read<SettingsProvider>();
+                                                await sourceProvider.getApp(
-                                        if (appsProvider.apps
+                                                    pickedSource!,
-                                            .containsKey(app.id)) {
+                                                    userInput,
-                                          throw 'App already added';
+                                                    additionalData);
-                                        }
+                                            await settingsProvider
-                                        settingsProvider
+                                                .getInstallPermission();
-                                            .getInstallPermission()
+                                            // Only download the APK here if you need to for the package ID
-                                            .then((_) {
+                                            if (sourceProvider
-                                          appsProvider
+                                                .isTempId(app.id)) {
-                                              .saveApps([app]).then((_) {
+                                              // ignore: use_build_context_synchronously
+                                              var apkUrl = await appsProvider
+                                                  .confirmApkUrl(app, context);
+                                              if (apkUrl == null) {
+                                                throw ObtainiumError(
+                                                    'Cancelled');
+                                              }
+                                              app.preferredApkIndex =
+                                                  app.apkUrls.indexOf(apkUrl);
+                                              var downloadedApk =
+                                                  await appsProvider
+                                                      .downloadApp(app);
+                                              app.id = downloadedApk.appId;
+                                            }
+                                            if (appsProvider.apps
+                                                .containsKey(app.id)) {
+                                              throw ObtainiumError(
+                                                  'App already added');
+                                            }
+                                            await appsProvider.saveApps([app]);
+
+                                            return app;
+                                          }()
+                                              .then((app) {
                                             Navigator.push(
                                                 context,
                                                 MaterialPageRoute(
                                                     builder: (context) =>
                                                         AppPage(
                                                             appId: app.id)));
+                                          }).catchError((e) {
+                                            showError(e, context);
+                                          }).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)
+                      if (pickedSource != null &&
+                          pickedSource!.additionalDataDefaults.isNotEmpty)
                         Column(
                           crossAxisAlignment: CrossAxisAlignment.stretch,
                           children: [
@@ -174,21 +192,6 @@ class _AddAppPageState extends State<AddAppPage> {
                               const SizedBox(
                                 height: 8,
                               ),
-                            if (pickedSource != null)
-                              GeneratedForm(
-                                  items: [
-                                    [
-                                      GeneratedFormItem(
-                                          label: 'Custom App Name',
-                                          required: false)
-                                    ]
-                                  ],
-                                  onValueChanges: (values, valid) {
-                                    setState(() {
-                                      customName = values[0];
-                                    });
-                                  },
-                                  defaultValues: [customName])
                           ],
                         )
                       else
@@ -197,9 +200,6 @@ class _AddAppPageState extends State<AddAppPage> {
                                 crossAxisAlignment: CrossAxisAlignment.center,
                                 mainAxisAlignment: MainAxisAlignment.center,
                                 children: [
-                              // const SizedBox(
-                              //   height: 48,
-                              // ),
                               const Text(
                                 'Supported Sources:',
                               ),

lib/pages/app.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/components/generated_form_modal.dart';
+import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/providers/apps_provider.dart';
 import 'package:obtainium/providers/settings_provider.dart';
 import 'package:obtainium/providers/source_provider.dart';
@@ -26,10 +26,8 @@ class _AppPageState extends State<AppPage> {
     var appsProvider = context.watch<AppsProvider>();
     var settingsProvider = context.watch<SettingsProvider>();
     getUpdate(String id) {
-      appsProvider.getUpdate(id).catchError((e) {
+      appsProvider.checkUpdate(id).catchError((e) {
-        ScaffoldMessenger.of(context).showSnackBar(
+        showError(e, context);
-          SnackBar(content: Text(e.toString())),
-        );
       });
     }
 
@@ -46,6 +44,7 @@ class _AppPageState extends State<AppPage> {
       body: RefreshIndicator(
           child: settingsProvider.showAppWebpage
               ? WebView(
+                  backgroundColor: Theme.of(context).colorScheme.background,
                   initialUrl: app?.app.url,
                   javascriptMode: JavascriptMode.unrestricted,
                 )
@@ -56,8 +55,22 @@ class _AppPageState extends State<AppPage> {
                       mainAxisAlignment: MainAxisAlignment.center,
                       crossAxisAlignment: CrossAxisAlignment.stretch,
                       children: [
+                        app?.installedInfo != null
+                            ? Row(
+                                mainAxisAlignment: MainAxisAlignment.center,
+                                children: [
+                                    Image.memory(
+                                      app!.installedInfo!.icon!,
+                                      height: 150,
+                                      gaplessPlayback: true,
+                                    )
+                                  ])
+                            : Container(),
+                        const SizedBox(
+                          height: 25,
+                        ),
                         Text(
-                          app?.app.name ?? 'App',
+                          app?.installedInfo?.name ?? app?.app.name ?? 'App',
                           textAlign: TextAlign.center,
                           style: Theme.of(context).textTheme.displayLarge,
                         ),
@@ -126,7 +139,8 @@ 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: app?.downloadProgress != null
                                   ? null
@@ -135,8 +149,8 @@ class _AppPageState extends State<AppPage> {
                                           context: context,
                                           builder: (BuildContext ctx) {
                                             return AlertDialog(
-                                              title: Text(
+                                              title: const Text(
-                                                  'App Already ${app?.app.installedVersion == null ? 'Installed' : 'Updated'}?'),
+                                                  'App Already up to Date?'),
                                               actions: [
                                                 TextButton(
                                                     onPressed: () {
@@ -161,54 +175,13 @@ class _AppPageState extends State<AppPage> {
                                                           .pop();
                                                     },
                                                     child: const Text(
-                                                        'Yes, Mark as Installed'))
+                                                        'Yes, Mark as Updated'))
                                               ],
                                             );
                                           });
                                     },
-                              tooltip: 'Mark as Installed',
+                              tooltip: 'Mark as Updated',
-                              icon: const Icon(Icons.done))
+                              icon: const Icon(Icons.done)),
-                        else
-                          IconButton(
-                              onPressed: app?.downloadProgress != null
-                                  ? null
-                                  : () {
-                                      showDialog(
-                                          context: context,
-                                          builder: (BuildContext ctx) {
-                                            return AlertDialog(
-                                              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.saveApps(
-                                                            [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(
@@ -220,30 +193,15 @@ class _AppPageState extends State<AppPage> {
                                           builder: (BuildContext ctx) {
                                             return GeneratedFormModal(
                                                 title: 'Additional Options',
-                                                items: [
+                                                items: source
-                                                  ...source
+                                                    .additionalDataFormItems,
-                                                      .additionalDataFormItems,
-                                                  [
-                                                    GeneratedFormItem(
-                                                        label: 'App Name',
-                                                        required: true)
-                                                  ]
-                                                ],
                                                 defaultValues: app != null
-                                                    ? [
+                                                    ? app.app.additionalData
-                                                        ...app
+                                                    : source
-                                                            .app.additionalData,
+                                                        .additionalDataDefaults);
-                                                        app.app.name
-                                                      ]
-                                                    : [
-                                                        ...source
-                                                            .additionalDataDefaults
-                                                      ]);
                                           }).then((values) {
                                         if (app != null && values != null) {
                                           var changedApp = app.app;
-                                          var name = values.removeLast();
-                                          changedApp.name = name;
                                           changedApp.additionalData = values;
                                           appsProvider.saveApps(
                                               [changedApp]).then((value) {
@@ -258,19 +216,20 @@ class _AppPageState extends State<AppPage> {
                         Expanded(
                             child: ElevatedButton(
                                 onPressed: (app?.app.installedVersion == null ||
-                                            appsProvider
+                                            app?.app.installedVersion !=
-                                                .checkAppObjectForUpdate(
+                                                app?.app.latestVersion) &&
-                                                    app!.app)) &&
                                         !appsProvider.areDownloadsRunning()
                                     ? () {
                                         HapticFeedback.heavyImpact();
                                         appsProvider
-                                            .downloadAndInstallLatestApp(
+                                            .downloadAndInstallLatestApps(
                                                 [app!.app.id],
                                                 context).then((res) {
                                           if (res.isNotEmpty && mounted) {
                                             Navigator.of(context).pop();
                                           }
+                                        }).catchError((e) {
+                                          showError(e, context);
                                         });
                                       }
                                     : null,
@@ -288,7 +247,7 @@ 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: () {

lib/pages/apps.dart

@@ -3,6 +3,7 @@ import 'package:flutter/services.dart';
 import 'package:obtainium/components/custom_app_bar.dart';
 import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/components/generated_form_modal.dart';
+import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/pages/app.dart';
 import 'package:obtainium/providers/apps_provider.dart';
 import 'package:obtainium/providers/settings_provider.dart';
@@ -22,23 +23,24 @@ class AppsPageState extends State<AppsPage> {
   AppsFilter? filter;
   var updatesOnlyFilter =
       AppsFilter(includeUptodate: false, includeNonInstalled: false);
-  Set<String> selectedIds = {};
+  Set<App> selectedApps = {};
+  DateTime? refreshingSince;
 
   clearSelected() {
-    if (selectedIds.isNotEmpty) {
+    if (selectedApps.isNotEmpty) {
       setState(() {
-        selectedIds.clear();
+        selectedApps.clear();
       });
       return true;
     }
     return false;
   }
 
-  selectThese(List<String> appIds) {
+  selectThese(List<App> apps) {
-    if (selectedIds.isEmpty) {
+    if (selectedApps.isEmpty) {
       setState(() {
-        for (var a in appIds) {
+        for (var a in apps) {
-          selectedIds.add(a);
+          selectedApps.add(a);
         }
       });
     }
@@ -52,16 +54,16 @@ class AppsPageState extends State<AppsPage> {
     var currentFilterIsUpdatesOnly =
         filter?.isIdenticalTo(updatesOnlyFilter) ?? false;
 
-    selectedIds = selectedIds
+    selectedApps = selectedApps
-        .where((element) => sortedApps.map((e) => e.app.id).contains(element))
+        .where((element) => sortedApps.map((e) => e.app).contains(element))
         .toSet();
 
-    toggleAppSelected(String appId) {
+    toggleAppSelected(App app) {
       setState(() {
-        if (selectedIds.contains(appId)) {
+        if (selectedApps.contains(app)) {
-          selectedIds.remove(appId);
+          selectedApps.remove(app);
         } else {
-          selectedIds.add(appId);
+          selectedApps.add(app);
         }
       });
     }
@@ -89,7 +91,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;
           }
         }
@@ -103,13 +106,13 @@ 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;
     });
@@ -118,28 +121,57 @@ class AppsPageState extends State<AppsPage> {
       sortedApps = sortedApps.reversed.toList();
     }
 
-    var existingUpdateIdsAllOrSelected = appsProvider
+    var existingUpdates = appsProvider.findExistingUpdates(installedOnly: true);
-        .getExistingUpdates(installedOnly: true)
+
-        .where((element) => selectedIds.isEmpty
+    var existingUpdateIdsAllOrSelected = existingUpdates
+        .where((element) => selectedApps.isEmpty
             ? sortedApps.where((a) => a.app.id == element).isNotEmpty
-            : selectedIds.contains(element))
+            : selectedApps.map((e) => e.id).contains(element))
         .toList();
     var newInstallIdsAllOrSelected = appsProvider
-        .getExistingUpdates(nonInstalledOnly: true)
+        .findExistingUpdates(nonInstalledOnly: true)
-        .where((element) => selectedIds.isEmpty
+        .where((element) => selectedApps.isEmpty
             ? sortedApps.where((a) => a.app.id == element).isNotEmpty
-            : selectedIds.contains(element))
+            : selectedApps.map((e) => e.id).contains(element))
         .toList();
 
+    if (settingsProvider.pinUpdates) {
+      var temp = [];
+      sortedApps = sortedApps.where((sa) {
+        if (existingUpdates.contains(sa.app.id)) {
+          temp.add(sa);
+          return false;
+        }
+        return true;
+      }).toList();
+      sortedApps = [...temp, ...sortedApps];
+    }
+
+    var tempPinned = [];
+    var tempNotPinned = [];
+    for (var a in sortedApps) {
+      if (a.app.pinned) {
+        tempPinned.add(a);
+      } else {
+        tempNotPinned.add(a);
+      }
+    }
+    sortedApps = [...tempPinned, ...tempNotPinned];
+
     return Scaffold(
       backgroundColor: Theme.of(context).colorScheme.surface,
       body: RefreshIndicator(
           onRefresh: () {
             HapticFeedback.lightImpact();
+            setState(() {
+              refreshingSince = DateTime.now();
+            });
             return appsProvider.checkUpdates().catchError((e) {
-              ScaffoldMessenger.of(context).showSnackBar(
+              showError(e, context);
-                SnackBar(content: Text(e.toString())),
+            }).whenComplete(() {
-              );
+              setState(() {
+                refreshingSince = null;
+              });
             });
           },
           child: CustomScrollView(slivers: <Widget>[
@@ -156,18 +188,51 @@ class AppsPageState extends State<AppsPage> {
                               style: Theme.of(context).textTheme.headlineMedium,
                               textAlign: TextAlign.center,
                             ))),
+            if (refreshingSince != null)
+              SliverToBoxAdapter(
+                child: LinearProgressIndicator(
+                  value: appsProvider.apps.values
+                          .where((element) => !(element.app.lastUpdateCheck
+                                  ?.isBefore(refreshingSince!) ??
+                              true))
+                          .length /
+                      appsProvider.apps.length,
+                ),
+              ),
             SliverList(
                 delegate: SliverChildBuilderDelegate(
                     (BuildContext context, int index) {
               return ListTile(
-                selectedTileColor:
+                tileColor: sortedApps[index].app.pinned
-                    Theme.of(context).colorScheme.primary.withOpacity(0.1),
+                    ? Colors.grey.withOpacity(0.1)
-                selected: selectedIds.contains(sortedApps[index].app.id),
+                    : Colors.transparent,
+                selectedTileColor: Theme.of(context)
+                    .colorScheme
+                    .primary
+                    .withOpacity(sortedApps[index].app.pinned ? 0.2 : 0.1),
+                selected: selectedApps.contains(sortedApps[index].app),
                 onLongPress: () {
-                  toggleAppSelected(sortedApps[index].app.id);
+                  toggleAppSelected(sortedApps[index].app);
                 },
-                title: Text(sortedApps[index].app.name),
+                leading: sortedApps[index].installedInfo != null
-                subtitle: Text('By ${sortedApps[index].app.author}'),
+                    ? Image.memory(
+                        sortedApps[index].installedInfo!.icon!,
+                        gaplessPlayback: true,
+                      )
+                    : null,
+                title: Text(
+                  sortedApps[index].installedInfo?.name ??
+                      sortedApps[index].app.name,
+                  style: TextStyle(
+                      fontWeight: sortedApps[index].app.pinned
+                          ? FontWeight.bold
+                          : FontWeight.normal),
+                ),
+                subtitle: Text('By ${sortedApps[index].app.author}',
+                    style: TextStyle(
+                        fontWeight: sortedApps[index].app.pinned
+                            ? FontWeight.bold
+                            : FontWeight.normal)),
                 trailing: sortedApps[index].downloadProgress != null
                     ? Text(
                         'Downloading - ${sortedApps[index].downloadProgress?.toInt()}%')
@@ -178,7 +243,9 @@ class AppsPageState extends State<AppsPage> {
                             mainAxisAlignment: MainAxisAlignment.center,
                             crossAxisAlignment: CrossAxisAlignment.end,
                             children: [
-                              const Text('Update Available'),
+                              Text(appsProvider.areDownloadsRunning()
+                                  ? 'Please Wait...'
+                                  : 'Update Available'),
                               SourceProvider()
                                           .getSource(sortedApps[index].app.url)
                                           .changeLogPageFromStandardUrl(
@@ -205,11 +272,18 @@ class AppsPageState extends State<AppsPage> {
                                       )),
                             ],
                           )
-                        : Text(sortedApps[index].app.installedVersion ??
+                        : SingleChildScrollView(
-                            'Not Installed')),
+                            child: SizedBox(
+                                width: 80,
+                                child: Text(
+                                  sortedApps[index].app.installedVersion ??
+                                      'Not Installed',
+                                  overflow: TextOverflow.fade,
+                                  textAlign: TextAlign.end,
+                                )))),
                 onTap: () {
-                  if (selectedIds.isNotEmpty) {
+                  if (selectedApps.isNotEmpty) {
-                    toggleAppSelected(sortedApps[index].app.id);
+                    toggleAppSelected(sortedApps[index].app);
                   } else {
                     Navigator.push(
                       context,
@@ -227,25 +301,25 @@ class AppsPageState extends State<AppsPage> {
           children: [
             IconButton(
                 onPressed: () {
-                  selectedIds.isEmpty
+                  selectedApps.isEmpty
-                      ? selectThese(sortedApps.map((e) => e.app.id).toList())
+                      ? selectThese(sortedApps.map((e) => e.app).toList())
                       : clearSelected();
                 },
                 icon: Icon(
-                  selectedIds.isEmpty
+                  selectedApps.isEmpty
                       ? Icons.select_all_outlined
                       : Icons.deselect_outlined,
                   color: Theme.of(context).colorScheme.primary,
                 ),
-                tooltip: selectedIds.isEmpty
+                tooltip: selectedApps.isEmpty
                     ? 'Select All'
-                    : 'Deselect ${selectedIds.length.toString()}'),
+                    : 'Deselect ${selectedApps.length.toString()}'),
             const VerticalDivider(),
             Expanded(
                 child: Row(
               mainAxisAlignment: MainAxisAlignment.spaceEvenly,
               children: [
-                selectedIds.isEmpty
+                selectedApps.isEmpty
                     ? const SizedBox()
                     : IconButton(
                         visualDensity: VisualDensity.compact,
@@ -259,11 +333,12 @@ class AppsPageState extends State<AppsPage> {
                                   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.',
+                                      '${selectedApps.length} App${selectedApps.length == 1 ? '' : 's'} will be removed from Obtainium but remain installed. You still need to uninstall ${selectedApps.length == 1 ? 'it' : 'them'} manually.',
                                 );
                               }).then((values) {
                             if (values != null) {
-                              appsProvider.removeApps(selectedIds.toList());
+                              appsProvider.removeApps(
+                                  selectedApps.map((e) => e.id).toList());
                             }
                           });
                         },
@@ -299,19 +374,22 @@ class AppsPageState extends State<AppsPage> {
                                 builder: (BuildContext ctx) {
                                   return GeneratedFormModal(
                                     title:
-                                        'Install${selectedIds.isEmpty ? ' ' : ' Selected '}Apps?',
+                                        'Install${selectedApps.isEmpty ? ' ' : ' Selected '}Apps?',
                                     message:
                                         '${existingUpdateIdsAllOrSelected.length} update${existingUpdateIdsAllOrSelected.length == 1 ? '' : 's'} and ${newInstallIdsAllOrSelected.length} new install${newInstallIdsAllOrSelected.length == 1 ? '' : 's'}.',
                                     items: formInputs,
-                                    defaultValues: const ['true', 'true'],
+                                    defaultValues: [
+                                      'true',
+                                      existingUpdateIdsAllOrSelected.isEmpty
+                                          ? 'true'
+                                          : ''
+                                    ],
                                     initValid: true,
                                   );
                                 }).then((values) {
                               if (values != null) {
-                                bool shouldInstallUpdates =
+                                bool shouldInstallUpdates = values[0] == 'true';
-                                    values.length < 2 || values[0] == 'true';
+                                bool shouldInstallNew = values[1] == 'true';
-                                bool shouldInstallNew =
-                                    values.length < 2 || values[1] == 'true';
                                 settingsProvider
                                     .getInstallPermission()
                                     .then((_) {
@@ -324,18 +402,22 @@ class AppsPageState extends State<AppsPage> {
                                     toInstall
                                         .addAll(newInstallIdsAllOrSelected);
                                   }
-                                  appsProvider.downloadAndInstallLatestApp(
+                                  appsProvider
-                                      toInstall, context);
+                                      .downloadAndInstallLatestApps(
+                                          toInstall, context)
+                                      .catchError((e) {
+                                    showError(e, context);
+                                  });
                                 });
                               }
                             });
                           },
                     tooltip:
-                        'Install/Update${selectedIds.isEmpty ? ' ' : ' Selected '}Apps',
+                        'Install/Update${selectedApps.isEmpty ? ' ' : ' Selected '}Apps',
                     icon: const Icon(
                       Icons.file_download_outlined,
                     )),
-                selectedIds.isEmpty
+                selectedApps.isEmpty
                     ? const SizedBox()
                     : IconButton(
                         visualDensity: VisualDensity.compact,
@@ -349,7 +431,7 @@ class AppsPageState extends State<AppsPage> {
                                     padding: const EdgeInsets.only(top: 6),
                                     child: Row(
                                         mainAxisAlignment:
-                                            MainAxisAlignment.spaceBetween,
+                                            MainAxisAlignment.spaceAround,
                                         children: [
                                           IconButton(
                                               onPressed:
@@ -364,7 +446,10 @@ class AppsPageState extends State<AppsPage> {
                                                                       ctx) {
                                                                 return AlertDialog(
                                                                   title: Text(
-                                                                      'Mark ${selectedIds.length} Selected Apps as Not Installed?'),
+                                                                      'Mark ${selectedApps.length} Selected Apps as Updated?'),
+                                                                  content:
+                                                                      const Text(
+                                                                          'Only applies to installed but out of date Apps.'),
                                                                   actions: [
                                                                     TextButton(
                                                                         onPressed:
@@ -380,11 +465,11 @@ class AppsPageState extends State<AppsPage> {
                                                                           HapticFeedback
                                                                               .selectionClick();
                                                                           appsProvider
-                                                                              .saveApps(selectedIds.map((e) {
+                                                                              .saveApps(selectedApps.map((a) {
-                                                                            var a =
+                                                                            if (a.installedVersion !=
-                                                                                appsProvider.apps[e]!.app;
+                                                                                null) {
-                                                                            a.installedVersion =
+                                                                              a.installedVersion = a.latestVersion;
-                                                                                null;
+                                                                            }
                                                                             return a;
                                                                           }).toList());
 
@@ -395,77 +480,84 @@ class AppsPageState extends State<AppsPage> {
                                                                             'Yes'))
                                                                   ],
                                                                 );
-                                                              });
+                                                              }).whenComplete(() {
+                                                            Navigator.of(
+                                                                    context)
+                                                                .pop();
+                                                          });
                                                         },
                                               tooltip:
-                                                  'Mark Selected Apps as Not Installed',
+                                                  'Mark Selected Apps as Updated',
-                                              icon: const Icon(
-                                                  Icons.no_cell_outlined)),
-                                          IconButton(
-                                              onPressed:
-                                                  appsProvider
-                                                          .areDownloadsRunning()
-                                                      ? null
-                                                      : () {
-                                                          showDialog(
-                                                              context: context,
-                                                              builder:
-                                                                  (BuildContext
-                                                                      ctx) {
-                                                                return AlertDialog(
-                                                                  title: Text(
-                                                                      'Mark ${selectedIds.length} Selected Apps as Installed/Updated?'),
-                                                                  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;
-                                                                            a.installedVersion =
-                                                                                a.latestVersion;
-                                                                            return a;
-                                                                          }).toList());
-
-                                                                          Navigator.of(context)
-                                                                              .pop();
-                                                                        },
-                                                                        child: const Text(
-                                                                            'Yes'))
-                                                                  ],
-                                                                );
-                                                              });
-                                                        },
-                                              tooltip:
-                                                  'Mark Selected Apps as Installed/Updated',
                                               icon: const Icon(Icons.done)),
+                                          IconButton(
+                                            onPressed: () {
+                                              var pinStatus = selectedApps
+                                                  .where((element) =>
+                                                      element.pinned)
+                                                  .isEmpty;
+                                              appsProvider.saveApps(
+                                                  selectedApps.map((e) {
+                                                e.pinned = pinStatus;
+                                                return e;
+                                              }).toList());
+                                              Navigator.of(context).pop();
+                                            },
+                                            tooltip:
+                                                '${selectedApps.where((element) => element.pinned).isEmpty ? 'Pin to' : 'Unpin from'} top',
+                                            icon: Icon(selectedApps
+                                                    .where((element) =>
+                                                        element.pinned)
+                                                    .isEmpty
+                                                ? Icons.bookmark_outline_rounded
+                                                : Icons
+                                                    .bookmark_remove_outlined),
+                                          ),
                                           IconButton(
                                             onPressed: () {
                                               String urls = '';
-                                              for (var id in selectedIds) {
+                                              for (var a in selectedApps) {
-                                                urls +=
+                                                urls += '${a.url}\n';
-                                                    '${appsProvider.apps[id]!.app.url}\n';
                                               }
                                               urls = urls.substring(
                                                   0, urls.length - 1);
                                               Share.share(urls,
                                                   subject:
-                                                      '${selectedIds.length} Selected App URLs from Obtainium');
+                                                      '${selectedApps.length} Selected App URLs from Obtainium');
+                                              Navigator.of(context).pop();
                                             },
                                             tooltip: 'Share Selected App URLs',
                                             icon: const Icon(Icons.share),
                                           ),
+                                          IconButton(
+                                            onPressed: () {
+                                              showDialog(
+                                                  context: context,
+                                                  builder: (BuildContext ctx) {
+                                                    return GeneratedFormModal(
+                                                      title:
+                                                          'Reset Install Status for Selected Apps?',
+                                                      items: const [],
+                                                      defaultValues: const [],
+                                                      initValid: true,
+                                                      message:
+                                                          'The install status of ${selectedApps.length} App${selectedApps.length == 1 ? '' : 's'} will be reset.\n\nThis can help when the App version shown in Obtainium is incorrect due to failed updates or other issues.',
+                                                    );
+                                                  }).then((values) {
+                                                if (values != null) {
+                                                  appsProvider.saveApps(
+                                                      selectedApps.map((e) {
+                                                    e.installedVersion = null;
+                                                    return e;
+                                                  }).toList());
+                                                }
+                                              }).whenComplete(() {
+                                                Navigator.of(context).pop();
+                                              });
+                                            },
+                                            tooltip: 'Reset Install Status',
+                                            icon: const Icon(
+                                                Icons.restore_page_outlined),
+                                          ),
                                         ]),
                                   ),
                                 );

lib/pages/home.dart

@@ -92,7 +92,6 @@ class _HomePageState extends State<HomePage> {
           return !(pages[0].widget.key as GlobalKey<AppsPageState>)
               .currentState
               ?.clearSelected();
-          // return !appsPageKey.currentState?.clearSelected();
         });
   }
 }

lib/pages/import_export.dart

@@ -6,11 +6,13 @@ import 'package:flutter/services.dart';
 import 'package:obtainium/components/custom_app_bar.dart';
 import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/components/generated_form_modal.dart';
+import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/providers/apps_provider.dart';
 import 'package:obtainium/providers/settings_provider.dart';
 import 'package:obtainium/providers/source_provider.dart';
 import 'package:provider/provider.dart';
 import 'package:file_picker/file_picker.dart';
+import 'package:url_launcher/url_launcher_string.dart';
 
 class ImportExportPage extends StatefulWidget {
   const ImportExportPage({super.key});
@@ -61,7 +63,6 @@ class _ImportExportPageState extends State<ImportExportPage> {
         body: CustomScrollView(slivers: <Widget>[
           const CustomAppBar(title: 'Import/Export'),
           SliverFillRemaining(
-              hasScrollBody: false,
               child: Padding(
                   padding:
                       const EdgeInsets.symmetric(vertical: 8, horizontal: 16),
@@ -81,12 +82,8 @@ class _ImportExportPageState extends State<ImportExportPage> {
                                           appsProvider
                                               .exportApps()
                                               .then((String path) {
-                                            ScaffoldMessenger.of(context)
+                                            showError(
-                                                .showSnackBar(
+                                                'Exported to $path', context);
-                                              SnackBar(
-                                                  content: Text(
-                                                      'Exported to $path')),
-                                            );
                                           });
                                         },
                                   child: const Text('Obtainium Export'))),
@@ -113,27 +110,21 @@ class _ImportExportPageState extends State<ImportExportPage> {
                                               try {
                                                 jsonDecode(data);
                                               } catch (e) {
-                                                throw 'Invalid input';
+                                                throw ObtainiumError(
+                                                    'Invalid input');
                                               }
                                               appsProvider
                                                   .importApps(data)
                                                   .then((value) {
-                                                ScaffoldMessenger.of(context)
+                                                showError(
-                                                    .showSnackBar(
+                                                    '$value App${value == 1 ? '' : 's'} Imported',
-                                                  SnackBar(
+                                                    context);
-                                                      content: Text(
-                                                          '$value App${value == 1 ? '' : 's'} Imported')),
-                                                );
                                               });
                                             } else {
                                               // User canceled the picker
                                             }
                                           }).catchError((e) {
-                                            ScaffoldMessenger.of(context)
+                                            showError(e, context);
-                                                .showSnackBar(
-                                              SnackBar(
-                                                  content: Text(e.toString())),
-                                            );
                                           }).whenComplete(() {
                                             setState(() {
                                               importInProgress = false;
@@ -208,12 +199,9 @@ class _ImportExportPageState extends State<ImportExportPage> {
                                       });
                                       addApps(urls).then((errors) {
                                         if (errors.isEmpty) {
-                                          ScaffoldMessenger.of(context)
+                                          showError(
-                                              .showSnackBar(
+                                              'Imported ${urls.length} Apps',
-                                            SnackBar(
+                                              context);
-                                                content: Text(
-                                                    'Imported ${urls.length} Apps')),
-                                          );
                                         } else {
                                           showDialog(
                                               context: context,
@@ -224,10 +212,7 @@ class _ImportExportPageState extends State<ImportExportPage> {
                                               });
                                         }
                                       }).catchError((e) {
-                                        ScaffoldMessenger.of(context)
+                                        showError(e, context);
-                                            .showSnackBar(
-                                          SnackBar(content: Text(e.toString())),
-                                        );
                                       }).whenComplete(() {
                                         setState(() {
                                           importInProgress = false;
@@ -239,7 +224,8 @@ class _ImportExportPageState extends State<ImportExportPage> {
                           child: const Text(
                             'Import from URL List',
                           )),
-                      ...sourceProvider.massSources
+                      ...sourceProvider.sources
+                          .where((element) => element.canSearch)
                           .map((source) => Column(
                                   crossAxisAlignment:
                                       CrossAxisAlignment.stretch,
@@ -249,99 +235,192 @@ class _ImportExportPageState extends State<ImportExportPage> {
                                         onPressed: importInProgress
                                             ? null
                                             : () {
-                                                showDialog(
+                                                () async {
-                                                    context: context,
+                                                  var values = await showDialog<
-                                                    builder:
+                                                          List<String>>(
-                                                        (BuildContext ctx) {
+                                                      context: context,
-                                                      return GeneratedFormModal(
+                                                      builder:
-                                                        title:
+                                                          (BuildContext ctx) {
-                                                            'Import ${source.name}',
+                                                        return GeneratedFormModal(
-                                                        items: source
+                                                          title:
-                                                            .requiredArgs
+                                                              'Search ${source.runtimeType}',
-                                                            .map((e) => [
+                                                          items: [
-                                                                  GeneratedFormItem(
+                                                            [
-                                                                      label: e)
+                                                              GeneratedFormItem(
-                                                                ])
+                                                                  label:
-                                                            .toList(),
+                                                                      '${source.runtimeType} Search Query')
-                                                        defaultValues: const [],
+                                                            ]
-                                                      );
+                                                          ],
-                                                    }).then((values) {
+                                                          defaultValues: const [],
-                                                  if (values != null) {
+                                                        );
+                                                      });
+                                                  if (values != null &&
+                                                      values[0].isNotEmpty) {
                                                     setState(() {
                                                       importInProgress = true;
                                                     });
-                                                    source
+                                                    var urlsWithDescriptions =
-                                                        .getUrls(values)
+                                                        await source
-                                                        .then((urls) {
+                                                            .search(values[0]);
-                                                      showDialog<List<String>?>(
+                                                    if (urlsWithDescriptions
+                                                        .isNotEmpty) {
+                                                      var selectedUrls =
+                                                          await showDialog<
+                                                                  List<
+                                                                      String>?>(
                                                               context: context,
                                                               builder:
                                                                   (BuildContext
                                                                       ctx) {
                                                                 return UrlSelectionModal(
-                                                                    urls: urls);
+                                                                  urlsWithDescriptions:
-                                                              })
+                                                                      urlsWithDescriptions,
-                                                          .then((selectedUrls) {
+                                                                  defaultSelected:
-                                                        if (selectedUrls !=
+                                                                      false,
-                                                            null) {
+                                                                );
-                                                          addApps(selectedUrls)
+                                                              });
-                                                              .then((errors) {
+                                                      if (selectedUrls !=
-                                                            if (errors
+                                                              null &&
-                                                                .isEmpty) {
+                                                          selectedUrls
-                                                              ScaffoldMessenger
+                                                              .isNotEmpty) {
-                                                                      .of(context)
+                                                        var errors =
-                                                                  .showSnackBar(
+                                                            await addApps(
-                                                                SnackBar(
+                                                                selectedUrls);
-                                                                    content: Text(
+                                                        if (errors.isEmpty) {
-                                                                        'Imported ${selectedUrls.length} Apps')),
+                                                          // ignore: use_build_context_synchronously
-                                                              );
+                                                          showError(
-                                                            } else {
+                                                              'Imported ${selectedUrls.length} Apps',
-                                                              showDialog(
+                                                              context);
-                                                                  context:
-                                                                      context,
-                                                                  builder:
-                                                                      (BuildContext
-                                                                          ctx) {
-                                                                    return ImportErrorDialog(
-                                                                        urlsLength:
-                                                                            selectedUrls
-                                                                                .length,
-                                                                        errors:
-                                                                            errors);
-                                                                  });
-                                                            }
-                                                          }).whenComplete(() {
-                                                            setState(() {
-                                                              importInProgress =
-                                                                  false;
-                                                            });
-                                                          });
                                                         } else {
-                                                          setState(() {
+                                                          showDialog(
-                                                            importInProgress =
+                                                              context: context,
-                                                                false;
+                                                              builder:
-                                                          });
+                                                                  (BuildContext
+                                                                      ctx) {
+                                                                return ImportErrorDialog(
+                                                                    urlsLength:
+                                                                        selectedUrls
+                                                                            .length,
+                                                                    errors:
+                                                                        errors);
+                                                              });
                                                         }
-                                                      });
+                                                      }
-                                                    }).catchError((e) {
+                                                    } else {
-                                                      setState(() {
+                                                      throw ObtainiumError(
-                                                        importInProgress =
+                                                          'No results found');
-                                                            false;
+                                                    }
-                                                      });
-                                                      ScaffoldMessenger.of(
-                                                              context)
-                                                          .showSnackBar(
-                                                        SnackBar(
-                                                            content: Text(
-                                                                e.toString())),
-                                                      );
-                                                    });
                                                   }
+                                                }()
+                                                    .catchError((e) {
+                                                  showError(e, context);
+                                                }).whenComplete(() {
+                                                  setState(() {
+                                                    importInProgress = false;
+                                                  });
+                                                });
+                                              },
+                                        child: Text(
+                                            'Search ${source.runtimeType}'))
+                                  ]))
+                          .toList(),
+                      ...sourceProvider.massUrlSources
+                          .map((source) => Column(
+                                  crossAxisAlignment:
+                                      CrossAxisAlignment.stretch,
+                                  children: [
+                                    const SizedBox(height: 8),
+                                    TextButton(
+                                        onPressed: importInProgress
+                                            ? null
+                                            : () {
+                                                () async {
+                                                  var values = await showDialog(
+                                                      context: context,
+                                                      builder:
+                                                          (BuildContext ctx) {
+                                                        return GeneratedFormModal(
+                                                          title:
+                                                              'Import ${source.name}',
+                                                          items:
+                                                              source
+                                                                  .requiredArgs
+                                                                  .map(
+                                                                      (e) => [
+                                                                            GeneratedFormItem(label: e)
+                                                                          ])
+                                                                  .toList(),
+                                                          defaultValues: const [],
+                                                        );
+                                                      });
+                                                  if (values != null) {
+                                                    setState(() {
+                                                      importInProgress = true;
+                                                    });
+                                                    var urlsWithDescriptions =
+                                                        await source
+                                                            .getUrlsWithDescriptions(
+                                                                values);
+                                                    var selectedUrls =
+                                                        await showDialog<
+                                                                List<String>?>(
+                                                            context: context,
+                                                            builder:
+                                                                (BuildContext
+                                                                    ctx) {
+                                                              return UrlSelectionModal(
+                                                                  urlsWithDescriptions:
+                                                                      urlsWithDescriptions);
+                                                            });
+                                                    if (selectedUrls != null) {
+                                                      var errors =
+                                                          await addApps(
+                                                              selectedUrls);
+                                                      if (errors.isEmpty) {
+                                                        // ignore: use_build_context_synchronously
+                                                        showError(
+                                                            'Imported ${selectedUrls.length} Apps',
+                                                            context);
+                                                      } else {
+                                                        showDialog(
+                                                            context: context,
+                                                            builder:
+                                                                (BuildContext
+                                                                    ctx) {
+                                                              return ImportErrorDialog(
+                                                                  urlsLength:
+                                                                      selectedUrls
+                                                                          .length,
+                                                                  errors:
+                                                                      errors);
+                                                            });
+                                                      }
+                                                    }
+                                                  }
+                                                }()
+                                                    .catchError((e) {
+                                                  showError(e, context);
+                                                }).whenComplete(() {
+                                                  setState(() {
+                                                    importInProgress = false;
+                                                  });
                                                 });
                                               },
                                         child: Text('Import ${source.name}'))
                                   ]))
-                          .toList()
+                          .toList(),
+                      const Spacer(),
+                      const Divider(
+                        height: 32,
+                      ),
+                      const Text(
+                          'Imported Apps may incorrectly show as "Not Installed".\nTo fix this, re-install them through Obtainium.\nThis should not affect App data.\n\nOnly affects URL and third-party import methods.',
+                          textAlign: TextAlign.center,
+                          style: TextStyle(
+                              fontStyle: FontStyle.italic, fontSize: 12)),
+                      const SizedBox(
+                        height: 8,
+                      )
                     ],
                   )))
         ]));
@@ -404,21 +483,26 @@ class _ImportErrorDialogState extends State<ImportErrorDialog> {
 
 // ignore: must_be_immutable
 class UrlSelectionModal extends StatefulWidget {
-  UrlSelectionModal({super.key, required this.urls});
+  UrlSelectionModal(
+      {super.key,
+      required this.urlsWithDescriptions,
+      this.defaultSelected = true});
 
-  List<String> urls;
+  Map<String, String> urlsWithDescriptions;
+  bool defaultSelected;
 
   @override
   State<UrlSelectionModal> createState() => _UrlSelectionModalState();
 }
 
 class _UrlSelectionModalState extends State<UrlSelectionModal> {
-  Map<String, bool> urlSelections = {};
+  Map<MapEntry<String, String>, bool> urlWithDescriptionSelections = {};
   @override
   void initState() {
     super.initState();
-    for (var url in widget.urls) {
+    for (var url in widget.urlsWithDescriptions.entries) {
-      urlSelections.putIfAbsent(url, () => true);
+      urlWithDescriptionSelections.putIfAbsent(
+          url, () => widget.defaultSelected);
     }
   }
 
@@ -428,21 +512,48 @@ class _UrlSelectionModalState extends State<UrlSelectionModal> {
       scrollable: true,
       title: const Text('Select URLs to Import'),
       content: Column(children: [
-        ...urlSelections.keys.map((url) {
+        ...urlWithDescriptionSelections.keys.map((urlWithD) {
           return Row(children: [
             Checkbox(
-                value: urlSelections[url],
+                value: urlWithDescriptionSelections[urlWithD],
                 onChanged: (value) {
                   setState(() {
-                    urlSelections[url] = value ?? false;
+                    urlWithDescriptionSelections[urlWithD] = value ?? false;
                   });
                 }),
             const SizedBox(
               width: 8,
             ),
             Expanded(
-                child: Text(
+                child: Column(
-              Uri.parse(url).path.substring(1),
+              crossAxisAlignment: CrossAxisAlignment.start,
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                const SizedBox(
+                  height: 8,
+                ),
+                GestureDetector(
+                    onTap: () {
+                      launchUrlString(urlWithD.key,
+                          mode: LaunchMode.externalApplication);
+                    },
+                    child: Text(
+                      Uri.parse(urlWithD.key).path.substring(1),
+                      style:
+                          const TextStyle(decoration: TextDecoration.underline),
+                      textAlign: TextAlign.start,
+                    )),
+                Text(
+                  urlWithD.value.length > 128
+                      ? '${urlWithD.value.substring(0, 128)}...'
+                      : urlWithD.value,
+                  style: const TextStyle(
+                      fontStyle: FontStyle.italic, fontSize: 12),
+                ),
+                const SizedBox(
+                  height: 8,
+                )
+              ],
             ))
           ]);
         })
@@ -455,12 +566,13 @@ class _UrlSelectionModalState extends State<UrlSelectionModal> {
             child: const Text('Cancel')),
         TextButton(
             onPressed: () {
-              Navigator.of(context).pop(urlSelections.keys
+              Navigator.of(context).pop(urlWithDescriptionSelections.entries
-                  .where((url) => urlSelections[url] ?? false)
+                  .where((entry) => entry.value)
+                  .map((e) => e.key.key)
                   .toList());
             },
             child: Text(
-                'Import ${urlSelections.values.where((b) => b).length} URLs'))
+                'Import ${urlWithDescriptionSelections.values.where((b) => b).length} URLs'))
       ],
     );
   }

lib/pages/settings.dart

@@ -1,9 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:obtainium/components/custom_app_bar.dart';
 import 'package:obtainium/components/generated_form.dart';
+import 'package:obtainium/components/generated_form_modal.dart';
+import 'package:obtainium/custom_errors.dart';
+import 'package:obtainium/providers/logs_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 SettingsPage extends StatefulWidget {
@@ -21,6 +25,143 @@ class _SettingsPageState extends State<SettingsPage> {
     if (settingsProvider.prefs == null) {
       settingsProvider.initializeSettings();
     }
+
+    var themeDropdown = DropdownButtonFormField(
+        decoration: const InputDecoration(labelText: 'Theme'),
+        value: settingsProvider.theme,
+        items: const [
+          DropdownMenuItem(
+            value: ThemeSettings.dark,
+            child: Text('Dark'),
+          ),
+          DropdownMenuItem(
+            value: ThemeSettings.light,
+            child: Text('Light'),
+          ),
+          DropdownMenuItem(
+            value: ThemeSettings.system,
+            child: Text('Follow System'),
+          )
+        ],
+        onChanged: (value) {
+          if (value != null) {
+            settingsProvider.theme = value;
+          }
+        });
+
+    var colourDropdown = DropdownButtonFormField(
+        decoration: const InputDecoration(labelText: 'Colour'),
+        value: settingsProvider.colour,
+        items: const [
+          DropdownMenuItem(
+            value: ColourSettings.basic,
+            child: Text('Obtainium'),
+          ),
+          DropdownMenuItem(
+            value: ColourSettings.materialYou,
+            child: Text('Material You'),
+          )
+        ],
+        onChanged: (value) {
+          if (value != null) {
+            settingsProvider.colour = value;
+          }
+        });
+
+    var sortDropdown = DropdownButtonFormField(
+        decoration: const InputDecoration(labelText: 'App Sort By'),
+        value: settingsProvider.sortColumn,
+        items: const [
+          DropdownMenuItem(
+            value: SortColumnSettings.authorName,
+            child: Text('Author/Name'),
+          ),
+          DropdownMenuItem(
+            value: SortColumnSettings.nameAuthor,
+            child: Text('Name/Author'),
+          ),
+          DropdownMenuItem(
+            value: SortColumnSettings.added,
+            child: Text('As Added'),
+          )
+        ],
+        onChanged: (value) {
+          if (value != null) {
+            settingsProvider.sortColumn = value;
+          }
+        });
+
+    var orderDropdown = DropdownButtonFormField(
+        decoration: const InputDecoration(labelText: 'App Sort Order'),
+        value: settingsProvider.sortOrder,
+        items: const [
+          DropdownMenuItem(
+            value: SortOrderSettings.ascending,
+            child: Text('Ascending'),
+          ),
+          DropdownMenuItem(
+            value: SortOrderSettings.descending,
+            child: Text('Descending'),
+          ),
+        ],
+        onChanged: (value) {
+          if (value != null) {
+            settingsProvider.sortOrder = value;
+          }
+        });
+
+    var intervalDropdown = DropdownButtonFormField(
+        decoration: const InputDecoration(
+            labelText: 'Background Update Checking Interval'),
+        value: settingsProvider.updateInterval,
+        items: updateIntervals.map((e) {
+          int displayNum = (e < 60
+                  ? e
+                  : e < 1440
+                      ? e / 60
+                      : e / 1440)
+              .round();
+          var displayUnit = (e < 60
+              ? 'Minute'
+              : e < 1440
+                  ? 'Hour'
+                  : 'Day');
+
+          String display = e == 0
+              ? 'Never - Manual Only'
+              : '$displayNum $displayUnit${displayNum == 1 ? '' : 's'}';
+          return DropdownMenuItem(value: e, child: Text(display));
+        }).toList(),
+        onChanged: (value) {
+          if (value != null) {
+            settingsProvider.updateInterval = value;
+          }
+        });
+
+    var sourceSpecificFields = 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();
+      }
+    });
+
+    const height16 = SizedBox(
+      height: 16,
+    );
+
     return Scaffold(
         backgroundColor: Theme.of(context).colorScheme.surface,
         body: CustomScrollView(slivers: <Widget>[
@@ -38,112 +179,22 @@ class _SettingsPageState extends State<SettingsPage> {
                               style: TextStyle(
                                   color: Theme.of(context).colorScheme.primary),
                             ),
-                            DropdownButtonFormField(
+                            themeDropdown,
-                                decoration:
+                            height16,
-                                    const InputDecoration(labelText: 'Theme'),
+                            colourDropdown,
-                                value: settingsProvider.theme,
+                            height16,
-                                items: const [
-                                  DropdownMenuItem(
-                                    value: ThemeSettings.dark,
-                                    child: Text('Dark'),
-                                  ),
-                                  DropdownMenuItem(
-                                    value: ThemeSettings.light,
-                                    child: Text('Light'),
-                                  ),
-                                  DropdownMenuItem(
-                                    value: ThemeSettings.system,
-                                    child: Text('Follow System'),
-                                  )
-                                ],
-                                onChanged: (value) {
-                                  if (value != null) {
-                                    settingsProvider.theme = value;
-                                  }
-                                }),
-                            const SizedBox(
-                              height: 16,
-                            ),
-                            DropdownButtonFormField(
-                                decoration:
-                                    const InputDecoration(labelText: 'Colour'),
-                                value: settingsProvider.colour,
-                                items: const [
-                                  DropdownMenuItem(
-                                    value: ColourSettings.basic,
-                                    child: Text('Obtainium'),
-                                  ),
-                                  DropdownMenuItem(
-                                    value: ColourSettings.materialYou,
-                                    child: Text('Material You'),
-                                  )
-                                ],
-                                onChanged: (value) {
-                                  if (value != null) {
-                                    settingsProvider.colour = value;
-                                  }
-                                }),
-                            const SizedBox(
-                              height: 16,
-                            ),
                             Row(
                               mainAxisAlignment: MainAxisAlignment.start,
                               crossAxisAlignment: CrossAxisAlignment.start,
                               children: [
-                                Expanded(
+                                Expanded(child: sortDropdown),
-                                    child: DropdownButtonFormField(
-                                        decoration: const InputDecoration(
-                                            labelText: 'App Sort By'),
-                                        value: settingsProvider.sortColumn,
-                                        items: const [
-                                          DropdownMenuItem(
-                                            value:
-                                                SortColumnSettings.authorName,
-                                            child: Text('Author/Name'),
-                                          ),
-                                          DropdownMenuItem(
-                                            value:
-                                                SortColumnSettings.nameAuthor,
-                                            child: Text('Name/Author'),
-                                          ),
-                                          DropdownMenuItem(
-                                            value: SortColumnSettings.added,
-                                            child: Text('As Added'),
-                                          )
-                                        ],
-                                        onChanged: (value) {
-                                          if (value != null) {
-                                            settingsProvider.sortColumn = value;
-                                          }
-                                        })),
                                 const SizedBox(
                                   width: 16,
                                 ),
-                                Expanded(
+                                Expanded(child: orderDropdown),
-                                    child: DropdownButtonFormField(
-                                        decoration: const InputDecoration(
-                                            labelText: 'App Sort Order'),
-                                        value: settingsProvider.sortOrder,
-                                        items: const [
-                                          DropdownMenuItem(
-                                            value: SortOrderSettings.ascending,
-                                            child: Text('Ascending'),
-                                          ),
-                                          DropdownMenuItem(
-                                            value: SortOrderSettings.descending,
-                                            child: Text('Descending'),
-                                          ),
-                                        ],
-                                        onChanged: (value) {
-                                          if (value != null) {
-                                            settingsProvider.sortOrder = value;
-                                          }
-                                        })),
                               ],
                             ),
-                            const SizedBox(
+                            height16,
-                              height: 16,
-                            ),
                             Row(
                               mainAxisAlignment: MainAxisAlignment.spaceBetween,
                               children: [
@@ -155,57 +206,28 @@ class _SettingsPageState extends State<SettingsPage> {
                                     })
                               ],
                             ),
+                            height16,
+                            Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              children: [
+                                const Text('Pin Updates to Top of Apps View'),
+                                Switch(
+                                    value: settingsProvider.pinUpdates,
+                                    onChanged: (value) {
+                                      settingsProvider.pinUpdates = value;
+                                    })
+                              ],
+                            ),
                             const Divider(
                               height: 16,
                             ),
-                            const SizedBox(
+                            height16,
-                              height: 16,
-                            ),
                             Text(
                               'Updates',
                               style: TextStyle(
                                   color: Theme.of(context).colorScheme.primary),
                             ),
-                            DropdownButtonFormField(
+                            intervalDropdown,
-                                decoration: const InputDecoration(
-                                    labelText:
-                                        'Background Update Checking Interval'),
-                                value: settingsProvider.updateInterval,
-                                items: updateIntervals.map((e) {
-                                  int displayNum = (e < 60
-                                          ? e
-                                          : e < 1440
-                                              ? e / 60
-                                              : e / 1440)
-                                      .round();
-                                  var displayUnit = (e < 60
-                                      ? 'Minute'
-                                      : e < 1440
-                                          ? 'Hour'
-                                          : 'Day');
-
-                                  String display = e == 0
-                                      ? 'Never - Manual Only'
-                                      : '$displayNum $displayUnit${displayNum == 1 ? '' : 's'}';
-                                  return DropdownMenuItem(
-                                      value: e, child: Text(display));
-                                }).toList(),
-                                onChanged: (value) {
-                                  if (value != null) {
-                                    settingsProvider.updateInterval = value;
-                                  }
-                                }),
-                            const SizedBox(
-                              height: 8,
-                            ),
-                            Text(
-                              'Longer intervals recommended for large App collections',
-                              style: Theme.of(context)
-                                  .textTheme
-                                  .labelMedium!
-                                  .merge(const TextStyle(
-                                      fontStyle: FontStyle.italic)),
-                            ),
                             const Divider(
                               height: 48,
                             ),
@@ -214,62 +236,63 @@ class _SettingsPageState extends State<SettingsPage> {
                               style: TextStyle(
                                   color: Theme.of(context).colorScheme.primary),
                             ),
-                            ...sourceProvider.sources.map((e) {
+                            ...sourceSpecificFields,
-                              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(
+                const Divider(
-                  height: 16,
+                  height: 32,
                 ),
-                TextButton.icon(
+                Row(
-                  style: ButtonStyle(
+                  mainAxisAlignment: MainAxisAlignment.spaceAround,
-                    foregroundColor: MaterialStateProperty.resolveWith<Color>(
+                  children: [
-                        (Set<MaterialState> states) {
+                    TextButton.icon(
-                      return Colors.grey;
+                      onPressed: () {
-                    }),
+                        launchUrlString(settingsProvider.sourceUrl,
-                  ),
+                            mode: LaunchMode.externalApplication);
-                  onPressed: () {
+                      },
-                    launchUrlString(settingsProvider.sourceUrl,
+                      icon: const Icon(Icons.code),
-                        mode: LaunchMode.externalApplication);
+                      label: const Text(
-                  },
+                        'App Source',
-                  icon: const Icon(Icons.code),
+                      ),
-                  label: Text(
+                    ),
-                    'Source',
+                    TextButton.icon(
-                    style: Theme.of(context).textTheme.bodySmall,
+                        onPressed: () {
-                  ),
+                          context.read<LogsProvider>().get().then((logs) {
-                ),
+                            if (logs.isEmpty) {
-                const SizedBox(
+                              showError(ObtainiumError('No Logs'), context);
-                  height: 16,
+                            } else {
+                              String logString =
+                                  logs.map((e) => e.toString()).join('\n\n');
+                              showDialog(
+                                  context: context,
+                                  builder: (BuildContext ctx) {
+                                    return GeneratedFormModal(
+                                      title: 'Obtainium App Logs',
+                                      items: const [],
+                                      defaultValues: const [],
+                                      message: logString,
+                                      initValid: true,
+                                    );
+                                  }).then((value) {
+                                if (value != null) {
+                                  Share.share(
+                                      logs
+                                          .map((e) => e.toString())
+                                          .join('\n\n'),
+                                      subject: 'Obtainium App Logs');
+                                }
+                              });
+                            }
+                          });
+                        },
+                        icon: const Icon(Icons.bug_report_outlined),
+                        label: const Text('App Logs')),
+                  ],
                 ),
+                height16,
               ],
             ),
           )

lib/providers/apps_provider.dart

@@ -8,9 +8,15 @@ 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:obtainium/app_sources/github.dart';
+import 'package:installed_apps/app_info.dart';
+import 'package:installed_apps/installed_apps.dart';
+import 'package:obtainium/custom_errors.dart';
+import 'package:obtainium/providers/logs_provider.dart';
 import 'package:obtainium/providers/notifications_provider.dart';
+import 'package:obtainium/providers/settings_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';
@@ -20,14 +26,15 @@ import 'package:http/http.dart';
 class AppInMemory {
   late App app;
   double? downloadProgress;
+  AppInfo? installedInfo;
 
-  AppInMemory(this.app, this.downloadProgress);
+  AppInMemory(this.app, this.downloadProgress, this.installedInfo);
 }
 
-class ApkFile {
+class DownloadedApk {
   String appId;
   File file;
-  ApkFile(this.appId, this.file);
+  DownloadedApk(this.appId, this.file);
 }
 
 class AppsProvider with ChangeNotifier {
@@ -35,66 +42,121 @@ class AppsProvider with ChangeNotifier {
   Map<String, AppInMemory> apps = {};
   bool loadingApps = false;
   bool gettingUpdates = false;
+  bool forBGTask = false;
+  LogsProvider logs = LogsProvider();
 
   // 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(
+  AppsProvider({this.forBGTask = false}) {
-      {bool shouldLoadApps = false,
+    // Many setup tasks should only be done in the foreground isolate
-      bool shouldCheckUpdatesAfterLoad = false,
+    if (!forBGTask) {
-      bool shouldDeleteAPKs = false}) {
+      // Subscribe to changes in the app foreground status
-    // Subscribe to changes in the app foreground status
+      foregroundStream = FGBGEvents.stream.asBroadcastStream();
-    foregroundStream = FGBGEvents.stream.asBroadcastStream();
+      foregroundSubscription = foregroundStream?.listen((event) async {
-    foregroundSubscription = foregroundStream.listen((event) async {
+        isForeground = event == FGBGType.foreground;
-      isForeground = event == FGBGType.foreground;
+        if (isForeground) await loadApps();
-      if (isForeground) await loadApps();
-    });
-    if (shouldDeleteAPKs) {
-      deleteSavedAPKs();
-    }
-    if (shouldLoadApps) {
-      loadApps().then((_) {
-        if (shouldCheckUpdatesAfterLoad) {
-          checkUpdates();
-        }
       });
+      () async {
+        // Load Apps into memory (in background, this is done later instead of in the constructor)
+        await loadApps();
+        // Delete existing APKs
+        (await getExternalStorageDirectory())
+            ?.listSync()
+            .where((element) =>
+                element.path.endsWith('.apk') ||
+                element.path.endsWith('.apk.part'))
+            .forEach((apk) {
+          apk.delete();
+        });
+      }();
     }
   }
 
-  Future<ApkFile> downloadApp(String apkUrl, String appId) async {
+  downloadFile(String url, String fileName, Function? onProgress,
-    apkUrl = await SourceProvider()
+      {bool useExisting = true}) async {
-        .getSource(apps[appId]!.app.url)
+    var destDir = (await getExternalStorageDirectory())!.path;
-        .apkUrlPrefetchModifier(apkUrl);
     StreamedResponse response =
-        await Client().send(Request('GET', Uri.parse(apkUrl)));
+        await Client().send(Request('GET', Uri.parse(url)));
-    File downloadFile =
+    File downloadedFile = File('$destDir/$fileName');
-        File('${(await getExternalStorageDirectory())!.path}/$appId.apk');
+    if (!(downloadedFile.existsSync() && useExisting)) {
-    if (downloadFile.existsSync()) {
+      File tempDownloadedFile = File('${downloadedFile.path}.part');
-      downloadFile.deleteSync();
+      if (tempDownloadedFile.existsSync()) {
+        tempDownloadedFile.deleteSync();
+      }
+      var length = response.contentLength;
+      var received = 0;
+      double? progress;
+      var sink = tempDownloadedFile.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) {
+        tempDownloadedFile.deleteSync();
+        throw response.reasonPhrase ?? 'Unknown Error';
+      }
+      tempDownloadedFile.renameSync(downloadedFile.path);
     }
-    var length = response.contentLength;
+    return downloadedFile;
-    var received = 0;
+  }
-    var sink = downloadFile.openWrite();
 
-    await response.stream.map((s) {
+  Future<DownloadedApk> downloadApp(App app) async {
-      received += s.length;
+    var fileName =
-      apps[appId]!.downloadProgress =
+        '${app.id}-${app.latestVersion}-${app.preferredApkIndex}.apk';
-          (length != null ? received / length * 100 : 30);
+    String downloadUrl = await SourceProvider()
-      notifyListeners();
+        .getSource(app.url)
-      return s;
+        .apkUrlPrefetchModifier(app.apkUrls[app.preferredApkIndex]);
-    }).pipe(sink);
+    int? prevProg;
-
+    File downloadedFile =
-    await sink.close();
+        await downloadFile(downloadUrl, fileName, (double? progress) {
-    apps[appId]!.downloadProgress = null;
+      int? prog = progress?.ceil();
-    notifyListeners();
+      if (apps[app.id] != null) {
-
+        apps[app.id]!.downloadProgress = progress;
-    if (response.statusCode != 200) {
+        notifyListeners();
-      downloadFile.deleteSync();
+      } else if ((prog == 25 || prog == 50 || prog == 75) && prevProg != prog) {
-      throw response.reasonPhrase ?? 'Unknown Error';
+        Fluttertoast.showToast(
+            msg: 'Progress: $prog%', toastLength: Toast.LENGTH_SHORT);
+      }
+      prevProg = prog;
+    });
+    // Delete older versions of the APK if any
+    for (var file in downloadedFile.parent.listSync()) {
+      var fn = file.path.split('/').last;
+      if (fn.startsWith('${app.id}-') &&
+          fn.endsWith('.apk') &&
+          fn != fileName) {
+        file.delete();
+      }
     }
-    return ApkFile(appId, downloadFile);
+    // If the APK package ID is different from the App ID, it is either new (using a placeholder ID) or the ID has changed
+    // The former case should be handled (give the App its real ID), the latter is a security issue
+    var newInfo = await PackageArchiveInfo.fromPath(downloadedFile.path);
+    if (app.id != newInfo.packageName) {
+      if (apps[app.id] != null && !SourceProvider().isTempId(app.id)) {
+        throw IDChangedError();
+      }
+      var originalAppId = app.id;
+      app.id = newInfo.packageName;
+      downloadedFile = downloadedFile.renameSync(
+          '${downloadedFile.parent.path}/${app.id}-${app.latestVersion}-${app.preferredApkIndex}.apk');
+      if (apps[originalAppId] != null) {
+        await removeApps([originalAppId]);
+        await saveApps([app]);
+      }
+    }
+    return DownloadedApk(app.id, downloadedFile);
   }
 
   bool areDownloadsRunning() => apps.values
@@ -102,24 +164,35 @@ class AppsProvider with ChangeNotifier {
       .isNotEmpty;
 
   Future<bool> canInstallSilently(App app) async {
-    // TODO: This is unreliable - try to get from OS in the future
+    return false;
-    var osInfo = await DeviceInfoPlugin().androidInfo;
+    // TODO: Uncomment the below once silentupdates are ever figured out
-    return app.installedVersion != null &&
+    // // TODO: This is unreliable - try to get from OS in the future
-        osInfo.version.sdkInt! >= 30 &&
+    // if (app.apkUrls.length > 1) {
-        osInfo.version.release!.compareTo('12') >= 0;
+    //    return false;
+    // }
+    // var osInfo = await DeviceInfoPlugin().androidInfo;
+    // return app.installedVersion != null &&
+    //     osInfo.version.sdkInt >= 30 &&
+    //     osInfo.version.release.compareTo('12') >= 0;
   }
 
-  Future<void> askUserToReturnToForeground(BuildContext context,
+  Future<void> waitForUserToReturnToForeground(BuildContext context) async {
-      {bool waitForFG = false}) async {
     NotificationsProvider notificationsProvider =
         context.read<NotificationsProvider>();
     if (!isForeground) {
       await notificationsProvider.notify(completeInstallationNotification,
           cancelExisting: true);
-      if (waitForFG) {
+      while (await FGBGEvents.stream.first != FGBGType.foreground) {}
-        await FGBGEvents.stream.first == FGBGType.foreground;
+      await notificationsProvider.cancel(completeInstallationNotification.id);
-        await notificationsProvider.cancel(completeInstallationNotification.id);
+    }
-      }
+  }
+
+  Future<bool> canDowngradeApps() async {
+    try {
+      await InstalledApps.getAppInfo('com.berdik.letmedowngrade');
+      return true;
+    } catch (e) {
+      return false;
     }
   }
 
@@ -127,11 +200,62 @@ class AppsProvider with ChangeNotifier {
   // 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(ApkFile file) async {
+  Future<void> installApk(DownloadedApk file) async {
-    await InstallPlugin.installApk(file.file.path, 'dev.imranr.obtainium');
+    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! &&
+        !(await canDowngradeApps())) {
+      throw DowngradeError();
+    }
+    if (appInfo == null ||
+        int.parse(newInfo.buildNumber) > appInfo.versionCode!) {
+      await InstallPlugin.installApk(file.file.path, 'dev.imranr.obtainium');
+    }
     apps[file.appId]!.app.installedVersion =
         apps[file.appId]!.app.latestVersion;
-    await saveApps([apps[file.appId]!.app]);
+    // Don't correct install status as installation may not be done yet
+    await saveApps([apps[file.appId]!.app],
+        attemptToCorrectInstallStatus: false);
+  }
+
+  Future<String?> confirmApkUrl(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];
+    // get device supported architecture
+    List<String> archs = (await DeviceInfoPlugin().androidInfo).supportedAbis;
+
+    if (app.apkUrls.length > 1 && context != null) {
+      apkUrl = await showDialog(
+          context: context,
+          builder: (BuildContext ctx) {
+            return APKPicker(
+              app: app,
+              initVal: apkUrl,
+              archs: archs,
+            );
+          });
+    }
+    // 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;
   }
 
   // Given a list of AppIds, uses stored info about the apps to download APKs and install them
@@ -139,58 +263,46 @@ class AppsProvider with ChangeNotifier {
   // 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>> downloadAndInstallLatestApp(
+  Future<List<String>> downloadAndInstallLatestApps(
       List<String> appIds, BuildContext? context) async {
-    Map<String, String> appsToInstall = {};
+    List<String> appsToInstall = [];
+    // For all specified Apps, filter out those for which:
+    // 1. A URL cannot be picked
+    // 2. That cannot be installed silently (IF no buildContext was given for interactive install)
     for (var id in appIds) {
       if (apps[id] == null) {
-        throw 'App not found';
+        throw ObtainiumError('App not found');
-      }
-
-      // If the App has more than one APK, the user should pick one (if context provided)
-      String? apkUrl = apps[id]!.app.apkUrls[apps[id]!.app.preferredApkIndex];
-      if (apps[id]!.app.apkUrls.length > 1 && context != null) {
-        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 context provided)
-      if (apkUrl != null &&
-          Uri.parse(apkUrl).origin != Uri.parse(apps[id]!.app.url).origin &&
-          context != null) {
-        if (await showDialog(
-                context: context,
-                builder: (BuildContext ctx) {
-                  return APKOriginWarningDialog(
-                      sourceUrl: apps[id]!.app.url, apkUrl: apkUrl!);
-                }) !=
-            true) {
-          apkUrl = null;
-        }
       }
+      String? apkUrl = await confirmApkUrl(apps[id]!.app, context);
       if (apkUrl != null) {
         int urlInd = apps[id]!.app.apkUrls.indexOf(apkUrl);
         if (urlInd != apps[id]!.app.preferredApkIndex) {
           apps[id]!.app.preferredApkIndex = urlInd;
           await saveApps([apps[id]!.app]);
         }
-        if (context != null ||
+        if (context != null || await canInstallSilently(apps[id]!.app)) {
-            (await canInstallSilently(apps[id]!.app) &&
+          appsToInstall.add(id);
-                apps[id]!.app.apkUrls.length == 1)) {
-          appsToInstall.putIfAbsent(id, () => apkUrl!);
         }
       }
     }
-
+    // Download APKs for all Apps to be installed
-    List<ApkFile> downloadedFiles = await Future.wait(appsToInstall.entries
+    MultiAppMultiError errors = MultiAppMultiError();
-        .map((entry) => downloadApp(entry.value, entry.key)));
+    List<DownloadedApk?> downloadedFiles =
-
+        await Future.wait(appsToInstall.map((id) async {
-    List<ApkFile> silentUpdates = [];
+      try {
-    List<ApkFile> regularInstalls = [];
+        return await downloadApp(apps[id]!.app);
+      } catch (e) {
+        errors.add(id, e.toString());
+      }
+      return null;
+    }));
+    downloadedFiles =
+        downloadedFiles.where((element) => element != null).toList();
+    // Separate the Apps to install into silent and regular lists
+    List<DownloadedApk> silentUpdates = [];
+    List<DownloadedApk> regularInstalls = [];
     for (var f in downloadedFiles) {
-      bool willBeSilent = await canInstallSilently(apps[f.appId]!.app);
+      bool willBeSilent = await canInstallSilently(apps[f!.appId]!.app);
       if (willBeSilent) {
         silentUpdates.add(f);
       } else {
@@ -198,45 +310,54 @@ class AppsProvider with ChangeNotifier {
       }
     }
 
+    // Move everything to the regular install list (since silent updates don't currently work) - TODO
+    regularInstalls.addAll(silentUpdates);
+
     // If Obtainium is being installed, it should be the last one
-    List<ApkFile> moveObtainiumToEnd(List<ApkFile> items) {
+    List<DownloadedApk> moveObtainiumToStart(List<DownloadedApk> items) {
-      String obtainiumId = 'imranr98_obtainium_${GitHub().host}';
+      DownloadedApk? temp;
-      ApkFile? temp;
       items.removeWhere((element) {
-        bool res = element.appId == obtainiumId;
+        bool res =
+            element.appId == obtainiumId || element.appId == obtainiumTempId;
         if (res) {
           temp = element;
         }
         return res;
       });
       if (temp != null) {
-        items.add(temp!);
+        items = [temp!, ...items];
       }
       return items;
     }
 
-    // TODO: Remove below line if silentupdates are ever figured out
+    silentUpdates = moveObtainiumToStart(silentUpdates);
-    regularInstalls.addAll(silentUpdates);
+    regularInstalls = moveObtainiumToStart(regularInstalls);
 
-    silentUpdates = moveObtainiumToEnd(silentUpdates);
+    // // Install silent updates (uncomment when it works - TODO)
-    regularInstalls = moveObtainiumToEnd(regularInstalls);
-
-    // 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) {
+    // Do regular installs
-      if (regularInstalls.isNotEmpty) {
+    if (regularInstalls.isNotEmpty && context != null) {
-        // ignore: use_build_context_synchronously
+      // ignore: use_build_context_synchronously
-        await askUserToReturnToForeground(context, waitForFG: true);
+      await waitForUserToReturnToForeground(context);
-      }
       for (var i in regularInstalls) {
-        await installApk(i);
+        try {
+          await installApk(i);
+        } catch (e) {
+          errors.add(i.appId, e.toString());
+        }
       }
     }
 
-    return downloadedFiles.map((e) => e.appId).toList();
+    if (errors.content.isNotEmpty) {
+      throw errors;
+    }
+
+    NotificationsProvider().cancel(UpdateNotification([]).id);
+
+    return downloadedFiles.map((e) => e!.appId).toList();
   }
 
   Future<Directory> getAppsDir() async {
@@ -248,39 +369,121 @@ class AppsProvider with ChangeNotifier {
     return appsDir;
   }
 
-  Future<void> deleteSavedAPKs() async {
+  Future<AppInfo?> getInstalledInfo(String? packageName) async {
-    (await getExternalStorageDirectory())
+    if (packageName != null) {
-        ?.listSync()
+      try {
-        .where((element) => element.path.endsWith('.apk'))
+        return await InstalledApps.getAppInfo(packageName);
-        .forEach((element) {
+      } catch (e) {
-      element.deleteSync();
+        // OK
-    });
+      }
+    }
+    return null;
+  }
+
+  // If the App says it is installed but 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)
+  // If that fails, just set it to the actual version string (all we can do at that point)
+  // Don't save changes, just return the object if changes were made (else null)
+  // If in a background isolate, return null straight away as the required plugin won't work anyways
+  App? getCorrectedInstallStatusAppIfPossible(App app, AppInfo? installedInfo) {
+    if (forBGTask) {
+      return null; // Can't correct in the background isolate
+    }
+    var modded = false;
+    if (installedInfo == null && app.installedVersion != null) {
+      app.installedVersion = null;
+      modded = true;
+    }
+    if (installedInfo != null && app.installedVersion == null) {
+      if (app.latestVersion.characters
+              .where((p0) => [
+                    '0',
+                    '1',
+                    '2',
+                    '3',
+                    '4',
+                    '5',
+                    '6',
+                    '7',
+                    '8',
+                    '9',
+                    '.'
+                  ].contains(p0))
+              .join('') ==
+          installedInfo.versionName) {
+        app.installedVersion = app.latestVersion;
+      } else {
+        app.installedVersion = installedInfo.versionName;
+      }
+      modded = true;
+    }
+    return modded ? app : null;
   }
 
   Future<void> loadApps() async {
+    while (loadingApps) {
+      await Future.delayed(const Duration(microseconds: 1));
+    }
     loadingApps = true;
     notifyListeners();
-    List<FileSystemEntity> appFiles = (await getAppsDir())
+    List<App> newApps = (await getAppsDir())
         .listSync()
         .where((item) => item.path.toLowerCase().endsWith('.json'))
+        .map((e) => App.fromJson(jsonDecode(File(e.path).readAsStringSync())))
         .toList();
-    apps.clear();
+    var idsToDelete = apps.values
-    for (int i = 0; i < appFiles.length; i++) {
+        .map((e) => e.app.id)
-      App app =
+        .toSet()
-          App.fromJson(jsonDecode(File(appFiles[i].path).readAsStringSync()));
+        .difference(newApps.map((e) => e.id).toSet());
-      apps.putIfAbsent(app.id, () => AppInMemory(app, null));
+    for (var id in idsToDelete) {
+      apps.remove(id);
+    }
+    var sp = SourceProvider();
+    List<List<String>> errors = [];
+    for (int i = 0; i < newApps.length; i++) {
+      var info = await getInstalledInfo(newApps[i].id);
+      try {
+        sp.getSource(newApps[i].url);
+        apps.putIfAbsent(
+            newApps[i].id, () => AppInMemory(newApps[i], null, info));
+      } catch (e) {
+        errors.add([newApps[i].id, newApps[i].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();
+    List<App> modifiedApps = [];
+    for (var app in apps.values) {
+      var moddedApp =
+          getCorrectedInstallStatusAppIfPossible(app.app, app.installedInfo);
+      if (moddedApp != null) {
+        modifiedApps.add(moddedApp);
+      }
+    }
+    if (modifiedApps.isNotEmpty) {
+      await saveApps(modifiedApps);
+    }
   }
 
-  Future<void> saveApps(List<App> apps) async {
+  Future<void> saveApps(List<App> apps,
+      {bool attemptToCorrectInstallStatus = true}) async {
     for (var app in apps) {
+      AppInfo? info = await getInstalledInfo(app.id);
+      app.name = info?.name ?? app.name;
+      if (attemptToCorrectInstallStatus) {
+        app = getCorrectedInstallStatusAppIfPossible(app, info) ?? app;
+      }
       File('${(await getAppsDir()).path}/${app.id}.json')
           .writeAsStringSync(jsonEncode(app.toJson()));
       this.apps.update(
-          app.id, (value) => AppInMemory(app, value.downloadProgress),
+          app.id, (value) => AppInMemory(app, value.downloadProgress, info),
-          ifAbsent: () => AppInMemory(app, null));
+          ifAbsent: () => AppInMemory(app, null, info));
     }
     notifyListeners();
   }
@@ -300,21 +503,16 @@ class AppsProvider with ChangeNotifier {
     }
   }
 
-  bool checkAppObjectForUpdate(App app) {
+  Future<App?> checkUpdate(String appId) async {
-    if (!apps.containsKey(app.id)) {
-      throw 'App not found';
-    }
-    return app.latestVersion != apps[app.id]?.app.installedVersion;
-  }
-
-  Future<App?> getUpdate(String appId) async {
     App? currentApp = apps[appId]!.app;
     SourceProvider sourceProvider = SourceProvider();
     App newApp = await sourceProvider.getApp(
         sourceProvider.getSource(currentApp.url),
         currentApp.url,
         currentApp.additionalData,
-        customName: currentApp.name);
+        name: currentApp.name,
+        id: currentApp.id,
+        pinned: currentApp.pinned);
     newApp.installedVersion = currentApp.installedVersion;
     if (currentApp.preferredApkIndex < newApp.apkUrls.length) {
       newApp.preferredApkIndex = currentApp.preferredApkIndex;
@@ -323,35 +521,51 @@ class AppsProvider with ChangeNotifier {
     return newApp.latestVersion != currentApp.latestVersion ? newApp : null;
   }
 
-  Future<List<App>> checkUpdates({DateTime? ignoreAfter}) async {
+  Future<List<App>> checkUpdates(
+      {DateTime? ignoreAppsCheckedAfter,
+      bool throwErrorsForRetry = false}) async {
     List<App> updates = [];
+    MultiAppMultiError errors = MultiAppMultiError();
     if (!gettingUpdates) {
       gettingUpdates = true;
-
+      try {
-      List<String> appIds = apps.keys.toList();
+        List<String> appIds = apps.values
-      if (ignoreAfter != null) {
+            .where((app) =>
-        appIds = appIds
+                app.app.lastUpdateCheck == null ||
-            .where((id) =>
+                ignoreAppsCheckedAfter == null ||
-                apps[id]!.app.lastUpdateCheck == null ||
+                app.app.lastUpdateCheck!.isBefore(ignoreAppsCheckedAfter))
-                apps[id]!.app.lastUpdateCheck!.isBefore(ignoreAfter))
+            .map((e) => e.app.id)
             .toList();
-      }
+        appIds.sort((a, b) => (apps[a]!.app.lastUpdateCheck ??
-      appIds.sort((a, b) => (apps[a]!.app.lastUpdateCheck ??
+                DateTime.fromMicrosecondsSinceEpoch(0))
-              DateTime.fromMicrosecondsSinceEpoch(0))
+            .compareTo(apps[b]!.app.lastUpdateCheck ??
-          .compareTo(apps[b]!.app.lastUpdateCheck ??
+                DateTime.fromMicrosecondsSinceEpoch(0)));
-              DateTime.fromMicrosecondsSinceEpoch(0)));
+        for (int i = 0; i < appIds.length; i++) {
-      for (int i = 0; i < appIds.length; i++) {
+          App? newApp;
-        App? newApp = await getUpdate(appIds[i]);
+          try {
-        if (newApp != null) {
+            newApp = await checkUpdate(appIds[i]);
-          updates.add(newApp);
+          } catch (e) {
+            if ((e is RateLimitError || e is SocketException) &&
+                throwErrorsForRetry) {
+              rethrow;
+            }
+            errors.add(appIds[i], e.toString());
+          }
+          if (newApp != null) {
+            updates.add(newApp);
+          }
         }
+      } finally {
+        gettingUpdates = false;
       }
-      gettingUpdates = false;
+    }
+    if (errors.content.isNotEmpty) {
+      throw errors;
     }
     return updates;
   }
 
-  List<String> getExistingUpdates(
+  List<String> findExistingUpdates(
       {bool installedOnly = false, bool nonInstalledOnly = false}) {
     List<String> updateAppIds = [];
     List<String> appIds = apps.keys.toList();
@@ -385,13 +599,16 @@ class AppsProvider with ChangeNotifier {
   }
 
   Future<int> importApps(String appsJSON) async {
-    // File picker does not work in android 13, so the user must paste the JSON directly into Obtainium to import Apps
     List<App> importedApps = (jsonDecode(appsJSON) as List<dynamic>)
         .map((e) => App.fromJson(e))
         .toList();
+    while (loadingApps) {
+      await Future.delayed(const Duration(microseconds: 1));
+    }
     for (App a in importedApps) {
-      a.installedVersion =
+      if (apps[a.id]?.app.installedVersion != null) {
-          apps.containsKey(a.id) ? apps[a]?.app.installedVersion : null;
+        a.installedVersion = apps[a.id]?.app.installedVersion;
+      }
     }
     await saveApps(importedApps);
     notifyListeners();
@@ -400,16 +617,17 @@ class AppsProvider with ChangeNotifier {
 
   @override
   void dispose() {
-    foregroundSubscription.cancel();
+    foregroundSubscription?.cancel();
     super.dispose();
   }
 }
 
 class APKPicker extends StatefulWidget {
-  const APKPicker({super.key, required this.app, this.initVal});
+  const APKPicker({super.key, required this.app, this.initVal, this.archs});
 
   final App app;
   final String? initVal;
+  final List<String>? archs;
 
   @override
   State<APKPicker> createState() => _APKPickerState();
@@ -427,18 +645,29 @@ class _APKPickerState extends State<APKPicker> {
       content: Column(children: [
         Text('${widget.app.name} has more than one package:'),
         const SizedBox(height: 16),
-        ...widget.app.apkUrls.map((u) => RadioListTile<String>(
+        ...widget.app.apkUrls.map(
-            title: Text(Uri.parse(u)
+          (u) => RadioListTile<String>(
-                .pathSegments
+              title: Text(Uri.parse(u)
-                .where((element) => element.isNotEmpty)
+                  .pathSegments
-                .last),
+                  .where((element) => element.isNotEmpty)
-            value: u,
+                  .last),
-            groupValue: apkUrl,
+              value: u,
-            onChanged: (String? val) {
+              groupValue: apkUrl,
-              setState(() {
+              onChanged: (String? val) {
-                apkUrl = val;
+                setState(() {
-              });
+                  apkUrl = val;
-            }))
+                });
+              }),
+        ),
+        if (widget.archs != null)
+          const SizedBox(
+            height: 16,
+          ),
+        if (widget.archs != null)
+          Text(
+            'Note:\nYour device supports the ${widget.archs!.length == 1 ? '\'${widget.archs![0]}\' CPU architecture.' : 'following CPU architectures: ${list2FriendlyString(widget.archs!.map((e) => '\'$e\'').toList())}.'}',
+            style: const TextStyle(fontStyle: FontStyle.italic, fontSize: 12),
+          ),
       ]),
       actions: [
         TextButton(

lib/providers/logs_provider.dart

@@ -0,0 +1,109 @@
+import 'package:flutter/foundation.dart';
+import 'package:sqflite/sqflite.dart';
+
+const String logTable = 'logs';
+const String idColumn = '_id';
+const String levelColumn = 'level';
+const String messageColumn = 'message';
+const String timestampColumn = 'timestamp';
+const String dbPath = 'logs.db';
+
+enum LogLevels { debug, info, warning, error }
+
+class Log {
+  int? id;
+  late LogLevels level;
+  late String message;
+  DateTime timestamp = DateTime.now();
+
+  Map<String, Object?> toMap() {
+    var map = <String, Object?>{
+      idColumn: id,
+      levelColumn: level.index,
+      messageColumn: message,
+      timestampColumn: timestamp.millisecondsSinceEpoch
+    };
+    return map;
+  }
+
+  Log(this.message, this.level);
+
+  Log.fromMap(Map<String, Object?> map) {
+    id = map[idColumn] as int;
+    level = LogLevels.values.elementAt(map[levelColumn] as int);
+    message = map[messageColumn] as String;
+    timestamp =
+        DateTime.fromMillisecondsSinceEpoch(map[timestampColumn] as int);
+  }
+
+  @override
+  String toString() {
+    return '${timestamp.toString()}: ${level.name}: $message';
+  }
+}
+
+class LogsProvider {
+  LogsProvider({bool runDefaultClear = true}) {
+    clear(before: DateTime.now().subtract(const Duration(days: 7)));
+  }
+
+  Database? db;
+
+  Future<Database> getDB() async {
+    db ??= await openDatabase(dbPath, version: 1,
+        onCreate: (Database db, int version) async {
+      await db.execute('''
+create table if not exists $logTable ( 
+  $idColumn integer primary key autoincrement, 
+  $levelColumn integer not null,
+  $messageColumn text not null,
+  $timestampColumn integer not null)
+''');
+    });
+    return db!;
+  }
+
+  Future<Log> add(String message, {LogLevels level = LogLevels.info}) async {
+    Log l = Log(message, level);
+    l.id = await (await getDB()).insert(logTable, l.toMap());
+    if (kDebugMode) {
+      print(l);
+    }
+    return l;
+  }
+
+  Future<List<Log>> get({DateTime? before, DateTime? after}) async {
+    var where = getWhereDates(before: before, after: after);
+    return (await (await getDB())
+            .query(logTable, where: where.key, whereArgs: where.value))
+        .map((e) => Log.fromMap(e))
+        .toList();
+  }
+
+  Future<int> clear({DateTime? before, DateTime? after}) async {
+    var where = getWhereDates(before: before, after: after);
+    var res = await (await getDB())
+        .delete(logTable, where: where.key, whereArgs: where.value);
+    if (res > 0) {
+      add('Cleared $res logs (before = $before, after = $after)');
+    }
+    return res;
+  }
+}
+
+MapEntry<String?, List<int>?> getWhereDates(
+    {DateTime? before, DateTime? after}) {
+  List<String> where = [];
+  List<int> whereArgs = [];
+  if (before != null) {
+    where.add('$timestampColumn < ?');
+    whereArgs.add(before.millisecondsSinceEpoch);
+  }
+  if (after != null) {
+    where.add('$timestampColumn > ?');
+    whereArgs.add(after.millisecondsSinceEpoch);
+  }
+  return whereArgs.isEmpty
+      ? const MapEntry(null, null)
+      : MapEntry(where.join(' and '), whereArgs);
+}

lib/providers/notifications_provider.dart

@@ -27,9 +27,11 @@ class UpdateNotification extends ObtainiumNotification {
             'Updates Available',
             'Notifies the user that updates are available for one or more Apps tracked by Obtainium',
             Importance.max) {
-    message = updates.length == 1
+    message = updates.isEmpty
-        ? '${updates[0].name} has an update.'
+        ? "No new updates."
-        : '${(updates.length == 2 ? '${updates[0].name} and ${updates[1].name}' : '${updates[0].name} and ${updates.length - 1} more apps')} have updates.';
+        : updates.length == 1
+            ? '${updates[0].name} has an update.'
+            : '${(updates.length == 2 ? '${updates[0].name} and ${updates[1].name}' : '${updates[0].name} and ${updates.length - 1} more apps')} have updates.';
   }
 }
 
@@ -61,6 +63,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

@@ -2,9 +2,13 @@
 
 import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
+import 'package:obtainium/app_sources/github.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
+String obtainiumTempId = 'imranr98_obtainium_${GitHub().host}';
+String obtainiumId = 'dev.imranr.obtainium';
+
 enum ThemeSettings { system, light, dark }
 
 enum ColourSettings { basic, materialYou }
@@ -55,7 +59,7 @@ class SettingsProvider with ChangeNotifier {
   }
 
   int get updateInterval {
-    var min = prefs?.getInt('updateInterval') ?? 180;
+    var min = prefs?.getInt('updateInterval') ?? 360;
     if (!updateIntervals.contains(min)) {
       var temp = updateIntervals[0];
       for (var i in updateIntervals) {
@@ -123,6 +127,15 @@ class SettingsProvider with ChangeNotifier {
     notifyListeners();
   }
 
+  bool get pinUpdates {
+    return prefs?.getBool('pinUpdates') ?? true;
+  }
+
+  set pinUpdates(bool show) {
+    prefs?.setBool('pinUpdates', show);
+    notifyListeners();
+  }
+
   String? getSettingString(String settingId) {
     return prefs?.getString(settingId);
   }

lib/providers/source_provider.dart

@@ -4,7 +4,7 @@
 import 'dart:convert';
 
 import 'package:html/dom.dart';
-import 'package:obtainium/app_sources/apkmirror.dart';
+import 'package:http/http.dart';
 import 'package:obtainium/app_sources/fdroid.dart';
 import 'package:obtainium/app_sources/github.dart';
 import 'package:obtainium/app_sources/gitlab.dart';
@@ -13,6 +13,7 @@ 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/custom_errors.dart';
 import 'package:obtainium/mass_app_sources/githubstars.dart';
 
 class AppNames {
@@ -40,6 +41,7 @@ class App {
   late int preferredApkIndex;
   late List<String> additionalData;
   late DateTime? lastUpdateCheck;
+  bool pinned = false;
   App(
       this.id,
       this.url,
@@ -50,11 +52,12 @@ class App {
       this.apkUrls,
       this.preferredApkIndex,
       this.additionalData,
-      this.lastUpdateCheck);
+      this.lastUpdateCheck,
+      this.pinned);
 
   @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()} PINNED $pinned';
   }
 
   factory App.fromJson(Map<String, dynamic> json) => App(
@@ -75,7 +78,8 @@ class App {
           : List<String>.from(jsonDecode(json['additionalData'])),
       json['lastUpdateCheck'] == null
           ? null
-          : DateTime.fromMicrosecondsSinceEpoch(json['lastUpdateCheck']));
+          : DateTime.fromMicrosecondsSinceEpoch(json['lastUpdateCheck']),
+      json['pinned'] ?? false);
 
   Map<String, dynamic> toJson() => {
         'id': id,
@@ -87,16 +91,12 @@ class App {
         'apkUrls': jsonEncode(apkUrls),
         'preferredApkIndex': preferredApkIndex,
         'additionalData': jsonEncode(additionalData),
-        'lastUpdateCheck': lastUpdateCheck?.microsecondsSinceEpoch
+        'lastUpdateCheck': lastUpdateCheck?.microsecondsSinceEpoch,
+        'pinned': pinned
       };
 }
 
-escapeRegEx(String s) {
+// Ensure the input is starts with HTTPS and has no WWW
-  return s.replaceAllMapped(RegExp(r'[.*+?^${}()|[\]\\]'), (x) {
-    return '\\${x[0]}';
-  });
-}
-
 preStandardizeUrl(String url) {
   if (url.toLowerCase().indexOf('http://') != 0 &&
       url.toLowerCase().indexOf('https://') != 0) {
@@ -105,6 +105,11 @@ preStandardizeUrl(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,23 +133,51 @@ List<String> getLinksFromParsedHTML(
         .map((e) => '$prependToLinks${e.attributes['href']!}')
         .toList();
 
-abstract class AppSource {
+class AppSource {
   late String host;
-  String standardizeURL(String url);
+  String standardizeURL(String url) {
+    throw NotImplementedError();
+  }
+
   Future<APKDetails> getLatestAPKDetails(
-      String standardUrl, List<String> additionalData);
+      String standardUrl, List<String> additionalData) {
-  AppNames getAppNames(String standardUrl);
+    throw NotImplementedError();
-  late List<List<GeneratedFormItem>> additionalDataFormItems;
+  }
-  late List<String> additionalDataDefaults;
+
-  late List<GeneratedFormItem> moreSourceSettingsFormItems;
+  AppNames getAppNames(String standardUrl) {
-  String? changeLogPageFromStandardUrl(String standardUrl);
+    throw NotImplementedError();
-  Future<String> apkUrlPrefetchModifier(String apkUrl);
+  }
+
+  List<List<GeneratedFormItem>> additionalDataFormItems = [];
+  List<String> additionalDataDefaults = [];
+  List<GeneratedFormItem> moreSourceSettingsFormItems = [];
+  String? changeLogPageFromStandardUrl(String standardUrl) {
+    throw NotImplementedError();
+  }
+
+  Future<String> apkUrlPrefetchModifier(String apkUrl) async {
+    return apkUrl;
+  }
+
+  bool canSearch = false;
+  Future<Map<String, String>> search(String query) {
+    throw NotImplementedError();
+  }
+
+  String? tryInferringAppId(String standardUrl) {
+    return null;
+  }
 }
 
-abstract class MassAppSource {
+ObtainiumError getObtainiumHttpError(Response res) {
+  return ObtainiumError(
+      res.reasonPhrase ?? 'Error ${res.statusCode.toString()}');
+}
+
+abstract class MassAppUrlSource {
   late String name;
   late List<String> requiredArgs;
-  Future<List<String>> getUrls(List<String> args);
+  Future<Map<String, String>> getUrlsWithDescriptions(List<String> args);
 }
 
 class SourceProvider {
@@ -156,12 +189,11 @@ class SourceProvider {
     IzzyOnDroid(),
     Mullvad(),
     Signal(),
-    SourceForge(),
+    SourceForge()
-    APKMirror()
   ];
 
-  // Add more mass source classes here so they are available via the service
+  // Add more mass url source classes here so they are available via the service
-  List<MassAppSource> massSources = [GitHubStars()];
+  List<MassAppUrlSource> massUrlSources = [GitHubStars()];
 
   AppSource getSource(String url) {
     url = preStandardizeUrl(url);
@@ -173,12 +205,12 @@ class SourceProvider {
       }
     }
     if (source == null) {
-      throw 'URL does not match a known source';
+      throw UnsupportedURLError();
     }
     return source;
   }
 
-  bool doesSourceHaveRequiredAdditionalData(AppSource source) {
+  bool ifSourceAppsRequireAdditionalData(AppSource source) {
     for (var row in source.additionalDataFormItems) {
       for (var element in row) {
         if (element.required) {
@@ -189,29 +221,47 @@ class SourceProvider {
     return false;
   }
 
+  String generateTempID(AppNames names, AppSource source) =>
+      '${names.author.toLowerCase()}_${names.name.toLowerCase()}_${source.host}';
+
+  bool isTempId(String id) {
+    List<String> parts = id.split('_');
+    if (parts.length < 3) {
+      return false;
+    }
+    for (int i = 0; i < parts.length - 1; i++) {
+      if (RegExp('.*[A-Z].*').hasMatch(parts[i])) {
+        return false;
+      }
+    }
+    return getSourceHosts().contains(parts.last);
+  }
+
   Future<App> getApp(AppSource source, String url, List<String> additionalData,
-      {String customName = ''}) async {
+      {String name = '', String? id, bool pinned = false}) 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 ??
+            source.tryInferringAppId(standardUrl) ??
+            generateTempID(names, source),
         standardUrl,
         names.author[0].toUpperCase() + names.author.substring(1),
-        customName.trim().isNotEmpty
+        name.trim().isNotEmpty
-            ? customName
+            ? name
             : names.name[0].toUpperCase() + names.name.substring(1),
         null,
-        apk.version,
+        apk.version.replaceAll('/', '-'),
         apk.apkUrls,
         apk.apkUrls.length - 1,
         additionalData,
-        DateTime.now());
+        DateTime.now(),
+        pinned);
   }
 
-  /// Returns a length 2 list, where the first element is a list of Apps and
+  // Returns errors in [results, errors] instead of throwing them
-  /// the second is a Map<String, dynamic> of URLs and errors
   Future<List<dynamic>> getApps(List<String> urls,
       {List<String> ignoreUrls = const []}) async {
     List<App> apps = [];

pubspec.lock

@@ -1,6 +1,13 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
+  android_alarm_manager_plus:
+    dependency: "direct main"
+    description:
+      name: android_alarm_manager_plus
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.0"
   animations:
     dependency: "direct main"
     description:
@@ -14,7 +21,7 @@ packages:
       name: archive
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.3.1"
+    version: "3.3.4"
   args:
     dependency: transitive
     description:
@@ -71,6 +78,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.16.0"
+  convert:
+    dependency: transitive
+    description:
+      name: convert
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.1.1"
   cross_file:
     dependency: transitive
     description:
@@ -112,42 +126,14 @@ packages:
       name: device_info_plus
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "5.0.5"
+    version: "8.0.0"
-  device_info_plus_linux:
-    dependency: transitive
-    description:
-      name: device_info_plus_linux
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "4.0.2"
-  device_info_plus_macos:
-    dependency: transitive
-    description:
-      name: device_info_plus_macos
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "4.0.2"
   device_info_plus_platform_interface:
     dependency: transitive
     description:
       name: device_info_plus_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.0.1"
+    version: "7.0.0"
-  device_info_plus_web:
-    dependency: transitive
-    description:
-      name: device_info_plus_web
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "4.0.2"
-  device_info_plus_windows:
-    dependency: transitive
-    description:
-      name: device_info_plus_windows
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "5.0.2"
   dynamic_color:
     dependency: "direct main"
     description:
@@ -182,7 +168,7 @@ packages:
       name: file_picker
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "5.2.0+1"
+    version: "5.2.2"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -194,7 +180,7 @@ packages:
       name: flutter_fgbg
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.0"
+    version: "0.2.1"
   flutter_launcher_icons:
     dependency: "direct dev"
     description:
@@ -215,14 +201,14 @@ packages:
       name: flutter_local_notifications
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "12.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:
@@ -253,14 +239,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:
@@ -274,14 +260,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:
@@ -289,6 +275,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:
@@ -309,7 +302,7 @@ packages:
       name: lints
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "2.0.1"
   matcher:
     dependency: transitive
     description:
@@ -323,7 +316,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:
@@ -345,6 +338,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:
@@ -365,7 +372,7 @@ packages:
       name: path_provider_android
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.20"
+    version: "2.0.21"
   path_provider_ios:
     dependency: transitive
     description:
@@ -407,21 +414,21 @@ packages:
       name: permission_handler
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "10.1.0"
+    version: "10.2.0"
   permission_handler_android:
     dependency: transitive
     description:
       name: permission_handler_android
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "10.1.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.6"
+    version: "9.0.7"
   permission_handler_platform_interface:
     dependency: transitive
     description:
@@ -435,14 +442,14 @@ packages:
       name: permission_handler_windows
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.1"
+    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:
@@ -457,6 +464,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.3"
+  pointycastle:
+    dependency: transitive
+    description:
+      name: pointycastle
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.6.2"
   process:
     dependency: transitive
     description:
@@ -470,49 +484,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: "4.5.3"
+    version: "6.2.0"
-  share_plus_linux:
-    dependency: transitive
-    description:
-      name: share_plus_linux
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.0.0"
-  share_plus_macos:
-    dependency: transitive
-    description:
-      name: share_plus_macos
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.0.1"
   share_plus_platform_interface:
     dependency: transitive
     description:
       name: share_plus_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.1.1"
+    version: "3.2.0"
-  share_plus_web:
-    dependency: transitive
-    description:
-      name: share_plus_web
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.1.0"
-  share_plus_windows:
-    dependency: transitive
-    description:
-      name: share_plus_windows
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.0.1"
   shared_preferences:
     dependency: "direct main"
     description:
@@ -526,7 +512,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:
@@ -580,7 +566,21 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.9.1"
+    version: "1.9.0"
+  sqflite:
+    dependency: "direct main"
+    description:
+      name: sqflite
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.2.0+3"
+  sqflite_common:
+    dependency: transitive
+    description:
+      name: sqflite_common
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.4.0+2"
   stack_trace:
     dependency: transitive
     description:
@@ -594,7 +594,7 @@ packages:
       name: stream_channel
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.0"
   string_scanner:
     dependency: transitive
     description:
@@ -602,6 +602,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.1"
+  synchronized:
+    dependency: transitive
+    description:
+      name: synchronized
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.0.0+3"
   term_glyph:
     dependency: transitive
     description:
@@ -615,7 +622,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.14"
+    version: "0.4.12"
   timezone:
     dependency: transitive
     description:
@@ -643,7 +650,7 @@ packages:
       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:
@@ -686,13 +693,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.4"
+    version: "2.1.2"
   webview_flutter:
     dependency: "direct main"
     description:
@@ -727,14 +741,7 @@ packages:
       name: win32
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.0"
+    version: "3.1.1"
-  workmanager:
-    dependency: "direct main"
-    description:
-      name: workmanager
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.5.0"
   xdg_directories:
     dependency: transitive
     description:
@@ -757,5 +764,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.5.8+29 # When changing this, update the tag in main() accordingly
+version: 0.7.4+60 # 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
@@ -42,18 +42,21 @@ dependencies:
   provider: ^6.0.3
   http: ^0.13.5
   webview_flutter: ^3.0.4
-  workmanager: ^0.5.0
   dynamic_color: ^1.5.4
   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: ^5.0.5
+  device_info_plus: ^8.0.0
   file_picker: ^5.1.0
   animations: ^2.0.4
   install_plugin_v2: ^1.0.0
-  share_plus: ^4.4.0
+  share_plus: ^6.0.1
+  installed_apps: ^1.3.1
+  package_archive_info: ^0.1.0
+  android_alarm_manager_plus: ^2.1.0
+  sqflite: ^2.2.0+3
 
 
 dev_dependencies: