Merge pull request #1228 from ImranR98/dev

Save Search Preferences (#1226)

lib/app_sources/apkcombo.dart

@@ -10,7 +10,7 @@ class APKCombo extends AppSource {
 
   @override
   String sourceSpecificStandardizeURL(String url) {
-    RegExp standardUrlRegEx = RegExp('^https?://$host/+[^/]+/+[^/]+');
+    RegExp standardUrlRegEx = RegExp('^https?://(www\\.)?$host/+[^/]+/+[^/]+');
     var match = standardUrlRegEx.firstMatch(url.toLowerCase());
     if (match == null) {
       throw InvalidURLError(name);

lib/app_sources/apkpure.dart

@@ -34,7 +34,7 @@ class APKPure extends AppSource {
       url = 'https://$host${Uri.parse(url).path}';
     }
     RegExp standardUrlRegExA =
-        RegExp('^https?://$host/+[^/]+/+[^/]+(/+[^/]+)?');
+        RegExp('^https?://(www\\.)?$host/+[^/]+/+[^/]+(/+[^/]+)?');
     match = standardUrlRegExA.firstMatch(url.toLowerCase());
     if (match == null) {
       throw InvalidURLError(name);

lib/app_sources/codeberg.dart

@@ -16,7 +16,7 @@ class Codeberg extends AppSource {
 
   @override
   String sourceSpecificStandardizeURL(String url) {
-    RegExp standardUrlRegEx = RegExp('^https?://$host/[^/]+/[^/]+');
+    RegExp standardUrlRegEx = RegExp('^https?://(www\\.)?$host/[^/]+/[^/]+');
     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
     if (match == null) {
       throw InvalidURLError(name);

lib/app_sources/fdroid.dart

@@ -38,13 +38,14 @@ class FDroid extends AppSource {
   @override
   String sourceSpecificStandardizeURL(String url) {
     RegExp standardUrlRegExB =
-        RegExp('^https?://$host/+[^/]+/+packages/+[^/]+');
+        RegExp('^https?://(www\\.)?$host/+[^/]+/+packages/+[^/]+');
     RegExpMatch? match = standardUrlRegExB.firstMatch(url.toLowerCase());
     if (match != null) {
       url =
           'https://${Uri.parse(url.substring(0, match.end)).host}/packages/${Uri.parse(url).pathSegments.last}';
     }
-    RegExp standardUrlRegExA = RegExp('^https?://$host/+packages/+[^/]+');
+    RegExp standardUrlRegExA =
+        RegExp('^https?://(www\\.)?$host/+packages/+[^/]+');
     match = standardUrlRegExA.firstMatch(url.toLowerCase());
     if (match == null) {
       throw InvalidURLError(name);

lib/app_sources/github.dart

@@ -149,7 +149,7 @@ class GitHub extends AppSource {
 
   @override
   String sourceSpecificStandardizeURL(String url) {
-    RegExp standardUrlRegEx = RegExp('^https?://$host/[^/]+/[^/]+');
+    RegExp standardUrlRegEx = RegExp('^https?://(www\\.)?$host/[^/]+/[^/]+');
     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
     if (match == null) {
       throw InvalidURLError(name);

lib/app_sources/gitlab.dart

@@ -52,7 +52,7 @@ class GitLab extends AppSource {
 
   @override
   String sourceSpecificStandardizeURL(String url) {
-    RegExp standardUrlRegEx = RegExp('^https?://$host/[^/]+/[^/]+');
+    RegExp standardUrlRegEx = RegExp('^https?://(www\\.)?$host/[^/]+/[^/]+');
     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
     if (match == null) {
       throw InvalidURLError(name);

lib/app_sources/huaweiappgallery.dart

@@ -13,7 +13,7 @@ class HuaweiAppGallery extends AppSource {
 
   @override
   String sourceSpecificStandardizeURL(String url) {
-    RegExp standardUrlRegEx = RegExp('^https?://$host/app/[^/]+');
+    RegExp standardUrlRegEx = RegExp('^https?://(www\\.)?$host/app/[^/]+');
     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
     if (match == null) {
       throw InvalidURLError(name);

lib/app_sources/mullvad.dart

@@ -11,7 +11,7 @@ class Mullvad extends AppSource {
 
   @override
   String sourceSpecificStandardizeURL(String url) {
-    RegExp standardUrlRegEx = RegExp('^https?://$host');
+    RegExp standardUrlRegEx = RegExp('^https?://(www\\.)?$host');
     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
     if (match == null) {
       throw InvalidURLError(name);

lib/app_sources/neutroncode.dart

@@ -10,7 +10,8 @@ class NeutronCode extends AppSource {
 
   @override
   String sourceSpecificStandardizeURL(String url) {
-    RegExp standardUrlRegEx = RegExp('^https?://$host/downloads/file/[^/]+');
+    RegExp standardUrlRegEx =
+        RegExp('^https?://(www\\.)?$host/downloads/file/[^/]+');
     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
     if (match == null) {
       throw InvalidURLError(name);

lib/app_sources/sourceforge.dart

@@ -10,13 +10,14 @@ class SourceForge extends AppSource {
 
   @override
   String sourceSpecificStandardizeURL(String url) {
-    RegExp standardUrlRegExB = RegExp('^https?://$host/p/[^/]+');
+    RegExp standardUrlRegExB = RegExp('^https?://(www\\.)?$host/p/[^/]+');
     RegExpMatch? match = standardUrlRegExB.firstMatch(url.toLowerCase());
     if (match != null) {
       url =
           'https://${Uri.parse(url.substring(0, match.end)).host}/projects/${url.substring(Uri.parse(url.substring(0, match.end)).host.length + '/projects/'.length + 1)}';
     }
-    RegExp standardUrlRegExA = RegExp('^https?://$host/projects/[^/]+');
+    RegExp standardUrlRegExA =
+        RegExp('^https?://(www\\.)?$host/projects/[^/]+');
     match = standardUrlRegExA.firstMatch(url.toLowerCase());
     if (match == null) {
       throw InvalidURLError(name);

lib/app_sources/sourcehut.dart

@@ -20,7 +20,7 @@ class SourceHut extends AppSource {
 
   @override
   String sourceSpecificStandardizeURL(String url) {
-    RegExp standardUrlRegEx = RegExp('^https?://$host/[^/]+/[^/]+');
+    RegExp standardUrlRegEx = RegExp('^https?://(www\\.)?$host/[^/]+/[^/]+');
     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
     if (match == null) {
       throw InvalidURLError(name);

lib/app_sources/whatsapp.dart

@@ -6,6 +6,8 @@ import 'package:obtainium/providers/source_provider.dart';
 class WhatsApp extends AppSource {
   WhatsApp() {
     host = 'whatsapp.com';
+    overrideVersionDetectionFormDefault('noVersionDetection',
+        disableStandard: true, disableRelDate: true);
   }
 
   @override

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.15.2';
+const String currentVersion = '0.15.3';
 const String currentReleaseTag =
     'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES
 
@@ -152,7 +152,6 @@ class _ObtainiumState extends State<Obtainium> {
             requiresStorageNotLow: false,
             requiresDeviceIdle: false,
             requiredNetworkType: NetworkType.ANY), (String taskId) async {
-      // We don't want periodic tasks in the foreground - ignore
       await bgUpdateCheck(taskId, null);
       BackgroundFetch.finish(taskId);
     }, (String taskId) async {

lib/pages/add_app.dart

@@ -286,10 +286,14 @@ class AddAppPageState extends State<AddAppPage> {
                     selectedByDefault: true,
                     onlyOneSelectionAllowed: false,
                     titlesAreLinks: false,
+                    deselectThese: settingsProvider.searchDeselected,
                   );
                 }) ??
             [];
         if (searchSources.isNotEmpty) {
+          settingsProvider.searchDeselected = sourceStrings.keys
+              .where((s) => !searchSources.contains(s))
+              .toList();
           var results = await Future.wait(sourceProvider.sources
               .where((e) => searchSources.contains(e.name))
               .map((e) async {
@@ -306,7 +310,6 @@ class AddAppPageState extends State<AddAppPage> {
             }
           }));
 
-          // .then((results) async {
           // Interleave results instead of simple reduce
           Map<String, List<String>> res = {};
           var si = 0;

lib/pages/import_export.dart

@@ -604,11 +604,13 @@ class SelectionModal extends StatefulWidget {
       this.selectedByDefault = true,
       this.onlyOneSelectionAllowed = false,
       this.titlesAreLinks = true,
-      this.title});
+      this.title,
+      this.deselectThese = const []});
 
   String? title;
   Map<String, List<String>> entries;
   bool selectedByDefault;
+  List<String> deselectThese;
   bool onlyOneSelectionAllowed;
   bool titlesAreLinks;
 
@@ -622,9 +624,13 @@ class _SelectionModalState extends State<SelectionModal> {
   @override
   void initState() {
     super.initState();
-    for (var url in widget.entries.entries) {
+    for (var entry in widget.entries.entries) {
-      entrySelections.putIfAbsent(url,
+      entrySelections.putIfAbsent(
-          () => widget.selectedByDefault && !widget.onlyOneSelectionAllowed);
+          entry,
+          () =>
+              widget.selectedByDefault &&
+              !widget.onlyOneSelectionAllowed &&
+              !widget.deselectThese.contains(entry.key));
     }
     if (widget.selectedByDefault && widget.onlyOneSelectionAllowed) {
       selectOnlyOne(widget.entries.entries.first.key);

lib/providers/settings_provider.dart

@@ -446,4 +446,13 @@ class SettingsProvider with ChangeNotifier {
     prefs?.setBool('parallelDownloads', val);
     notifyListeners();
   }
+
+  List<String> get searchDeselected {
+    return prefs?.getStringList('searchDeselected') ?? [];
+  }
+
+  set searchDeselected(List<String> list) {
+    prefs?.setStringList('searchDeselected', list);
+    notifyListeners();
+  }
 }

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.15.2+238 # When changing this, update the tag in main() accordingly
+version: 0.15.3+239 # When changing this, update the tag in main() accordingly
 
 environment:
   sdk: '>=3.0.0 <4.0.0'