Updated packages

GitHub Search and Pinned Apps

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/fdroid.dart

@@ -1,12 +1,12 @@
 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 {
-  @override
-  late String host = 'f-droid.org';
+class FDroid extends AppSource {
+  FDroid() {
+    host = 'f-droid.org';
+  }
 
   @override
   String standardizeURL(String url) {
@@ -77,13 +77,4 @@ class FDroid implements AppSource {
   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,9 +7,81 @@ 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
-  late String host = 'github.com';
+class GitHub extends AppSource {
+  GitHub() {
+    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) {
@@ -72,7 +144,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]);
@@ -114,72 +186,23 @@ class GitHub implements AppSource {
   }
 
   @override
-  List<List<GeneratedFormItem>> 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;
-            }
-          ])
-    ]
-  ];
-
-  @override
-  List<String> additionalDataDefaults = ['true', 'true', ''];
-
-  @override
-  List<GeneratedFormItem> moreSourceSettingsFormItems = [
-    GeneratedFormItem(
-        label: 'GitHub Personal Access Token (Increases Rate Limit)',
-        id: 'github-creds',
-        required: false,
-        additionalValidators: [
-          (value) {
-            if (value != null && value.trim().isNotEmpty) {
-              if (value
-                      .split(':')
-                      .where((element) => element.trim().isNotEmpty)
-                      .length !=
-                  2) {
-                return 'PAT must be in this format: username:token';
-              }
-            }
-            return null;
-          }
-        ],
-        hint: 'username:token',
-        belowWidgets: [
-          const SizedBox(
-            height: 8,
-          ),
-          GestureDetector(
-              onTap: () {
-                launchUrlString(
-                    'https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token',
-                    mode: LaunchMode.externalApplication);
-              },
-              child: const Text(
-                'About GitHub PATs',
-                style: TextStyle(
-                    decoration: TextDecoration.underline, fontSize: 12),
-              ))
-        ])
-  ];
+  Future<List<String>> search(String query) async {
+    Response res = await get(Uri.parse(
+        'https://${await getCredentialPrefixIfAny()}api.$host/search/repositories?q=${Uri.encodeQueryComponent(query)}&per_page=100'));
+    if (res.statusCode == 200) {
+      return (jsonDecode(res.body)['items'] as List<dynamic>)
+          .map((e) => e['html_url'] as String)
+          .toList();
+    } else {
+      if (res.headers['x-ratelimit-remaining'] == '0') {
+        throw RateLimitError(
+            (int.parse(res.headers['x-ratelimit-reset'] ?? '1800000000') /
+                    60000000)
+                .round());
+      }
+      throw ObtainiumError(
+          res.reasonPhrase ?? 'Error ${res.statusCode.toString()}',
+          unexpected: true);
+    }
+  }
 }

lib/app_sources/gitlab.dart

@@ -1,13 +1,13 @@
 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 {
-  @override
-  late String host = 'gitlab.com';
+class GitLab extends AppSource {
+  GitLab() {
+    host = 'gitlab.com';
+  }
 
   @override
   String standardizeURL(String url) {
@@ -72,13 +72,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,12 +1,12 @@
 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 IzzyOnDroid implements AppSource {
-  @override
-  late String host = 'android.izzysoft.de';
+class IzzyOnDroid extends AppSource {
+  IzzyOnDroid() {
+    host = 'android.izzysoft.de';
+  }
 
   @override
   String standardizeURL(String url) {
@@ -63,13 +63,4 @@ class IzzyOnDroid implements AppSource {
   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,12 +1,12 @@
 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 {
-  @override
-  late String host = 'mullvad.net';
+class Mullvad extends AppSource {
+  Mullvad() {
+    host = 'mullvad.net';
+  }
 
   @override
   String standardizeURL(String url) {
@@ -50,13 +50,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,12 +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 {
-  @override
-  late String host = 'signal.org';
+class Signal extends AppSource {
+  Signal() {
+    host = 'signal.org';
+  }
 
   @override
   String standardizeURL(String url) {
@@ -42,13 +42,4 @@ class Signal implements AppSource {
 
   @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,12 +1,12 @@
 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 {
-  @override
-  late String host = 'sourceforge.net';
+class SourceForge extends AppSource {
+  SourceForge() {
+    host = 'sourceforge.net';
+  }
 
   @override
   String standardizeURL(String url) {
@@ -66,13 +66,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/custom_errors.dart

@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
-import 'package:obtainium/providers/apps_provider.dart';
 
 class ObtainiumError {
   late String message;
-  ObtainiumError(this.message);
+  bool unexpected;
+  ObtainiumError(this.message, {this.unexpected = false});
   @override
   String toString() {
     return message;
@@ -48,10 +48,14 @@ class IDChangedError extends ObtainiumError {
       : 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');
+  MultiAppMultiError() : super('Multiple Errors Placeholder', unexpected: true);
 
   add(String appId, String string) {
     var tempIds = content.remove(string);
@@ -71,7 +75,7 @@ class MultiAppMultiError extends ObtainiumError {
 }
 
 showError(dynamic e, BuildContext context) {
-  if (e is String || (e is ObtainiumError && e is! MultiAppMultiError)) {
+  if (e is String || (e is ObtainiumError && !e.unexpected)) {
     ScaffoldMessenger.of(context).showSnackBar(
       SnackBar(content: Text(e.toString())),
     );

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.8';
+const String currentVersion = '0.7.0';
 const String currentReleaseTag =
     'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES
 
@@ -143,7 +143,8 @@ class _ObtainiumState extends State<Obtainium> {
               [],
               0,
               ['true'],
-              null)
+              null,
+              false)
         ]);
       }
       // Register the background update task according to the user's setting

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/apps.dart

@@ -23,24 +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) {
-    if (selectedIds.isEmpty) {
+  selectThese(List<App> apps) {
+    if (selectedApps.isEmpty) {
       setState(() {
-        for (var a in appIds) {
-          selectedIds.add(a);
+        for (var a in apps) {
+          selectedApps.add(a);
         }
       });
     }
@@ -54,16 +54,16 @@ class AppsPageState extends State<AppsPage> {
     var currentFilterIsUpdatesOnly =
         filter?.isIdenticalTo(updatesOnlyFilter) ?? false;
 
-    selectedIds = selectedIds
-        .where((element) => sortedApps.map((e) => e.app.id).contains(element))
+    selectedApps = selectedApps
+        .where((element) => sortedApps.map((e) => e.app).contains(element))
         .toSet();
 
-    toggleAppSelected(String appId) {
+    toggleAppSelected(App app) {
       setState(() {
-        if (selectedIds.contains(appId)) {
-          selectedIds.remove(appId);
+        if (selectedApps.contains(app)) {
+          selectedApps.remove(app);
         } else {
-          selectedIds.add(appId);
+          selectedApps.add(app);
         }
       });
     }
@@ -124,15 +124,15 @@ class AppsPageState extends State<AppsPage> {
     var existingUpdates = appsProvider.findExistingUpdates(installedOnly: true);
 
     var existingUpdateIdsAllOrSelected = existingUpdates
-        .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();
     var newInstallIdsAllOrSelected = appsProvider
         .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) {
@@ -147,6 +147,17 @@ class AppsPageState extends State<AppsPage> {
       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(
@@ -192,11 +203,16 @@ class AppsPageState extends State<AppsPage> {
                 delegate: SliverChildBuilderDelegate(
                     (BuildContext context, int index) {
               return ListTile(
-                selectedTileColor:
-                    Theme.of(context).colorScheme.primary.withOpacity(0.1),
-                selected: selectedIds.contains(sortedApps[index].app.id),
+                tileColor: sortedApps[index].app.pinned
+                    ? Colors.grey.withOpacity(0.1)
+                    : 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);
                 },
                 leading: sortedApps[index].installedInfo != null
                     ? Image.memory(
@@ -204,9 +220,19 @@ class AppsPageState extends State<AppsPage> {
                         gaplessPlayback: true,
                       )
                     : null,
-                title: Text(sortedApps[index].installedInfo?.name ??
-                    sortedApps[index].app.name),
-                subtitle: Text('By ${sortedApps[index].app.author}'),
+                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()}%')
@@ -256,8 +282,8 @@ class AppsPageState extends State<AppsPage> {
                                   textAlign: TextAlign.end,
                                 )))),
                 onTap: () {
-                  if (selectedIds.isNotEmpty) {
-                    toggleAppSelected(sortedApps[index].app.id);
+                  if (selectedApps.isNotEmpty) {
+                    toggleAppSelected(sortedApps[index].app);
                   } else {
                     Navigator.push(
                       context,
@@ -275,25 +301,25 @@ class AppsPageState extends State<AppsPage> {
           children: [
             IconButton(
                 onPressed: () {
-                  selectedIds.isEmpty
-                      ? selectThese(sortedApps.map((e) => e.app.id).toList())
+                  selectedApps.isEmpty
+                      ? 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,
@@ -307,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());
                             }
                           });
                         },
@@ -347,7 +374,7 @@ 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,
@@ -386,11 +413,11 @@ class AppsPageState extends State<AppsPage> {
                             });
                           },
                     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,
@@ -419,7 +446,7 @@ class AppsPageState extends State<AppsPage> {
                                                                       ctx) {
                                                                 return AlertDialog(
                                                                   title: Text(
-                                                                      'Mark ${selectedIds.length} Selected Apps as Updated?'),
+                                                                      'Mark ${selectedApps.length} Selected Apps as Updated?'),
                                                                   content:
                                                                       const Text(
                                                                           'Only applies to installed but out of date Apps.'),
@@ -438,9 +465,7 @@ class AppsPageState extends State<AppsPage> {
                                                                           HapticFeedback
                                                                               .selectionClick();
                                                                           appsProvider
-                                                                              .saveApps(selectedIds.map((e) {
-                                                                            var a =
-                                                                                appsProvider.apps[e]!.app;
+                                                                              .saveApps(selectedApps.map((a) {
                                                                             if (a.installedVersion !=
                                                                                 null) {
                                                                               a.installedVersion = a.latestVersion;
@@ -455,23 +480,50 @@ class AppsPageState extends State<AppsPage> {
                                                                             'Yes'))
                                                                   ],
                                                                 );
-                                                              });
+                                                              }).whenComplete(() {
+                                                            Navigator.of(
+                                                                    context)
+                                                                .pop();
+                                                          });
                                                         },
                                               tooltip:
                                                   'Mark Selected Apps as 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) {
-                                                urls +=
-                                                    '${appsProvider.apps[id]!.app.url}\n';
+                                              for (var a in selectedApps) {
+                                                urls += '${a.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),

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),
@@ -224,6 +223,103 @@ class _ImportExportPageState extends State<ImportExportPage> {
                           child: const Text(
                             'Import from URL List',
                           )),
+                      ...sourceProvider.sources
+                          .where((element) => element.canSearch)
+                          .map((source) => Column(
+                                  crossAxisAlignment:
+                                      CrossAxisAlignment.stretch,
+                                  children: [
+                                    const SizedBox(height: 8),
+                                    TextButton(
+                                        onPressed: importInProgress
+                                            ? null
+                                            : () {
+                                                () async {
+                                                  var values = await showDialog<
+                                                          List<String>>(
+                                                      context: context,
+                                                      builder:
+                                                          (BuildContext ctx) {
+                                                        return GeneratedFormModal(
+                                                          title:
+                                                              'Search ${source.runtimeType}',
+                                                          items: [
+                                                            [
+                                                              GeneratedFormItem(
+                                                                  label:
+                                                                      '${source.runtimeType} Search Query')
+                                                            ]
+                                                          ],
+                                                          defaultValues: const [],
+                                                        );
+                                                      });
+                                                  if (values != null &&
+                                                      values[0].isNotEmpty) {
+                                                    setState(() {
+                                                      importInProgress = true;
+                                                    });
+                                                    var urls = await source
+                                                        .search(values[0]);
+                                                    if (urls.isNotEmpty) {
+                                                      var selectedUrls =
+                                                          await showDialog<
+                                                                  List<
+                                                                      String>?>(
+                                                              context: context,
+                                                              builder:
+                                                                  (BuildContext
+                                                                      ctx) {
+                                                                return UrlSelectionModal(
+                                                                  urls: urls,
+                                                                  defaultSelected:
+                                                                      false,
+                                                                );
+                                                              });
+                                                      if (selectedUrls !=
+                                                              null &&
+                                                          selectedUrls
+                                                              .isNotEmpty) {
+                                                        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);
+                                                              });
+                                                        }
+                                                      }
+                                                    } else {
+                                                      throw ObtainiumError(
+                                                          'No results found');
+                                                    }
+                                                  }
+                                                }()
+                                                    .catchError((e) {
+                                                  showError(e, context);
+                                                }).whenComplete(() {
+                                                  setState(() {
+                                                    importInProgress = false;
+                                                  });
+                                                });
+                                              },
+                                        child: Text(
+                                            'Search ${source.runtimeType}'))
+                                  ]))
+                          .toList(),
                       ...sourceProvider.massUrlSources
                           .map((source) => Column(
                                   crossAxisAlignment:
@@ -234,89 +330,90 @@ class _ImportExportPageState extends State<ImportExportPage> {
                                         onPressed: importInProgress
                                             ? null
                                             : () {
-                                                showDialog(
-                                                    context: context,
-                                                    builder:
-                                                        (BuildContext ctx) {
-                                                      return GeneratedFormModal(
-                                                        title:
-                                                            'Import ${source.name}',
-                                                        items: source
-                                                            .requiredArgs
-                                                            .map((e) => [
-                                                                  GeneratedFormItem(
-                                                                      label: e)
-                                                                ])
-                                                            .toList(),
-                                                        defaultValues: const [],
-                                                      );
-                                                    }).then((values) {
+                                                () 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;
                                                     });
-                                                    source
-                                                        .getUrls(values)
-                                                        .then((urls) {
-                                                      showDialog<List<String>?>(
-                                                              context: context,
-                                                              builder:
-                                                                  (BuildContext
-                                                                      ctx) {
-                                                                return UrlSelectionModal(
-                                                                    urls: urls);
-                                                              })
-                                                          .then((selectedUrls) {
-                                                        if (selectedUrls !=
-                                                            null) {
-                                                          addApps(selectedUrls)
-                                                              .then((errors) {
-                                                            if (errors
-                                                                .isEmpty) {
-                                                              showError(
-                                                                  'Imported ${selectedUrls.length} Apps',
-                                                                  context);
-                                                            } else {
-                                                              showDialog(
-                                                                  context:
-                                                                      context,
-                                                                  builder:
-                                                                      (BuildContext
-                                                                          ctx) {
-                                                                    return ImportErrorDialog(
-                                                                        urlsLength:
-                                                                            selectedUrls
-                                                                                .length,
-                                                                        errors:
-                                                                            errors);
-                                                                  });
-                                                            }
-                                                          }).whenComplete(() {
-                                                            setState(() {
-                                                              importInProgress =
-                                                                  false;
+                                                    var urls = await source
+                                                        .getUrls(values);
+                                                    var selectedUrls =
+                                                        await showDialog<
+                                                                List<String>?>(
+                                                            context: context,
+                                                            builder:
+                                                                (BuildContext
+                                                                    ctx) {
+                                                              return UrlSelectionModal(
+                                                                  urls: urls);
                                                             });
-                                                          });
-                                                        } else {
-                                                          setState(() {
-                                                            importInProgress =
-                                                                false;
-                                                          });
-                                                        }
-                                                      });
-                                                    }).catchError((e) {
-                                                      setState(() {
-                                                        importInProgress =
-                                                            false;
-                                                      });
-                                                      showError(e, context);
-                                                    });
+                                                    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,
+                      )
                     ],
                   )))
         ]));
@@ -379,9 +476,11 @@ class _ImportErrorDialogState extends State<ImportErrorDialog> {
 
 // ignore: must_be_immutable
 class UrlSelectionModal extends StatefulWidget {
-  UrlSelectionModal({super.key, required this.urls});
+  UrlSelectionModal(
+      {super.key, required this.urls, this.defaultSelected = true});
 
   List<String> urls;
+  bool defaultSelected;
 
   @override
   State<UrlSelectionModal> createState() => _UrlSelectionModalState();
@@ -393,7 +492,7 @@ class _UrlSelectionModalState extends State<UrlSelectionModal> {
   void initState() {
     super.initState();
     for (var url in widget.urls) {
-      urlSelections.putIfAbsent(url, () => true);
+      urlSelections.putIfAbsent(url, () => widget.defaultSelected);
     }
   }
 

lib/providers/apps_provider.dart

@@ -139,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);
   }
@@ -335,6 +340,8 @@ class AppsProvider with ChangeNotifier {
       throw errors;
     }
 
+    NotificationsProvider().cancel(UpdateNotification([]).id);
+
     return downloadedFiles.map((e) => e!.appId).toList();
   }
 
@@ -483,7 +490,8 @@ class AppsProvider with ChangeNotifier {
         currentApp.url,
         currentApp.additionalData,
         name: currentApp.name,
-        id: currentApp.id);
+        id: currentApp.id,
+        pinned: currentApp.pinned);
     newApp.installedVersion = currentApp.installedVersion;
     if (currentApp.preferredApkIndex < newApp.apkUrls.length) {
       newApp.preferredApkIndex = currentApp.preferredApkIndex;

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
-        ? '${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.';
+    message = updates.isEmpty
+        ? "No new 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

@@ -40,6 +40,7 @@ class App {
   late int preferredApkIndex;
   late List<String> additionalData;
   late DateTime? lastUpdateCheck;
+  bool pinned = false;
   App(
       this.id,
       this.url,
@@ -50,11 +51,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 PREFERREDAPK: $preferredApkIndex ADDITIONALDATA: ${additionalData.toString()} LASTCHECK: ${lastUpdateCheck.toString()}';
+    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 +77,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,7 +90,8 @@ class App {
         'apkUrls': jsonEncode(apkUrls),
         'preferredApkIndex': preferredApkIndex,
         'additionalData': jsonEncode(additionalData),
-        'lastUpdateCheck': lastUpdateCheck?.microsecondsSinceEpoch
+        'lastUpdateCheck': lastUpdateCheck?.microsecondsSinceEpoch,
+        'pinned': pinned
       };
 }
 
@@ -128,17 +132,36 @@ 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);
-  AppNames getAppNames(String standardUrl);
-  late List<List<GeneratedFormItem>> additionalDataFormItems;
-  late List<String> additionalDataDefaults;
-  late List<GeneratedFormItem> moreSourceSettingsFormItems;
-  String? changeLogPageFromStandardUrl(String standardUrl);
-  Future<String> apkUrlPrefetchModifier(String apkUrl);
+      String standardUrl, List<String> additionalData) {
+    throw NotImplementedError();
+  }
+
+  AppNames getAppNames(String standardUrl) {
+    throw NotImplementedError();
+  }
+
+  List<List<GeneratedFormItem>> additionalDataFormItems = [];
+  List<String> additionalDataDefaults = [];
+  List<GeneratedFormItem> moreSourceSettingsFormItems = [];
+  String? changeLogPageFromStandardUrl(String standardUrl) {
+    throw NotImplementedError();
+  }
+
+  Future<String> apkUrlPrefetchModifier(String apkUrl) {
+    throw NotImplementedError();
+  }
+
+  bool canSearch = false;
+  Future<List<String>> search(String query) {
+    throw NotImplementedError();
+  }
 }
 
 abstract class MassAppUrlSource {
@@ -156,8 +179,7 @@ class SourceProvider {
     IzzyOnDroid(),
     Mullvad(),
     Signal(),
-    SourceForge(),
-    // APKMirror()
+    SourceForge()
   ];
 
   // Add more mass url source classes here so they are available via the service
@@ -192,8 +214,21 @@ 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 name = '', String? id, bool pinned = false}) async {
     String standardUrl = source.standardizeURL(preStandardizeUrl(url));
     AppNames names = source.getAppNames(standardUrl);
     APKDetails apk =
@@ -210,7 +245,8 @@ class SourceProvider {
         apk.apkUrls,
         apk.apkUrls.length - 1,
         additionalData,
-        DateTime.now());
+        DateTime.now(),
+        pinned);
   }
 
   // Returns errors in [results, errors] instead of throwing them

pubspec.lock

@@ -21,7 +21,7 @@ packages:
       name: archive
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.3.2"
+    version: "3.3.4"
   args:
     dependency: transitive
     description:
@@ -78,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:
@@ -173,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:
@@ -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:
@@ -706,7 +720,7 @@ packages:
       name: win32
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.1"
+    version: "3.1.1"
   xdg_directories:
     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.6.8+52 # When changing this, update the tag in main() accordingly
+version: 0.7.0+56 # When changing this, update the tag in main() accordingly
 
 environment:
   sdk: '>=2.18.2 <3.0.0'