peter/Obtainium
1
0
Fork 0
mirror of https://github.com/ImranR98/Obtainium.git synced 2025-08-19 13:09:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix occasional RangeError after importing apps (#2438)

Browse Source
This commit is contained in:
Imran Remtulla
2025-08-01 16:46:17 -04:00
parent 8204a16e90
commit 8f9978aadd
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/pages/home.dart
View File

@@ -14,7 +14,6 @@ import 'package:obtainium/pages/import_export.dart';
import 'package:obtainium/pages/settings.dart'; import 'package:obtainium/pages/settings.dart';
import 'package:obtainium/providers/apps_provider.dart'; import 'package:obtainium/providers/apps_provider.dart';
import 'package:obtainium/providers/settings_provider.dart'; import 'package:obtainium/providers/settings_provider.dart';
import 'package:obtainium/providers/source_provider.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:url_launcher/url_launcher_string.dart'; import 'package:url_launcher/url_launcher_string.dart';
@@ -201,14 +200,6 @@ class _HomePageState extends State<HomePage> {
), ),
context, context,
); );
await appsProvider
.checkUpdates(specificIds: result.key.map((e) => e.id).toList())
.catchError((e) {
if (e is Map && e['errors'] is MultiAppMultiError) {
showError(e['errors'].toString(), context);
}
return <App>[];
});
} }
} else { } else {
throw ObtainiumError(tr('unknown')); throw ObtainiumError(tr('unknown'));

14
lib/providers/apps_provider.dart
View File

@@ -1025,13 +1025,19 @@ class AppsProvider with ChangeNotifier {
); );
} }
getHost(String url) { getHost(String url) {
if (url == 'placeholder') {
return null;
}
var temp = Uri.parse(url).host.split('.'); var temp = Uri.parse(url).host.split('.');
return temp.sublist(temp.length - 2).join('.'); return temp.sublist(temp.length - 2).join('.');
} }
// If the picked APK comes from an origin different from the source, get user confirmation (if context provided) // If the picked APK comes from an origin different from the source, get user confirmation (if context provided)
if (appFileUrl != null && if (appFileUrl != null &&
getHost(appFileUrl.value) != getHost(app.url) && ![
getHost(app.url),
'placeholder',
].contains(getHost(appFileUrl.value)) &&
context != null) { context != null) {
if (!(settingsProvider.hideAPKOriginWarning) && if (!(settingsProvider.hideAPKOriginWarning) &&
await showDialog( await showDialog(
@@ -1077,7 +1083,8 @@ class AppsProvider with ChangeNotifier {
MapEntry<String, String>? apkUrl; MapEntry<String, String>? apkUrl;
var trackOnly = apps[id]!.app.additionalSettings['trackOnly'] == true; var trackOnly = apps[id]!.app.additionalSettings['trackOnly'] == true;
var refreshBeforeDownload = var refreshBeforeDownload =
apps[id]!.app.additionalSettings['refreshBeforeDownload'] == true; apps[id]!.app.additionalSettings['refreshBeforeDownload'] == true ||
apps[id]!.app.apkUrls.first.value == 'placeholder';
if (refreshBeforeDownload) { if (refreshBeforeDownload) {
await checkUpdate(apps[id]!.app.id); await checkUpdate(apps[id]!.app.id);
} }
@@ -1301,7 +1308,8 @@ class AppsProvider with ChangeNotifier {
} }
MapEntry<String, String>? fileUrl; MapEntry<String, String>? fileUrl;
var refreshBeforeDownload = var refreshBeforeDownload =
apps[id]!.app.additionalSettings['refreshBeforeDownload'] == true; apps[id]!.app.additionalSettings['refreshBeforeDownload'] == true ||
apps[id]!.app.apkUrls.first.value == 'placeholder';
if (refreshBeforeDownload) { if (refreshBeforeDownload) {
await checkUpdate(apps[id]!.app.id); await checkUpdate(apps[id]!.app.id);
} }