bugfix

README.md

@@ -1,4 +1,4 @@
-# ![](./android/app/src/main/res/drawable/ic_notification.png) Obtainium
+# ![Obtainium Icon](./android/app/src/main/res/drawable/ic_notification.png) Obtainium
 
 Get Android App Updates Directly From the Source.
 
@@ -13,6 +13,7 @@ Motivation: [Side Of Burritos - You should use this instead of F-Droid | How to
 ## Limitations
 - App installs are assumed to have succeeded; failures and cancelled installs cannot be detected.
 - Auto (unattended) updates are unsupported due to a lack of any capable Flutter plugin.
+- For GitHub, data is gathered using Web scraping and can easily break due to changes in website design. More reliable methods are either insufficient (GitHub RSS) or subject to rate limits (GitHub API). This may also apply to new sources added in the future.
 
 ## Screenshots
 

lib/main.dart

@@ -11,7 +11,7 @@ import 'package:workmanager/workmanager.dart';
 import 'package:dynamic_color/dynamic_color.dart';
 
 const String currentReleaseTag =
-    'v0.1.3-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES
+    'v0.1.5-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES
 
 @pragma('vm:entry-point')
 void bgTaskCallback() {
@@ -21,6 +21,8 @@ void bgTaskCallback() {
     var notificationsProvider = NotificationsProvider();
     await notificationsProvider.notify(checkingUpdatesNotification);
     try {
+      await notificationsProvider
+          .cancel(ErrorCheckingUpdatesNotification('').id);
       await appsProvider.loadApps();
       List<App> updates = await appsProvider.checkUpdates();
       if (updates.isNotEmpty) {
@@ -87,7 +89,7 @@ class MyApp extends StatelessWidget {
         // If this is the first run, ask for notification permissions and add Obtainium to the Apps list
         Permission.notification.request();
         appsProvider.saveApp(App(
-            'imranr98_obtainium_github',
+            'imranr98_obtainium_${GitHub().host}',
             'https://github.com/ImranR98/Obtainium',
             'ImranR98',
             'Obtainium',
@@ -123,7 +125,8 @@ class MyApp extends StatelessWidget {
               useMaterial3: true,
               colorScheme: settingsProvider.theme == ThemeSettings.light
                   ? lightColorScheme
-                  : darkColorScheme),
+                  : darkColorScheme,
+              fontFamily: 'Metropolis'),
           home: const HomePage());
     });
   }

lib/pages/add_app.dart

@@ -1,9 +1,11 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/services.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:url_launcher/url_launcher_string.dart';
 
 class AddAppPage extends StatefulWidget {
   const AddAppPage({super.key});
@@ -19,16 +21,21 @@ class _AddAppPageState extends State<AddAppPage> {
 
   @override
   Widget build(BuildContext context) {
+    SourceProvider sourceProvider = SourceProvider();
     return Center(
       child: Form(
           key: _formKey,
           child: Column(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
             crossAxisAlignment: CrossAxisAlignment.stretch,
             children: [
-          const Spacer(),
+              Container(),
               Padding(
-              padding: const EdgeInsets.symmetric(horizontal: 16.0),
-              child: TextFormField(
+                padding: const EdgeInsets.all(16),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.stretch,
+                  children: [
+                    TextFormField(
                       decoration: const InputDecoration(
                           hintText: 'https://github.com/Author/Project',
                           helperText: 'Enter the App source URL'),
@@ -41,28 +48,31 @@ class _AddAppPageState extends State<AddAppPage> {
                         }
                         return null;
                       },
-              )),
+                    ),
                     Padding(
-            padding:
-                const EdgeInsets.symmetric(vertical: 16.0, horizontal: 16.0),
+                      padding: const EdgeInsets.symmetric(vertical: 16.0),
                       child: ElevatedButton(
                         onPressed: gettingAppInfo
                             ? null
                             : () {
+                                HapticFeedback.mediumImpact();
                                 if (_formKey.currentState!.validate()) {
                                   setState(() {
                                     gettingAppInfo = true;
                                   });
-                        sourceProvider()
+                                  sourceProvider
                                       .getApp(urlInputController.value.text)
                                       .then((app) {
-                          var appsProvider = context.read<AppsProvider>();
+                                    var appsProvider =
+                                        context.read<AppsProvider>();
                                     var settingsProvider =
                                         context.read<SettingsProvider>();
                                     if (appsProvider.apps.containsKey(app.id)) {
                                       throw 'App already added';
                                     }
-                          settingsProvider.getInstallPermission().then((_) {
+                                    settingsProvider
+                                        .getInstallPermission()
+                                        .then((_) {
                                       appsProvider.saveApp(app).then((_) {
                                         urlInputController.clear();
                                         Navigator.push(
@@ -86,10 +96,39 @@ class _AddAppPageState extends State<AddAppPage> {
                         child: const Text('Add'),
                       ),
                     ),
-          const Spacer(),
-          if (gettingAppInfo) const LinearProgressIndicator(),
                   ],
                 ),
-    ));
+              ),
+              Column(crossAxisAlignment: CrossAxisAlignment.center, children: [
+                const Text(
+                  'Supported Sources:',
+                  // style: TextStyle(fontWeight: FontWeight.bold),
+                  // style: Theme.of(context).textTheme.bodySmall,
+                ),
+                const SizedBox(
+                  height: 8,
+                ),
+                ...sourceProvider
+                    .getSourceHosts()
+                    .map((e) => GestureDetector(
+                        onTap: () {
+                          launchUrlString('https://$e',
+                              mode: LaunchMode.externalApplication);
+                        },
+                        child: Text(
+                          e,
+                          style: const TextStyle(
+                              decoration: TextDecoration.underline,
+                              fontStyle: FontStyle.italic),
+                        )))
+                    .toList()
+              ]),
+              if (gettingAppInfo)
+                const LinearProgressIndicator()
+              else
+                Container(),
+            ],
+          )),
+    );
   }
 }

lib/pages/app.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:obtainium/providers/apps_provider.dart';
 import 'package:webview_flutter/webview_flutter.dart';
 import 'package:provider/provider.dart';
@@ -45,11 +46,17 @@ class _AppPageState extends State<AppPage> {
                                             appsProvider
                                                 .checkAppObjectForUpdate(
                                                     app!.app)) &&
-                                        app?.downloadProgress == null
+                                        !appsProvider.areDownloadsRunning()
                                     ? () {
+                                        HapticFeedback.heavyImpact();
                                         appsProvider
                                             .downloadAndInstallLatestApp(
-                                                [app!.app.id], context);
+                                                [app!.app.id],
+                                                context).then((res) {
+                                          if (res && mounted) {
+                                            Navigator.of(context).pop();
+                                          }
+                                        });
                                       }
                                     : null,
                                 child: Text(app?.app.installedVersion == null
@@ -60,6 +67,7 @@ class _AppPageState extends State<AppPage> {
                           onPressed: app?.downloadProgress != null
                               ? null
                               : () {
+                                  HapticFeedback.lightImpact();
                                   showDialog(
                                       context: context,
                                       builder: (BuildContext ctx) {
@@ -70,6 +78,7 @@ class _AppPageState extends State<AppPage> {
                                           actions: [
                                             TextButton(
                                                 onPressed: () {
+                                                  HapticFeedback.heavyImpact();
                                                   appsProvider
                                                       .removeApp(app!.app.id)
                                                       .then((_) {
@@ -82,6 +91,7 @@ class _AppPageState extends State<AppPage> {
                                                 child: const Text('Remove')),
                                             TextButton(
                                                 onPressed: () {
+                                                  HapticFeedback.lightImpact();
                                                   Navigator.of(context).pop();
                                                 },
                                                 child: const Text('Cancel'))

lib/pages/apps.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:obtainium/pages/app.dart';
 import 'package:obtainium/providers/apps_provider.dart';
 import 'package:obtainium/providers/settings_provider.dart';
@@ -21,11 +22,10 @@ class _AppsPageState extends State<AppsPage> {
         floatingActionButton: existingUpdateAppIds.isEmpty
             ? null
             : ElevatedButton.icon(
-                onPressed: appsProvider.apps.values
-                        .where((element) => element.downloadProgress != null)
-                        .isNotEmpty
+                onPressed: appsProvider.areDownloadsRunning()
                     ? null
                     : () {
+                        HapticFeedback.heavyImpact();
                         context
                             .read<SettingsProvider>()
                             .getInstallPermission()
@@ -45,7 +45,10 @@ class _AppsPageState extends State<AppsPage> {
                       style: Theme.of(context).textTheme.headline4,
                     )
                   : RefreshIndicator(
-                      onRefresh: appsProvider.checkUpdates,
+                      onRefresh: () {
+                        HapticFeedback.lightImpact();
+                        return appsProvider.checkUpdates();
+                      },
                       child: ListView(
                         children: appsProvider.apps.values
                             .map(
@@ -55,7 +58,7 @@ class _AppsPageState extends State<AppsPage> {
                                     e.app.installedVersion ?? 'Not Installed'),
                                 trailing: e.downloadProgress != null
                                     ? Text(
-                                        'Downloading - ${e.downloadProgress!.toInt()}%')
+                                        'Downloading - ${e.downloadProgress?.toInt()}%')
                                     : (e.app.installedVersion != null &&
                                             e.app.installedVersion !=
                                                 e.app.latestVersion

lib/pages/home.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:obtainium/pages/add_app.dart';
 import 'package:obtainium/pages/apps.dart';
 import 'package:obtainium/pages/settings.dart';
@@ -20,22 +21,34 @@ class _HomePageState extends State<HomePage> {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return WillPopScope(
+        child: Scaffold(
           appBar: AppBar(title: const Text('Obtainium')),
           body: pages.elementAt(selectedIndex),
           bottomNavigationBar: NavigationBar(
             destinations: const [
-          NavigationDestination(icon: Icon(Icons.settings), label: 'Settings'),
+              NavigationDestination(
+                  icon: Icon(Icons.settings), label: 'Settings'),
               NavigationDestination(icon: Icon(Icons.apps), label: 'Apps'),
               NavigationDestination(icon: Icon(Icons.add), label: 'Add App'),
             ],
             onDestinationSelected: (int index) {
+              HapticFeedback.lightImpact();
               setState(() {
                 selectedIndex = index;
               });
             },
             selectedIndex: selectedIndex,
           ),
-    );
+        ),
+        onWillPop: () async {
+          if (selectedIndex != 1) {
+            setState(() {
+              selectedIndex = 1;
+            });
+            return false;
+          }
+          return true;
+        });
   }
 }

lib/pages/settings.dart

@@ -1,6 +1,7 @@
 import 'dart:convert';
 
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:obtainium/providers/apps_provider.dart';
 import 'package:obtainium/providers/settings_provider.dart';
 import 'package:provider/provider.dart';
@@ -118,6 +119,7 @@ class _SettingsPageState extends State<SettingsPage> {
                           onPressed: appsProvider.apps.isEmpty
                               ? null
                               : () {
+                                  HapticFeedback.lightImpact();
                                   appsProvider.exportApps().then((String path) {
                                     ScaffoldMessenger.of(context).showSnackBar(
                                       SnackBar(
@@ -128,6 +130,7 @@ class _SettingsPageState extends State<SettingsPage> {
                           child: const Text('Export Apps')),
                       ElevatedButton(
                           onPressed: () {
+                            HapticFeedback.lightImpact();
                             showDialog(
                                 context: context,
                                 builder: (BuildContext ctx) {
@@ -172,6 +175,13 @@ class _SettingsPageState extends State<SettingsPage> {
                                     actions: [
                                       TextButton(
                                           onPressed: () {
+                                            HapticFeedback.lightImpact();
+                                            Navigator.of(context).pop();
+                                          },
+                                          child: const Text('Cancel')),
+                                      TextButton(
+                                          onPressed: () {
+                                            HapticFeedback.heavyImpact();
                                             if (formKey.currentState!
                                                 .validate()) {
                                               appsProvider
@@ -198,11 +208,6 @@ class _SettingsPageState extends State<SettingsPage> {
                                             }
                                           },
                                           child: const Text('Import')),
-                                      TextButton(
-                                          onPressed: () {
-                                            Navigator.of(context).pop();
-                                          },
-                                          child: const Text('Cancel'))
                                     ],
                                   );
                                 });
@@ -223,6 +228,7 @@ class _SettingsPageState extends State<SettingsPage> {
                           }),
                         ),
                         onPressed: () {
+                          HapticFeedback.lightImpact();
                           launchUrlString(settingsProvider.sourceUrl,
                               mode: LaunchMode.externalApplication);
                         },

lib/providers/apps_provider.dart

@@ -6,6 +6,7 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:obtainium/providers/notifications_provider.dart';
 import 'package:provider/provider.dart';
 import 'package:path_provider/path_provider.dart';
@@ -79,10 +80,14 @@ class AppsProvider with ChangeNotifier {
     return ApkFile(appId, downloadFile);
   }
 
+  bool areDownloadsRunning() => apps.values
+      .where((element) => element.downloadProgress != null)
+      .isNotEmpty;
+
   // Given an AppId, uses stored info about the app to download an APK (with user input if needed) and install it
   // Installs can only be done in the foreground, so a notification is sent to get the user's attention if needed
   // Returns upon successful download, regardless of installation result
-  Future<void> downloadAndInstallLatestApp(
+  Future<bool> downloadAndInstallLatestApp(
       List<String> appIds, BuildContext context) async {
     NotificationsProvider notificationsProvider =
         context.read<NotificationsProvider>();
@@ -91,37 +96,17 @@ class AppsProvider with ChangeNotifier {
       if (apps[id] == null) {
         throw 'App not found';
       }
-      String apkUrl = apps[id]!.app.apkUrls.last;
+      String? apkUrl = apps[id]!.app.apkUrls.last;
       if (apps[id]!.app.apkUrls.length > 1) {
-        await showDialog(
+        apkUrl = await showDialog(
             context: context,
             builder: (BuildContext ctx) {
-              return AlertDialog(
-                scrollable: true,
-                title: const Text('Pick an APK'),
-                content: Column(children: [
-                  Text(
-                      '${apps[id]!.app.name} has more than one package - pick one.'),
-                  ...apps[id]!.app.apkUrls.map((u) => ListTile(
-                      title: Text(Uri.parse(u).pathSegments.last),
-                      leading: Radio<String>(
-                          value: u,
-                          groupValue: apkUrl,
-                          onChanged: (String? val) {
-                            apkUrl = val!;
-                          })))
-                ]),
-                actions: [
-                  TextButton(
-                      onPressed: () {
-                        Navigator.of(context).pop();
-                      },
-                      child: const Text('Continue'))
-                ],
-              );
+              return APKPicker(app: apps[id]!.app, initVal: apkUrl);
             });
       }
-      appsToInstall.putIfAbsent(id, () => apkUrl);
+      if (apkUrl != null) {
+        appsToInstall.putIfAbsent(id, () => apkUrl!);
+      }
     }
 
     List<ApkFile> downloadedFiles = await Future.wait(appsToInstall.entries
@@ -131,6 +116,7 @@ class AppsProvider with ChangeNotifier {
       await notificationsProvider.notify(completeInstallationNotification,
           cancelExisting: true);
       await FGBGEvents.stream.first == FGBGType.foreground;
+      await notificationsProvider.cancel(completeInstallationNotification.id);
       // We need to wait for the App to come to the foreground to install it
       // Can't try to call install plugin in a background isolate (may not have worked anyways) because of:
       // https://github.com/flutter/flutter/issues/13937
@@ -144,6 +130,8 @@ class AppsProvider with ChangeNotifier {
       apps[f.appId]!.app.installedVersion = apps[f.appId]!.app.latestVersion;
       await saveApp(apps[f.appId]!.app);
     }
+
+    return downloadedFiles.isNotEmpty;
   }
 
   Future<Directory> getAppsDir() async {
@@ -209,7 +197,7 @@ class AppsProvider with ChangeNotifier {
 
   Future<App?> getUpdate(String appId) async {
     App? currentApp = apps[appId]!.app;
-    App newApp = await sourceProvider().getApp(currentApp.url);
+    App newApp = await SourceProvider().getApp(currentApp.url);
     if (newApp.latestVersion != currentApp.latestVersion) {
       newApp.installedVersion = currentApp.installedVersion;
       await saveApp(newApp);
@@ -281,3 +269,53 @@ class AppsProvider with ChangeNotifier {
     super.dispose();
   }
 }
+
+class APKPicker extends StatefulWidget {
+  const APKPicker({super.key, required this.app, this.initVal});
+
+  final App app;
+  final String? initVal;
+
+  @override
+  State<APKPicker> createState() => _APKPickerState();
+}
+
+class _APKPickerState extends State<APKPicker> {
+  String? apkUrl;
+
+  @override
+  Widget build(BuildContext context) {
+    apkUrl ??= widget.initVal;
+    return AlertDialog(
+      scrollable: true,
+      title: const Text('Pick an APK'),
+      content: Column(children: [
+        Text('${widget.app.name} has more than one package - pick one.'),
+        ...widget.app.apkUrls.map((u) => ListTile(
+            title: Text(Uri.parse(u).pathSegments.last),
+            leading: Radio<String>(
+                value: u,
+                groupValue: apkUrl,
+                onChanged: (String? val) {
+                  setState(() {
+                    apkUrl = val;
+                  });
+                })))
+      ]),
+      actions: [
+        TextButton(
+            onPressed: () {
+              HapticFeedback.lightImpact();
+              Navigator.of(context).pop(null);
+            },
+            child: const Text('Cancel')),
+        TextButton(
+            onPressed: () {
+              HapticFeedback.mediumImpact();
+              Navigator.of(context).pop(apkUrl);
+            },
+            child: const Text('Continue'))
+      ],
+    );
+  }
+}

lib/providers/source_provider.dart

@@ -77,7 +77,7 @@ List<String> getLinksFromParsedHTML(
         .toList();
 
 abstract class AppSource {
-  late String sourceId;
+  late String host;
   String standardizeURL(String url);
   Future<APKDetails> getLatestAPKDetails(String standardUrl);
   AppNames getAppNames(String standardUrl);
@@ -85,11 +85,11 @@ abstract class AppSource {
 
 class GitHub implements AppSource {
   @override
-  String sourceId = 'github';
+  late String host = 'github.com';
 
   @override
   String standardizeURL(String url) {
-    RegExp standardUrlRegEx = RegExp(r'^https?://github.com/[^/]*/[^/]*');
+    RegExp standardUrlRegEx = RegExp('^https?://$host/[^/]*/[^/]*');
     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
     if (match == null) {
       throw 'Not a valid URL';
@@ -144,11 +144,11 @@ class GitHub implements AppSource {
 
 class GitLab implements AppSource {
   @override
-  String sourceId = 'gitlab';
+  late String host = 'gitlab.com';
 
   @override
   String standardizeURL(String url) {
-    RegExp standardUrlRegEx = RegExp(r'^https?://gitlab.com/[^/]*/[^/]*');
+    RegExp standardUrlRegEx = RegExp('^https?://$host/[^/]*/[^/]*');
     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
     if (match == null) {
       throw 'Not a valid URL';
@@ -165,7 +165,7 @@ class GitLab implements AppSource {
       var parsedHtml = parse(res.body);
       var entry = parsedHtml.querySelector('entry');
       var entryContent =
-          parse(parseFragment(entry!.querySelector('content')!.innerHtml).text);
+          parse(parseFragment(entry?.querySelector('content')!.innerHtml).text);
       var apkUrlList = getLinksFromParsedHTML(
           entryContent,
           RegExp(
@@ -176,7 +176,7 @@ class GitLab implements AppSource {
         throw 'No APK found';
       }
 
-      var entryId = entry.querySelector('id')?.innerHtml;
+      var entryId = entry?.querySelector('id')?.innerHtml;
       var version =
           entryId == null ? null : Uri.parse(entryId).pathSegments.last;
       if (version == null) {
@@ -195,16 +195,56 @@ class GitLab implements AppSource {
   }
 }
 
-class sourceProvider {
+class Signal implements AppSource {
+  @override
+  late String host = 'signal.org';
+
+  @override
+  String standardizeURL(String url) {
+    return 'https://$host';
+  }
+
+  @override
+  Future<APKDetails> getLatestAPKDetails(String standardUrl) async {
+    Response res =
+        await get(Uri.parse('https://updates.$host/android/latest.json'));
+    if (res.statusCode == 200) {
+      var json = jsonDecode(res.body);
+      String? apkUrl = json['url'];
+      if (apkUrl == null) {
+        throw 'No APK found';
+      }
+      String? version = json['versionName'];
+      if (version == null) {
+        throw 'Could not determine latest release version';
+      }
+      return APKDetails(version, [apkUrl]);
+    } else {
+      throw 'Unable to fetch release info';
+    }
+  }
+
+  @override
+  AppNames getAppNames(String standardUrl) => AppNames('signal', 'signal');
+}
+
+class SourceProvider {
+  List<AppSource> sources = [GitHub(), GitLab(), Signal()];
+
   // Add more source classes here so they are available via the service
   AppSource getSource(String url) {
-    if (url.toLowerCase().contains('://github.com')) {
-      return GitHub();
-    } else if (url.toLowerCase().contains('://gitlab.com')) {
-      return GitLab();
+    AppSource? source;
+    for (var s in sources) {
+      if (url.toLowerCase().contains('://${s.host}')) {
+        source = s;
+        break;
       }
+    }
+    if (source == null) {
       throw 'URL does not match a known source';
     }
+    return source;
+  }
 
   Future<App> getApp(String url) async {
     if (url.toLowerCase().indexOf('http://') != 0 &&
@@ -219,7 +259,7 @@ class sourceProvider {
     AppNames names = source.getAppNames(standardUrl);
     APKDetails apk = await source.getLatestAPKDetails(standardUrl);
     return App(
-        '${names.author.toLowerCase()}_${names.name.toLowerCase()}_${source.sourceId}',
+        '${names.author.toLowerCase()}_${names.name.toLowerCase()}_${source.host}',
         standardUrl,
         names.author[0].toUpperCase() + names.author.substring(1),
         names.name[0].toUpperCase() + names.name.substring(1),
@@ -227,4 +267,6 @@ class sourceProvider {
         apk.version,
         apk.apkUrls);
   }
+
+  List<String> getSourceHosts() => sources.map((e) => e.host).toList();
 }

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.1.3+4 # When changing this, update the tag in main() accordingly
+version: 0.1.5+6 # When changing this, update the tag in main() accordingly
 
 environment:
   sdk: '>=2.19.0-79.0.dev <3.0.0'