Fix broken thrid-party f-droid search (#1094)

ImranR98 · Nov 18, 2023 · 4c53b58 · 4c53b58
1 parent 6102ab4
commit 4c53b58
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/lib/pages/import_export.dart b/lib/pages/import_export.dart
@@ -214,7 +214,8 @@ class _ImportExportPageState extends State<ImportExportPage> {
  );
  });
  if (selectedUrls != null && selectedUrls.isNotEmpty) {
- var errors = await appsProvider.addAppsByURL(selectedUrls);
+ var errors = await appsProvider.addAppsByURL(selectedUrls,
+ sourceOverride: source);
  if (errors.isEmpty) {
  // ignore: use_build_context_synchronously
  showMessage(

diff --git a/lib/providers/apps_provider.dart b/lib/providers/apps_provider.dart
@@ -1217,9 +1217,11 @@ class AppsProvider with ChangeNotifier {
  super.dispose();
  }
 
- Future<List<List<String>>> addAppsByURL(List<String> urls) async {
+ Future<List<List<String>>> addAppsByURL(List<String> urls,
+ {AppSource? sourceOverride}) async {
  List<dynamic> results = await SourceProvider().getAppsByURLNaive(urls,
- alreadyAddedUrls: apps.values.map((e) => e.app.url).toList());
+ alreadyAddedUrls: apps.values.map((e) => e.app.url).toList(),
+ sourceOverride: sourceOverride);
  List<App> pps = results[0];
  Map<String, dynamic> errorsMap = results[1];
  for (var app in pps) {

diff --git a/lib/providers/source_provider.dart b/lib/providers/source_provider.dart
@@ -706,15 +706,16 @@ class SourceProvider {
 
  // Returns errors in [results, errors] instead of throwing them
  Future<List<dynamic>> getAppsByURLNaive(List<String> urls,
- {List<String> alreadyAddedUrls = const []}) async {
+ {List<String> alreadyAddedUrls = const [],
+ AppSource? sourceOverride}) async {
  List<App> apps = [];
  Map<String, dynamic> errors = {};
  for (var url in urls) {
  try {
  if (alreadyAddedUrls.contains(url)) {
  throw ObtainiumError(tr('appAlreadyAdded'));
  }
- var source = getSource(url);
+ var source = sourceOverride ?? getSource(url);
  apps.add(await getApp(
  source,
  url,