Merge pull request #1008 from ImranR98/dev

Fix broken search (#1006)

lib/app_sources/fdroidrepo.dart

@@ -8,6 +8,7 @@ class FDroidRepo extends AppSource {
   FDroidRepo() {
     name = tr('fdroidThirdPartyRepo');
     canSearch = true;
+    excludeFromMassSearch = true;
     neverAutoSelect = true;
 
     additionalSourceAppSpecificSettingFormItems = [

lib/main.dart

@@ -19,7 +19,7 @@ import 'package:easy_localization/src/easy_localization_controller.dart';
 // ignore: implementation_imports
 import 'package:easy_localization/src/localization.dart';
 
-const String currentVersion = '0.14.29';
+const String currentVersion = '0.14.30';
 const String currentReleaseTag =
     'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES
 

lib/pages/add_app.dart

@@ -153,8 +153,7 @@ class _AddAppPageState extends State<AddAppPage> {
               overrideSource: pickedSourceOverride,
               inferAppIdIfOptional: inferAppIdIfOptional);
           // Only download the APK here if you need to for the package ID
-          if (isTempId(app) &&
+          if (isTempId(app) && app.additionalSettings['trackOnly'] != true) {
-              app.additionalSettings['trackOnly'] != true) {
             // ignore: use_build_context_synchronously
             var apkUrl = await appsProvider.confirmApkUrl(app, context);
             if (apkUrl == null) {
@@ -260,8 +259,9 @@ class _AddAppPageState extends State<AddAppPage> {
         searching = true;
       });
       try {
-        var results = await Future.wait(
+        var results = await Future.wait(sourceProvider.sources
-            sourceProvider.sources.where((e) => e.canSearch).map((e) async {
+            .where((e) => e.canSearch && !e.excludeFromMassSearch)
+            .map((e) async {
           try {
             return await e.search(searchQuery);
           } catch (err) {

lib/pages/import_export.dart

@@ -141,7 +141,8 @@ class _ImportExportPageState extends State<ImportExportPage> {
               }
             });
             appsProvider.addMissingCategories(settingsProvider);
-            showMessage(tr('importedX', args: [plural('apps', value)]), context);
+            showMessage(
+                tr('importedX', args: [plural('apps', value)]), context);
           });
         } else {
           // User canceled the picker

lib/providers/source_provider.dart

@@ -494,6 +494,7 @@ abstract class AppSource {
   }
 
   bool canSearch = false;
+  bool excludeFromMassSearch = false;
   List<GeneratedFormItem> searchQuerySettingFormItems = [];
   Future<Map<String, List<String>>> search(String query,
       {Map<String, dynamic> querySettings = const {}}) {
@@ -605,7 +606,8 @@ class SourceProvider {
       }
     }
     if (source == null) {
-      for (var s in sources.where((element) => element.host == null && !element.neverAutoSelect)) {
+      for (var s in sources.where(
+          (element) => element.host == null && !element.neverAutoSelect)) {
         try {
           s.sourceSpecificStandardizeURL(url);
           source = s;

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.14.29+221 # When changing this, update the tag in main() accordingly
+version: 0.14.30+222 # When changing this, update the tag in main() accordingly
 
 environment:
   sdk: '>=3.0.0 <4.0.0'