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

Merge branch 'main' into re7gog

Browse Source 
# Conflicts:
#	pubspec.lock
This commit is contained in:
Gregory Velichko
2024-04-19 18:07:51 +03:00
parent c16cda1962 8c2a97e092
commit 0ddb5b5e81
12 changed files with 166 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
lib/providers/apps_provider.dart
View File

@@ -235,8 +235,9 @@ Future<File> downloadFile(
var fullContentLength = response.contentLength;
if (useExisting && downloadedFile.existsSync()) {
var length = downloadedFile.lengthSync();
if (fullContentLength == null) {
// Assume full
if (fullContentLength == null || !rangeFeatureEnabled) {
// If there is no content length reported, assume it the existing file is fully downloaded
// Also if the range feature is not supported, don't trust the content length if any (#1542)
client.close();
return downloadedFile;
} else {
@@ -291,14 +292,11 @@ Future<File> downloadFile(
return s;
}).pipe(sink);
await sink.close();
bool likelyCorruptFile = (progress ?? 0) > 101;
progress = null;
if (onProgress != null) {
onProgress(progress);
}
if (response.statusCode < 200 ||
response.statusCode > 299 ||
likelyCorruptFile) {
if (response.statusCode < 200 || response.statusCode > 299) {
tempDownloadedFile.deleteSync(recursive: true);
throw response.reasonPhrase ?? tr('unexpectedError');
}
@@ -392,30 +390,26 @@ class AppsProvider with ChangeNotifier {
}();
}
Future<File> handleAPKIDChange(App app, PackageInfo? newInfo,
Future<File> handleAPKIDChange(App app, PackageInfo newInfo,
File downloadedFile, String downloadUrl) async {
// If the APK package ID is different from the App ID, it is either new (using a placeholder ID) or the ID has changed
// The former case should be handled (give the App its real ID), the latter is a security issue
var isTempIdBool = isTempId(app);
if (newInfo != null) {
if (app.id != newInfo.packageName) {
if (apps[app.id] != null && !isTempIdBool && !app.allowIdChange) {
throw IDChangedError(newInfo.packageName!);
}
var idChangeWasAllowed = app.allowIdChange;
app.allowIdChange = false;
var originalAppId = app.id;
app.id = newInfo.packageName!;
downloadedFile = downloadedFile.renameSync(
'${downloadedFile.parent.path}/${app.id}-${downloadUrl.hashCode}.${downloadedFile.path.split('.').last}');
if (apps[originalAppId] != null) {
await removeApps([originalAppId]);
await saveApps([app],
onlyIfExists: !isTempIdBool && !idChangeWasAllowed);
}
if (app.id != newInfo.packageName) {
if (apps[app.id] != null && !isTempIdBool && !app.allowIdChange) {
throw IDChangedError(newInfo.packageName!);
}
var idChangeWasAllowed = app.allowIdChange;
app.allowIdChange = false;
var originalAppId = app.id;
app.id = newInfo.packageName!;
downloadedFile = downloadedFile.renameSync(
'${downloadedFile.parent.path}/${app.id}-${downloadUrl.hashCode}.${downloadedFile.path.split('.').last}');
if (apps[originalAppId] != null) {
await removeApps([originalAppId]);
await saveApps([app],
onlyIfExists: !isTempIdBool && !idChangeWasAllowed);
}
} else if (isTempIdBool) {
throw ObtainiumError('Could not get ID from APK');
}
return downloadedFile;
}
@@ -479,6 +473,10 @@ class AppsProvider with ChangeNotifier {
newInfo =
await pm.getPackageArchiveInfo(archiveFilePath: apks.first.path);
}
if (newInfo == null) {
downloadedFile.delete();
throw ObtainiumError('Could not get ID from APK');
}
downloadedFile =
await handleAPKIDChange(app, newInfo, downloadedFile, downloadUrl);
// Delete older versions of the file if any