peter/Obtainium
1
0
Fork 0
mirror of https://github.com/ImranR98/Obtainium.git synced 2025-07-16 22:56:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix "illegal encoding" error (#1563), Remove foreground requirement for Shizuku (#1561)

Browse Source
This commit is contained in:
Imran Remtulla
2024-04-23 14:35:28 -04:00
parent ec240f946e
commit 27fc60d437
2 changed files with 61 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
lib/app_sources/html.dart
View File

@ -243,19 +243,28 @@ class HTML extends AppSource {
if ((additionalSettings['customLinkFilterRegex'] as String?)?.isNotEmpty ==
true) {
var reg = RegExp(additionalSettings['customLinkFilterRegex']);
links = allLinks
.where((element) => reg.hasMatch(
filterLinkByText ? element.value : Uri.decodeFull(element.key)))
.toList();
links = allLinks.where((element) {
var link = element.key;
try {
link = Uri.decodeFull(element.key);
} catch (e) {
// Some links may not have valid encoding
}
return reg.hasMatch(filterLinkByText ? element.value : link);
}).toList();
} else {
links = allLinks
.where((element) => Uri.parse(filterLinkByText
? element.value
: Uri.decodeFull(element.key))
.path
.toLowerCase()
.endsWith('.apk'))
.toList();
links = allLinks.where((element) {
var link = element.key;
try {
link = Uri.decodeFull(element.key);
} catch (e) {
// Some links may not have valid encoding
}
return Uri.parse(filterLinkByText ? element.value : link)
.path
.toLowerCase()
.endsWith('.apk');
}).toList();
}
if (!skipSort) {
links.sort((a, b) => additionalSettings['sortByLastLinkSegment'] == true
@ -310,13 +319,19 @@ class HTML extends AppSource {
links = [MapEntry(currentUrl, currentUrl)];
}
var rel = links.last.key;
var relDecoded = rel;
try {
relDecoded = Uri.decodeFull(rel);
} catch (e) {
// Some links may not have valid encoding
}
String? version;
version = extractVersion(
additionalSettings['versionExtractionRegEx'] as String?,
additionalSettings['matchGroupToUse'] as String?,
additionalSettings['versionExtractWholePage'] == true
? versionExtractionWholePageString
: Uri.decodeFull(rel));
: relDecoded);
version ??=
additionalSettings['defaultPseudoVersioningMethod'] == 'APKLinkHash'
? rel.hashCode.toString()