Fixed 2 issues:

- Rate-limit regression in previous release
- Update notifications not sent when >1 apps have errors

README.md

@@ -13,6 +13,7 @@ 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,16 +30,6 @@
         <meta-data
             android:name="flutterEmbedding"
             android:value="2" />
-        <provider
-            android:name="androidx.core.content.FileProvider"
-            android:authorities="${applicationId}.fileProvider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/file_paths" />
-        </provider>
-
     </application>
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />

lib/app_sources/apkmirror.dart

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

lib/app_sources/fdroid.dart

@@ -23,6 +23,12 @@ class FDroid implements AppSource {
     return url.substring(0, match.end);
   }
 
+  @override
+  String? changeLogPageFromStandardUrl(String standardUrl) => null;
+
+  @override
+  Future<String> apkUrlPrefetchModifier(String apkUrl) async => apkUrl;
+
   @override
   Future<APKDetails> getLatestAPKDetails(
       String standardUrl, List<String> additionalData) async {

lib/app_sources/github.dart

@@ -1,9 +1,11 @@
 import 'dart:convert';
+import 'package:flutter/material.dart';
 import 'package:http/http.dart';
 import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/providers/settings_provider.dart';
 import 'package:obtainium/providers/source_provider.dart';
+import 'package:url_launcher/url_launcher_string.dart';
 
 class GitHub implements AppSource {
   @override
@@ -27,6 +29,13 @@ class GitHub implements AppSource {
     return creds != null && creds.isNotEmpty ? '$creds@' : '';
   }
 
+  @override
+  String? changeLogPageFromStandardUrl(String standardUrl) =>
+      '$standardUrl/releases';
+
+  @override
+  Future<String> apkUrlPrefetchModifier(String apkUrl) async => apkUrl;
+
   @override
   Future<APKDetails> getLatestAPKDetails(
       String standardUrl, List<String> additionalData) async {
@@ -137,7 +146,7 @@ class GitHub implements AppSource {
   @override
   List<GeneratedFormItem> moreSourceSettingsFormItems = [
     GeneratedFormItem(
-        label: 'GitHub Credentials (Increases Rate Limit)',
+        label: 'GitHub Personal Access Token (Increases Rate Limit)',
         id: 'github-creds',
         required: false,
         additionalValidators: [
@@ -153,6 +162,23 @@ class GitHub implements AppSource {
             }
             return null;
           }
+        ],
+        hint: 'username:token',
+        belowWidgets: [
+          const SizedBox(
+            height: 8,
+          ),
+          GestureDetector(
+              onTap: () {
+                launchUrlString(
+                    'https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token',
+                    mode: LaunchMode.externalApplication);
+              },
+              child: const Text(
+                'About GitHub PATs',
+                style: TextStyle(
+                    decoration: TextDecoration.underline, fontSize: 12),
+              ))
         ])
   ];
 }

lib/app_sources/gitlab.dart

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

lib/app_sources/izzyondroid.dart

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

lib/app_sources/mullvad.dart

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

lib/app_sources/signal.dart

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

lib/app_sources/sourceforge.dart

@@ -17,6 +17,12 @@ class SourceForge implements AppSource {
     return url.substring(0, match.end);
   }
 
+  @override
+  String? changeLogPageFromStandardUrl(String standardUrl) => null;
+
+  @override
+  Future<String> apkUrlPrefetchModifier(String apkUrl) async => apkUrl;
+
   @override
   Future<APKDetails> getLatestAPKDetails(
       String standardUrl, List<String> additionalData) async {

lib/components/generated_form.dart

@@ -11,6 +11,8 @@ class GeneratedFormItem {
   late int max;
   late List<String? Function(String? value)> additionalValidators;
   late String id;
+  late List<Widget> belowWidgets;
+  late String? hint;
 
   GeneratedFormItem(
       {this.label = 'Input',
@@ -18,7 +20,9 @@ class GeneratedFormItem {
       this.required = true,
       this.max = 1,
       this.additionalValidators = const [],
-      this.id = 'input'});
+      this.id = 'input',
+      this.belowWidgets = const [],
+      this.hint});
 }
 
 class GeneratedForm extends StatefulWidget {
@@ -91,7 +95,8 @@ class _GeneratedFormState extends State<GeneratedForm> {
               });
             },
             decoration: InputDecoration(
-                helperText: e.value.label + (e.value.required ? ' *' : '')),
+                helperText: e.value.label + (e.value.required ? ' *' : ''),
+                hintText: e.value.hint),
             minLines: e.value.max <= 1 ? null : e.value.max,
             maxLines: e.value.max <= 1 ? 1 : e.value.max,
             validator: (value) {
@@ -157,7 +162,13 @@ class _GeneratedFormState extends State<GeneratedForm> {
             width: 20,
           ));
         }
-        rowItems.add(Expanded(child: rowInput.value));
+        rowItems.add(Expanded(
+            child: Column(
+                crossAxisAlignment: CrossAxisAlignment.stretch,
+                children: [
+              rowInput.value,
+              ...widget.items[rowInputs.key][rowInput.key].belowWidgets
+            ])));
       });
       rows.add(rowItems);
     });

lib/main.dart

@@ -14,7 +14,7 @@ import 'package:dynamic_color/dynamic_color.dart';
 import 'package:device_info_plus/device_info_plus.dart';
 
 const String currentReleaseTag =
-    'v0.5.0-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES
+    'v0.5.10-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES
 
 const String bgUpdateCheckTaskName = 'bg-update-check';
 
@@ -28,16 +28,15 @@ bgUpdateCheck(int? ignoreAfterMicroseconds) async {
     var appsProvider = AppsProvider();
     await notificationsProvider.cancel(ErrorCheckingUpdatesNotification('').id);
     await appsProvider.loadApps();
-    // List<String> existingUpdateIds = // TODO: Uncomment this and below when it works
-    //     appsProvider.getExistingUpdates(installedOnly: true);
     List<String> existingUpdateIds =
         appsProvider.getExistingUpdates(installedOnly: true);
     DateTime nextIgnoreAfter = DateTime.now();
+    String? err;
     try {
-      await appsProvider.checkUpdates(ignoreAfter: ignoreAfter);
+      await appsProvider.checkUpdates(
+          ignoreAfter: ignoreAfter, immediatelyThrowRateLimitError: true);
     } catch (e) {
       if (e is RateLimitError) {
-        // Ignore these (scheduling another task as below does not work)
         String nextTaskName =
             '$bgUpdateCheckTaskName-${nextIgnoreAfter.microsecondsSinceEpoch.toString()}';
         Workmanager().registerOneOffTask(nextTaskName, nextTaskName,
@@ -45,7 +44,7 @@ bgUpdateCheck(int? ignoreAfterMicroseconds) async {
             initialDelay: Duration(minutes: e.remainingMinutes),
             inputData: {'ignoreAfter': nextIgnoreAfter.microsecondsSinceEpoch});
       } else {
-        rethrow;
+        err = e.toString();
       }
     }
     List<App> newUpdates = appsProvider
@@ -53,11 +52,13 @@ bgUpdateCheck(int? ignoreAfterMicroseconds) async {
         .where((id) => !existingUpdateIds.contains(id))
         .map((e) => appsProvider.apps[e]!.app)
         .toList();
+
+    // TODO: This silent update code doesn't work yet
     // List<String> silentlyUpdated = await appsProvider
     //     .downloadAndInstallLatestApp(
     //         [...newUpdates.map((e) => e.id), ...existingUpdateIds], null);
     // if (silentlyUpdated.isNotEmpty) {
-    //   newUpdates
+    //   newUpdates = newUpdates
     //       .where((element) => !silentlyUpdated.contains(element.id))
     //       .toList();
     //   notificationsProvider.notify(
@@ -65,10 +66,14 @@ bgUpdateCheck(int? ignoreAfterMicroseconds) async {
     //           silentlyUpdated.map((e) => appsProvider.apps[e]!.app).toList()),
     //       cancelExisting: true);
     // }
+
     if (newUpdates.isNotEmpty) {
       notificationsProvider.notify(UpdateNotification(newUpdates),
           cancelExisting: true);
     }
+    if (err != null) {
+      throw err;
+    }
     return Future.value(true);
   } catch (e) {
     notificationsProvider.notify(ErrorCheckingUpdatesNotification(e.toString()),
@@ -108,14 +113,21 @@ void main() async {
       ChangeNotifierProvider(create: (context) => SettingsProvider()),
       Provider(create: (context) => NotificationsProvider())
     ],
-    child: const MyApp(),
+    child: const Obtainium(),
   ));
 }
 
 var defaultThemeColour = Colors.deepPurple;
 
-class MyApp extends StatelessWidget {
-  const MyApp({super.key});
+class Obtainium extends StatefulWidget {
+  const Obtainium({super.key});
+
+  @override
+  State<Obtainium> createState() => _ObtainiumState();
+}
+
+class _ObtainiumState extends State<Obtainium> {
+  var existingUpdateInterval = -1;
 
   @override
   Widget build(BuildContext context) {
@@ -144,18 +156,21 @@ class MyApp extends StatelessWidget {
         ]);
       }
       // Register the background update task according to the user's setting
-      if (settingsProvider.updateInterval == 0) {
-        Workmanager().cancelByUniqueName(bgUpdateCheckTaskName);
-      } else {
-        Workmanager().registerPeriodicTask(
-            bgUpdateCheckTaskName, bgUpdateCheckTaskName,
-            frequency: Duration(minutes: settingsProvider.updateInterval),
-            initialDelay: Duration(minutes: settingsProvider.updateInterval),
-            constraints: Constraints(networkType: NetworkType.connected),
-            existingWorkPolicy: ExistingWorkPolicy.keep,
-            backoffPolicy: BackoffPolicy.linear,
-            backoffPolicyDelay:
-                const Duration(minutes: minUpdateIntervalMinutes));
+      if (existingUpdateInterval != settingsProvider.updateInterval) {
+        existingUpdateInterval = settingsProvider.updateInterval;
+        if (existingUpdateInterval == 0) {
+          Workmanager().cancelByUniqueName(bgUpdateCheckTaskName);
+        } else {
+          Workmanager().registerPeriodicTask(
+              bgUpdateCheckTaskName, bgUpdateCheckTaskName,
+              frequency: Duration(minutes: existingUpdateInterval),
+              initialDelay: Duration(minutes: existingUpdateInterval),
+              constraints: Constraints(networkType: NetworkType.connected),
+              existingWorkPolicy: ExistingWorkPolicy.replace,
+              backoffPolicy: BackoffPolicy.linear,
+              backoffPolicyDelay:
+                  const Duration(minutes: minUpdateIntervalMinutes));
+        }
       }
     }
 

lib/pages/app.dart

@@ -19,20 +19,27 @@ class AppPage extends StatefulWidget {
 }
 
 class _AppPageState extends State<AppPage> {
+  AppInMemory? prevApp;
+
   @override
   Widget build(BuildContext context) {
     var appsProvider = context.watch<AppsProvider>();
     var settingsProvider = context.watch<SettingsProvider>();
-    var sourceProvider = SourceProvider();
-    AppInMemory? app = appsProvider.apps[widget.appId];
-    var source = app != null ? sourceProvider.getSource(app.app.url) : null;
-    if (!appsProvider.areDownloadsRunning() && app != null) {
-      appsProvider.getUpdate(app.app.id).catchError((e) {
+    getUpdate(String id) {
+      appsProvider.getUpdate(id).catchError((e) {
         ScaffoldMessenger.of(context).showSnackBar(
           SnackBar(content: Text(e.toString())),
         );
       });
     }
+
+    var sourceProvider = SourceProvider();
+    AppInMemory? app = appsProvider.apps[widget.appId];
+    var source = app != null ? sourceProvider.getSource(app.app.url) : null;
+    if (!appsProvider.areDownloadsRunning() && prevApp == null && app != null) {
+      prevApp = app;
+      getUpdate(app.app.id);
+    }
     return Scaffold(
       appBar: settingsProvider.showAppWebpage ? AppBar() : null,
       backgroundColor: Theme.of(context).colorScheme.surface,
@@ -105,13 +112,7 @@ class _AppPageState extends State<AppPage> {
                 ),
           onRefresh: () async {
             if (app != null) {
-              try {
-                await appsProvider.getUpdate(app.app.id);
-              } catch (e) {
-                ScaffoldMessenger.of(context).showSnackBar(
-                  SnackBar(content: Text(e.toString())),
-                );
-              }
+              getUpdate(app.app.id);
             }
           }),
       bottomSheet: Padding(
@@ -244,7 +245,10 @@ class _AppPageState extends State<AppPage> {
                                           var name = values.removeLast();
                                           changedApp.name = name;
                                           changedApp.additionalData = values;
-                                          appsProvider.saveApps([changedApp]);
+                                          appsProvider.saveApps(
+                                              [changedApp]).then((value) {
+                                            getUpdate(changedApp.id);
+                                          });
                                         }
                                       });
                                     },

lib/pages/apps.dart

@@ -6,8 +6,10 @@ import 'package:obtainium/components/generated_form_modal.dart';
 import 'package:obtainium/pages/app.dart';
 import 'package:obtainium/providers/apps_provider.dart';
 import 'package:obtainium/providers/settings_provider.dart';
+import 'package:obtainium/providers/source_provider.dart';
 import 'package:provider/provider.dart';
 import 'package:share_plus/share_plus.dart';
+import 'package:url_launcher/url_launcher_string.dart';
 
 class AppsPage extends StatefulWidget {
   const AppsPage({super.key});
@@ -112,7 +114,7 @@ class AppsPageState extends State<AppsPage> {
       return result;
     });
 
-    if (settingsProvider.sortOrder == SortOrderSettings.ascending) {
+    if (settingsProvider.sortOrder == SortOrderSettings.descending) {
       sortedApps = sortedApps.reversed.toList();
     }
 
@@ -172,7 +174,37 @@ class AppsPageState extends State<AppsPage> {
                     : (sortedApps[index].app.installedVersion != null &&
                             sortedApps[index].app.installedVersion !=
                                 sortedApps[index].app.latestVersion
-                        ? const Text('Update Available')
+                        ? Column(
+                            mainAxisAlignment: MainAxisAlignment.center,
+                            crossAxisAlignment: CrossAxisAlignment.end,
+                            children: [
+                              const Text('Update Available'),
+                              SourceProvider()
+                                          .getSource(sortedApps[index].app.url)
+                                          .changeLogPageFromStandardUrl(
+                                              sortedApps[index].app.url) ==
+                                      null
+                                  ? const SizedBox()
+                                  : GestureDetector(
+                                      onTap: () {
+                                        launchUrlString(
+                                            SourceProvider()
+                                                .getSource(
+                                                    sortedApps[index].app.url)
+                                                .changeLogPageFromStandardUrl(
+                                                    sortedApps[index].app.url)!,
+                                            mode:
+                                                LaunchMode.externalApplication);
+                                      },
+                                      child: const Text(
+                                        'See Changes',
+                                        style: TextStyle(
+                                            fontStyle: FontStyle.italic,
+                                            decoration:
+                                                TextDecoration.underline),
+                                      )),
+                            ],
+                          )
                         : Text(sortedApps[index].app.installedVersion ??
                             'Not Installed')),
                 onTap: () {
@@ -308,16 +340,139 @@ class AppsPageState extends State<AppsPage> {
                     : IconButton(
                         visualDensity: VisualDensity.compact,
                         onPressed: () {
-                          String urls = '';
-                          for (var id in selectedIds) {
-                            urls += '${appsProvider.apps[id]!.app.url}\n';
-                          }
-                          urls = urls.substring(0, urls.length - 1);
-                          Share.share(urls,
-                              subject: 'Selected App URLs from Obtainium');
+                          showDialog(
+                              context: context,
+                              builder: (BuildContext ctx) {
+                                return AlertDialog(
+                                  scrollable: true,
+                                  content: Padding(
+                                    padding: const EdgeInsets.only(top: 6),
+                                    child: Row(
+                                        mainAxisAlignment:
+                                            MainAxisAlignment.spaceBetween,
+                                        children: [
+                                          IconButton(
+                                              onPressed:
+                                                  appsProvider
+                                                          .areDownloadsRunning()
+                                                      ? null
+                                                      : () {
+                                                          showDialog(
+                                                              context: context,
+                                                              builder:
+                                                                  (BuildContext
+                                                                      ctx) {
+                                                                return AlertDialog(
+                                                                  title: Text(
+                                                                      'Mark ${selectedIds.length} Selected Apps as Not Installed?'),
+                                                                  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 =
+                                                                                null;
+                                                                            return a;
+                                                                          }).toList());
+
+                                                                          Navigator.of(context)
+                                                                              .pop();
+                                                                        },
+                                                                        child: const Text(
+                                                                            'Yes'))
+                                                                  ],
+                                                                );
+                                                              });
+                                                        },
+                                              tooltip:
+                                                  'Mark Selected Apps as Not Installed',
+                                              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: () {
+                                              String urls = '';
+                                              for (var id in selectedIds) {
+                                                urls +=
+                                                    '${appsProvider.apps[id]!.app.url}\n';
+                                              }
+                                              urls = urls.substring(
+                                                  0, urls.length - 1);
+                                              Share.share(urls,
+                                                  subject:
+                                                      '${selectedIds.length} Selected App URLs from Obtainium');
+                                            },
+                                            tooltip: 'Share Selected App URLs',
+                                            icon: const Icon(Icons.share),
+                                          ),
+                                        ]),
+                                  ),
+                                );
+                              });
                         },
-                        tooltip: 'Share Selected App URLs',
-                        icon: const Icon(Icons.share),
+                        tooltip: 'More',
+                        icon: const Icon(Icons.more_horiz),
                       ),
               ],
             )),

lib/providers/apps_provider.dart

@@ -8,13 +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:install_plugin_v2/install_plugin_v2.dart';
+import 'package:obtainium/app_sources/github.dart';
+import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/providers/notifications_provider.dart';
 import 'package:provider/provider.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:flutter_fgbg/flutter_fgbg.dart';
 import 'package:obtainium/providers/source_provider.dart';
 import 'package:http/http.dart';
-import 'package:flutter_install_app/flutter_install_app.dart';
 
 class AppInMemory {
   late App app;
@@ -63,6 +65,9 @@ class AppsProvider with ChangeNotifier {
   }
 
   Future<ApkFile> downloadApp(String apkUrl, String appId) async {
+    apkUrl = await SourceProvider()
+        .getSource(apps[appId]!.app.url)
+        .apkUrlPrefetchModifier(apkUrl);
     StreamedResponse response =
         await Client().send(Request('GET', Uri.parse(apkUrl)));
     File downloadFile =
@@ -124,7 +129,7 @@ class AppsProvider with ChangeNotifier {
   // 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 {
-    await AppInstaller.installApk(file.file.path, actionRequired: false);
+    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]);
@@ -194,14 +199,38 @@ class AppsProvider with ChangeNotifier {
       }
     }
 
-    for (var u in silentUpdates) {
-      await installApk(u);
+    // If Obtainium is being installed, it should be the last one
+    List<ApkFile> moveObtainiumToEnd(List<ApkFile> items) {
+      String obtainiumId = 'imranr98_obtainium_${GitHub().host}';
+      ApkFile? temp;
+      items.removeWhere((element) {
+        bool res = element.appId == obtainiumId;
+        if (res) {
+          temp = element;
+        }
+        return res;
+      });
+      if (temp != null) {
+        items.add(temp!);
+      }
+      return items;
     }
 
+    // TODO: Remove below line if silentupdates are ever figured out
+    regularInstalls.addAll(silentUpdates);
+
+    silentUpdates = moveObtainiumToEnd(silentUpdates);
+    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) {
       if (regularInstalls.isNotEmpty) {
         // ignore: use_build_context_synchronously
-        await askUserToReturnToForeground(context);
+        await askUserToReturnToForeground(context, waitForFG: true);
       }
       for (var i in regularInstalls) {
         await installApk(i);
@@ -285,20 +314,21 @@ class AppsProvider with ChangeNotifier {
     App newApp = await sourceProvider.getApp(
         sourceProvider.getSource(currentApp.url),
         currentApp.url,
-        currentApp.additionalData);
-    if (newApp.latestVersion != currentApp.latestVersion) {
-      newApp.installedVersion = currentApp.installedVersion;
-      if (currentApp.preferredApkIndex < newApp.apkUrls.length) {
-        newApp.preferredApkIndex = currentApp.preferredApkIndex;
-      }
-      await saveApps([newApp]);
-      return newApp;
+        currentApp.additionalData,
+        customName: currentApp.name);
+    newApp.installedVersion = currentApp.installedVersion;
+    if (currentApp.preferredApkIndex < newApp.apkUrls.length) {
+      newApp.preferredApkIndex = currentApp.preferredApkIndex;
     }
-    return null;
+    await saveApps([newApp]);
+    return newApp.latestVersion != currentApp.latestVersion ? newApp : null;
   }
 
-  Future<List<App>> checkUpdates({DateTime? ignoreAfter}) async {
+  Future<List<App>> checkUpdates(
+      {DateTime? ignoreAfter,
+      bool immediatelyThrowRateLimitError = false}) async {
     List<App> updates = [];
+    Map<String, List<String>> errors = {};
     if (!gettingUpdates) {
       gettingUpdates = true;
 
@@ -306,7 +336,7 @@ class AppsProvider with ChangeNotifier {
       if (ignoreAfter != null) {
         appIds = appIds
             .where((id) =>
-                apps[id]!.app.lastUpdateCheck != null &&
+                apps[id]!.app.lastUpdateCheck == null ||
                 apps[id]!.app.lastUpdateCheck!.isBefore(ignoreAfter))
             .toList();
       }
@@ -314,14 +344,34 @@ class AppsProvider with ChangeNotifier {
               DateTime.fromMicrosecondsSinceEpoch(0))
           .compareTo(apps[b]!.app.lastUpdateCheck ??
               DateTime.fromMicrosecondsSinceEpoch(0)));
+
       for (int i = 0; i < appIds.length; i++) {
-        App? newApp = await getUpdate(appIds[i]);
+        App? newApp;
+        try {
+          newApp = await getUpdate(appIds[i]);
+        } catch (e) {
+          if (e is RateLimitError && immediatelyThrowRateLimitError) {
+            rethrow;
+          }
+          var tempIds = errors.remove(e.toString());
+          tempIds ??= [];
+          tempIds.add(appIds[i]);
+          errors.putIfAbsent(e.toString(), () => tempIds!);
+        }
         if (newApp != null) {
           updates.add(newApp);
         }
       }
       gettingUpdates = false;
     }
+    if (errors.isNotEmpty) {
+      String finalError = '';
+      for (var e in errors.keys) {
+        finalError +=
+            '$e ${errors[e]!.map((e) => apps[e]!.app.name).toString()}. ';
+      }
+      throw finalError;
+    }
     return updates;
   }
 
@@ -366,8 +416,8 @@ class AppsProvider with ChangeNotifier {
     for (App a in importedApps) {
       a.installedVersion =
           apps.containsKey(a.id) ? apps[a]?.app.installedVersion : null;
-      await saveApps([a]);
     }
+    await saveApps(importedApps);
     notifyListeners();
     return importedApps.length;
   }
@@ -402,7 +452,10 @@ class _APKPickerState extends State<APKPicker> {
         Text('${widget.app.name} has more than one package:'),
         const SizedBox(height: 16),
         ...widget.app.apkUrls.map((u) => RadioListTile<String>(
-            title: Text(Uri.parse(u).pathSegments.last),
+            title: Text(Uri.parse(u)
+                .pathSegments
+                .where((element) => element.isNotEmpty)
+                .last),
             value: u,
             groupValue: apkUrl,
             onChanged: (String? val) {

lib/providers/settings_provider.dart

@@ -74,8 +74,8 @@ class SettingsProvider with ChangeNotifier {
   }
 
   SortColumnSettings get sortColumn {
-    return SortColumnSettings
-        .values[prefs?.getInt('sortColumn') ?? SortColumnSettings.added.index];
+    return SortColumnSettings.values[
+        prefs?.getInt('sortColumn') ?? SortColumnSettings.nameAuthor.index];
   }
 
   set sortColumn(SortColumnSettings s) {
@@ -85,7 +85,7 @@ class SettingsProvider with ChangeNotifier {
 
   SortOrderSettings get sortOrder {
     return SortOrderSettings.values[
-        prefs?.getInt('sortOrder') ?? SortOrderSettings.descending.index];
+        prefs?.getInt('sortOrder') ?? SortOrderSettings.ascending.index];
   }
 
   set sortOrder(SortOrderSettings s) {
@@ -129,5 +129,6 @@ class SettingsProvider with ChangeNotifier {
 
   void setSettingString(String settingId, String value) {
     prefs?.setString(settingId, value);
+    notifyListeners();
   }
 }

lib/providers/source_provider.dart

@@ -4,6 +4,7 @@
 import 'dart:convert';
 
 import 'package:html/dom.dart';
+import 'package:obtainium/app_sources/apkmirror.dart';
 import 'package:obtainium/app_sources/fdroid.dart';
 import 'package:obtainium/app_sources/github.dart';
 import 'package:obtainium/app_sources/gitlab.dart';
@@ -136,6 +137,8 @@ abstract class AppSource {
   late List<List<GeneratedFormItem>> additionalDataFormItems;
   late List<String> additionalDataDefaults;
   late List<GeneratedFormItem> moreSourceSettingsFormItems;
+  String? changeLogPageFromStandardUrl(String standardUrl);
+  Future<String> apkUrlPrefetchModifier(String apkUrl);
 }
 
 abstract class MassAppSource {
@@ -153,7 +156,8 @@ class SourceProvider {
     IzzyOnDroid(),
     Mullvad(),
     Signal(),
-    SourceForge()
+    SourceForge(),
+    APKMirror()
   ];
 
   // Add more mass source classes here so they are available via the service

pubspec.lock

@@ -7,7 +7,7 @@ packages:
       name: animations
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.5"
+    version: "2.0.7"
   archive:
     dependency: transitive
     description:
@@ -71,6 +71,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.16.0"
+  cross_file:
+    dependency: transitive
+    description:
+      name: cross_file
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.3.3+2"
   crypto:
     dependency: transitive
     description:
@@ -105,42 +112,42 @@ packages:
       name: device_info_plus
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.1.2"
+    version: "5.0.5"
   device_info_plus_linux:
     dependency: transitive
     description:
       name: device_info_plus_linux
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.0"
+    version: "4.0.2"
   device_info_plus_macos:
     dependency: transitive
     description:
       name: device_info_plus_macos
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.0"
+    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: "3.0.0"
+    version: "4.0.1"
   device_info_plus_web:
     dependency: transitive
     description:
       name: device_info_plus_web
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.0"
+    version: "4.0.2"
   device_info_plus_windows:
     dependency: transitive
     description:
       name: device_info_plus_windows
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.1.0"
+    version: "5.0.2"
   dynamic_color:
     dependency: "direct main"
     description:
@@ -188,13 +195,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.2.0"
-  flutter_install_app:
-    dependency: "direct main"
-    description:
-      name: flutter_install_app
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.3.0"
   flutter_launcher_icons:
     dependency: "direct dev"
     description:
@@ -215,7 +215,7 @@ packages:
       name: flutter_local_notifications
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "11.0.1"
+    version: "12.0.0"
   flutter_local_notifications_linux:
     dependency: transitive
     description:
@@ -282,6 +282,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "3.2.0"
+  install_plugin_v2:
+    dependency: "direct main"
+    description:
+      name: install_plugin_v2
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.0"
   js:
     dependency: transitive
     description:
@@ -400,35 +407,35 @@ packages:
       name: permission_handler
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "10.0.2"
+    version: "10.1.0"
   permission_handler_android:
     dependency: transitive
     description:
       name: permission_handler_android
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "10.0.0"
+    version: "10.1.0"
   permission_handler_apple:
     dependency: transitive
     description:
       name: permission_handler_apple
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "9.0.4"
+    version: "9.0.6"
   permission_handler_platform_interface:
     dependency: transitive
     description:
       name: permission_handler_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.8.0"
+    version: "3.9.0"
   permission_handler_windows:
     dependency: transitive
     description:
       name: permission_handler_windows
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.0"
+    version: "0.1.1"
   petitparser:
     dependency: transitive
     description:
@@ -470,7 +477,7 @@ packages:
       name: share_plus
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.4.0"
+    version: "4.5.3"
   share_plus_linux:
     dependency: transitive
     description:
@@ -491,14 +498,14 @@ packages:
       name: share_plus_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.3"
+    version: "3.1.1"
   share_plus_web:
     dependency: transitive
     description:
       name: share_plus_web
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.1"
+    version: "3.1.0"
   share_plus_windows:
     dependency: transitive
     description:
@@ -699,7 +706,7 @@ packages:
       name: webview_flutter_android
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.10.3"
+    version: "2.10.4"
   webview_flutter_platform_interface:
     dependency: transitive
     description:

pubspec.yaml

@@ -17,7 +17,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 0.5.0+21 # When changing this, update the tag in main() accordingly
+version: 0.5.10+31 # When changing this, update the tag in main() accordingly
 
 environment:
   sdk: '>=2.19.0-79.0.dev <3.0.0'
@@ -38,7 +38,7 @@ dependencies:
   cupertino_icons: ^1.0.5
   path_provider: ^2.0.11
   flutter_fgbg: ^0.2.0 # Try removing reliance on this
-  flutter_local_notifications: ^11.0.1
+  flutter_local_notifications: ^12.0.0
   provider: ^6.0.3
   http: ^0.13.5
   webview_flutter: ^3.0.4
@@ -49,10 +49,10 @@ dependencies:
   url_launcher: ^6.1.5
   permission_handler: ^10.0.0
   fluttertoast: ^8.0.9
-  device_info_plus: ^4.1.2
+  device_info_plus: ^5.0.5
   file_picker: ^5.1.0
   animations: ^2.0.4
-  flutter_install_app: ^1.3.0
+  install_plugin_v2: ^1.0.0
   share_plus: ^4.4.0
 
 

test/widget_test.dart

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