Added a note about imported apps 'not installed'

Can't get more granular due to flutter_local_notifications/issues/1700

lib/app_sources/apkmirror.dart

@@ -1,113 +0,0 @@
-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 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 InvalidURLError(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 NoReleasesError();
-    }
-    var nextUrl = parse(res.body)
-        .querySelector('item')
-        ?.querySelector('link')
-        ?.nextElementSibling
-        ?.innerHtml;
-    if (nextUrl == null) {
-      throw NoReleasesError();
-    }
-    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 NoReleasesError();
-    }
-    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 NoAPKError();
-    }
-    var version = html2.querySelector('span.active.accent_color')?.innerHtml;
-    if (version == null) {
-      throw NoVersionError();
-    }
-    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/github.dart

@@ -72,7 +72,7 @@ class GitHub implements AppSource {
 
         if (regexFilter != null &&
             !RegExp(regexFilter)
-                .hasMatch((releases[i]['tag_name'] as String).trim())) {
+                .hasMatch((releases[i]['name'] as String).trim())) {
           continue;
         }
         var apkUrls = getReleaseAPKUrls(releases[i]);

lib/custom_errors.dart

@@ -96,3 +96,19 @@ showError(dynamic e, BuildContext context) {
         });
   }
 }
+
+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

@@ -15,7 +15,7 @@ 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.6.7';
+const String currentVersion = '0.6.11';
 const String currentReleaseTag =
     'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES
 

lib/pages/add_app.dart

@@ -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;
                                             }

lib/pages/import_export.dart

@@ -62,7 +62,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),
@@ -316,7 +315,19 @@ class _ImportExportPageState extends State<ImportExportPage> {
                                               },
                                         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,
+                      )
                     ],
                   )))
         ]));

lib/providers/apps_provider.dart

@@ -5,6 +5,7 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 
+import 'package:device_info_plus/device_info_plus.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:fluttertoast/fluttertoast.dart';
@@ -138,12 +139,17 @@ class AppsProvider with ChangeNotifier {
     // 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) {
+      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);
   }
@@ -206,11 +212,18 @@ class AppsProvider with ChangeNotifier {
   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);
+            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)
@@ -327,6 +340,8 @@ class AppsProvider with ChangeNotifier {
       throw errors;
     }
 
+    NotificationsProvider().cancel(UpdateNotification([]).id);
+
     return downloadedFiles.map((e) => e!.appId).toList();
   }
 
@@ -586,10 +601,11 @@ class AppsProvider with ChangeNotifier {
 }
 
 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();
@@ -607,18 +623,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/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.';
   }
 }
 

lib/providers/source_provider.dart

@@ -156,8 +156,7 @@ class SourceProvider {
     IzzyOnDroid(),
     Mullvad(),
     Signal(),
-    SourceForge(),
+    SourceForge()
-    // APKMirror()
   ];
 
   // Add more mass url source classes here so they are available via the service
@@ -192,6 +191,19 @@ class SourceProvider {
   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 name = '', String? id}) async {
     String standardUrl = source.standardizeURL(preStandardizeUrl(url));

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.6.7+51 # When changing this, update the tag in main() accordingly
+version: 0.6.11+55 # When changing this, update the tag in main() accordingly
 
 environment:
   sdk: '>=2.18.2 <3.0.0'