Increment version

lib/app_sources/github.dart

@@ -186,13 +186,19 @@ class GitHub extends AppSource {
   }
 
   @override
-  Future<List<String>> search(String query) async {
+  Future<Map<String, 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();
+      Map<String, String> urlsWithDescriptions = {};
+      for (var e in (jsonDecode(res.body)['items'] as List<dynamic>)) {
+        urlsWithDescriptions.addAll({
+          e['html_url'] as String: e['description'] != null
+              ? e['description'] as String
+              : 'No description'
+        });
+      }
+      return urlsWithDescriptions;
     } else {
       if (res.headers['x-ratelimit-remaining'] == '0') {
         throw RateLimitError(

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.7.0';
+const String currentVersion = '0.7.1';
 const String currentReleaseTag =
     'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES
 
@@ -134,7 +134,7 @@ class _ObtainiumState extends State<Obtainium> {
         Permission.notification.request();
         appsProvider.saveApps([
           App(
-              'dev.imranr.obtainium',
+              obtainiumId,
               'https://github.com/ImranR98/Obtainium',
               'ImranR98',
               'Obtainium',

lib/mass_app_sources/githubstars.dart

@@ -12,14 +12,20 @@ class GitHubStars implements MassAppUrlSource {
   @override
   late List<String> requiredArgs = ['Username'];
 
-  Future<List<String>> getOnePageOfUserStarredUrls(
+  Future<Map<String, String>> getOnePageOfUserStarredUrlsWithDescriptions(
       String username, int page) async {
     Response res = await get(Uri.parse(
         'https://${await GitHub().getCredentialPrefixIfAny()}api.github.com/users/$username/starred?per_page=100&page=$page'));
     if (res.statusCode == 200) {
-      return (jsonDecode(res.body) as List<dynamic>)
-          .map((e) => e['html_url'] as String)
-          .toList();
+      Map<String, String> urlsWithDescriptions = {};
+      for (var e in (jsonDecode(res.body) as List<dynamic>)) {
+        urlsWithDescriptions.addAll({
+          e['html_url'] as String: e['description'] != null
+              ? e['description'] as String
+              : 'No description'
+        });
+      }
+      return urlsWithDescriptions;
     } else {
       if (res.headers['x-ratelimit-remaining'] == '0') {
         throw RateLimitError(
@@ -33,19 +39,20 @@ class GitHubStars implements MassAppUrlSource {
   }
 
   @override
-  Future<List<String>> getUrls(List<String> args) async {
+  Future<Map<String, String>> getUrlsWithDescriptions(List<String> args) async {
     if (args.length != requiredArgs.length) {
       throw ObtainiumError('Wrong number of arguments provided');
     }
-    List<String> urls = [];
+    Map<String, String> urlsWithDescriptions = {};
     var page = 1;
     while (true) {
-      var pageUrls = await getOnePageOfUserStarredUrls(args[0], page++);
-      urls.addAll(pageUrls);
+      var pageUrls =
+          await getOnePageOfUserStarredUrlsWithDescriptions(args[0], page++);
+      urlsWithDescriptions.addAll(pageUrls);
       if (pageUrls.length < 100) {
         break;
       }
     }
-    return urls;
+    return urlsWithDescriptions;
   }
 }

lib/pages/apps.dart

@@ -528,6 +528,36 @@ class AppsPageState extends State<AppsPage> {
                                             tooltip: 'Share Selected App URLs',
                                             icon: const Icon(Icons.share),
                                           ),
+                                          IconButton(
+                                            onPressed: () {
+                                              showDialog(
+                                                  context: context,
+                                                  builder: (BuildContext ctx) {
+                                                    return GeneratedFormModal(
+                                                      title:
+                                                          'Reset Install Status for Selected Apps?',
+                                                      items: const [],
+                                                      defaultValues: const [],
+                                                      initValid: true,
+                                                      message:
+                                                          'The install status of ${selectedApps.length} App${selectedApps.length == 1 ? '' : 's'} will be reset.\n\nThis can help when the App version shown in Obtainium is incorrect due to failed updates or other issues.',
+                                                    );
+                                                  }).then((values) {
+                                                if (values != null) {
+                                                  appsProvider.saveApps(
+                                                      selectedApps.map((e) {
+                                                    e.installedVersion = null;
+                                                    return e;
+                                                  }).toList());
+                                                }
+                                              }).whenComplete(() {
+                                                Navigator.of(context).pop();
+                                              });
+                                            },
+                                            tooltip: 'Reset Install Status',
+                                            icon: const Icon(
+                                                Icons.restore_page_outlined),
+                                          ),
                                         ]),
                                   ),
                                 );

lib/pages/import_export.dart

@@ -12,6 +12,7 @@ import 'package:obtainium/providers/settings_provider.dart';
 import 'package:obtainium/providers/source_provider.dart';
 import 'package:provider/provider.dart';
 import 'package:file_picker/file_picker.dart';
+import 'package:url_launcher/url_launcher_string.dart';
 
 class ImportExportPage extends StatefulWidget {
   const ImportExportPage({super.key});
@@ -258,9 +259,11 @@ class _ImportExportPageState extends State<ImportExportPage> {
                                                     setState(() {
                                                       importInProgress = true;
                                                     });
-                                                    var urls = await source
-                                                        .search(values[0]);
-                                                    if (urls.isNotEmpty) {
+                                                    var urlsWithDescriptions =
+                                                        await source
+                                                            .search(values[0]);
+                                                    if (urlsWithDescriptions
+                                                        .isNotEmpty) {
                                                       var selectedUrls =
                                                           await showDialog<
                                                                   List<
@@ -270,7 +273,8 @@ class _ImportExportPageState extends State<ImportExportPage> {
                                                                   (BuildContext
                                                                       ctx) {
                                                                 return UrlSelectionModal(
-                                                                  urls: urls,
+                                                                  urlsWithDescriptions:
+                                                                      urlsWithDescriptions,
                                                                   defaultSelected:
                                                                       false,
                                                                 );
@@ -353,8 +357,10 @@ class _ImportExportPageState extends State<ImportExportPage> {
                                                     setState(() {
                                                       importInProgress = true;
                                                     });
-                                                    var urls = await source
-                                                        .getUrls(values);
+                                                    var urlsWithDescriptions =
+                                                        await source
+                                                            .getUrlsWithDescriptions(
+                                                                values);
                                                     var selectedUrls =
                                                         await showDialog<
                                                                 List<String>?>(
@@ -363,7 +369,8 @@ class _ImportExportPageState extends State<ImportExportPage> {
                                                                 (BuildContext
                                                                     ctx) {
                                                               return UrlSelectionModal(
-                                                                  urls: urls);
+                                                                  urlsWithDescriptions:
+                                                                      urlsWithDescriptions);
                                                             });
                                                     if (selectedUrls != null) {
                                                       var errors =
@@ -477,9 +484,11 @@ class _ImportErrorDialogState extends State<ImportErrorDialog> {
 // ignore: must_be_immutable
 class UrlSelectionModal extends StatefulWidget {
   UrlSelectionModal(
-      {super.key, required this.urls, this.defaultSelected = true});
+      {super.key,
+      required this.urlsWithDescriptions,
+      this.defaultSelected = true});
 
-  List<String> urls;
+  Map<String, String> urlsWithDescriptions;
   bool defaultSelected;
 
   @override
@@ -487,12 +496,13 @@ class UrlSelectionModal extends StatefulWidget {
 }
 
 class _UrlSelectionModalState extends State<UrlSelectionModal> {
-  Map<String, bool> urlSelections = {};
+  Map<MapEntry<String, String>, bool> urlWithDescriptionSelections = {};
   @override
   void initState() {
     super.initState();
-    for (var url in widget.urls) {
-      urlSelections.putIfAbsent(url, () => widget.defaultSelected);
+    for (var url in widget.urlsWithDescriptions.entries) {
+      urlWithDescriptionSelections.putIfAbsent(
+          url, () => widget.defaultSelected);
     }
   }
 
@@ -502,21 +512,48 @@ class _UrlSelectionModalState extends State<UrlSelectionModal> {
       scrollable: true,
       title: const Text('Select URLs to Import'),
       content: Column(children: [
-        ...urlSelections.keys.map((url) {
+        ...urlWithDescriptionSelections.keys.map((urlWithD) {
           return Row(children: [
             Checkbox(
-                value: urlSelections[url],
+                value: urlWithDescriptionSelections[urlWithD],
                 onChanged: (value) {
                   setState(() {
-                    urlSelections[url] = value ?? false;
+                    urlWithDescriptionSelections[urlWithD] = value ?? false;
                   });
                 }),
             const SizedBox(
               width: 8,
             ),
             Expanded(
-                child: Text(
-              Uri.parse(url).path.substring(1),
+                child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                const SizedBox(
+                  height: 8,
+                ),
+                GestureDetector(
+                    onTap: () {
+                      launchUrlString(urlWithD.key,
+                          mode: LaunchMode.externalApplication);
+                    },
+                    child: Text(
+                      Uri.parse(urlWithD.key).path.substring(1),
+                      style:
+                          const TextStyle(decoration: TextDecoration.underline),
+                      textAlign: TextAlign.start,
+                    )),
+                Text(
+                  urlWithD.value.length > 128
+                      ? '${urlWithD.value.substring(0, 128)}...'
+                      : urlWithD.value,
+                  style: const TextStyle(
+                      fontStyle: FontStyle.italic, fontSize: 12),
+                ),
+                const SizedBox(
+                  height: 8,
+                )
+              ],
             ))
           ]);
         })
@@ -529,12 +566,13 @@ class _UrlSelectionModalState extends State<UrlSelectionModal> {
             child: const Text('Cancel')),
         TextButton(
             onPressed: () {
-              Navigator.of(context).pop(urlSelections.keys
-                  .where((url) => urlSelections[url] ?? false)
+              Navigator.of(context).pop(urlWithDescriptionSelections.entries
+                  .where((entry) => entry.value)
+                  .map((e) => e.key.key)
                   .toList());
             },
             child: Text(
-                'Import ${urlSelections.values.where((b) => b).length} URLs'))
+                'Import ${urlWithDescriptionSelections.values.where((b) => b).length} URLs'))
       ],
     );
   }

lib/providers/apps_provider.dart

@@ -15,6 +15,7 @@ import 'package:installed_apps/installed_apps.dart';
 import 'package:obtainium/app_sources/github.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/providers/notifications_provider.dart';
+import 'package:obtainium/providers/settings_provider.dart';
 import 'package:package_archive_info/package_archive_info.dart';
 import 'package:provider/provider.dart';
 import 'package:path_provider/path_provider.dart';
@@ -182,6 +183,15 @@ class AppsProvider with ChangeNotifier {
     }
   }
 
+  Future<bool> canDowngradeApps() async {
+    try {
+      await InstalledApps.getAppInfo('com.berdik.letmedowngrade');
+      return true;
+    } catch (e) {
+      return false;
+    }
+  }
+
   // Unfortunately this 'await' does not actually wait for the APK to finish installing
   // So we only know that the install prompt was shown, but the user could still cancel w/o us knowing
   // If appropriate criteria are met, the update (never a fresh install) happens silently  in the background
@@ -195,7 +205,8 @@ class AppsProvider with ChangeNotifier {
       // OK
     }
     if (appInfo != null &&
-        int.parse(newInfo.buildNumber) < appInfo.versionCode!) {
+        int.parse(newInfo.buildNumber) < appInfo.versionCode! &&
+        !(await canDowngradeApps())) {
       throw DowngradeError();
     }
     if (appInfo == null ||
@@ -300,10 +311,10 @@ class AppsProvider with ChangeNotifier {
 
     // If Obtainium is being installed, it should be the last one
     List<DownloadedApk> moveObtainiumToStart(List<DownloadedApk> items) {
-      String obtainiumId = 'imranr98_obtainium_${GitHub().host}';
       DownloadedApk? temp;
       items.removeWhere((element) {
-        bool res = element.appId == obtainiumId;
+        bool res =
+            element.appId == obtainiumId || element.appId == obtainiumTempId;
         if (res) {
           temp = element;
         }

lib/providers/settings_provider.dart

@@ -2,9 +2,13 @@
 
 import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
+import 'package:obtainium/app_sources/github.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
+String obtainiumTempId = 'imranr98_obtainium_${GitHub().host}';
+String obtainiumId = 'dev.imranr.obtainium';
+
 enum ThemeSettings { system, light, dark }
 
 enum ColourSettings { basic, materialYou }

lib/providers/source_provider.dart

@@ -159,7 +159,7 @@ class AppSource {
   }
 
   bool canSearch = false;
-  Future<List<String>> search(String query) {
+  Future<Map<String, String>> search(String query) {
     throw NotImplementedError();
   }
 }
@@ -167,7 +167,7 @@ class AppSource {
 abstract class MassAppUrlSource {
   late String name;
   late List<String> requiredArgs;
-  Future<List<String>> getUrls(List<String> args);
+  Future<Map<String, String>> getUrlsWithDescriptions(List<String> args);
 }
 
 class SourceProvider {

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.7.0+56 # When changing this, update the tag in main() accordingly
+version: 0.7.1+57 # When changing this, update the tag in main() accordingly
 
 environment:
   sdk: '>=2.18.2 <3.0.0'