peter/Obtainium
1
0
Fork 0
mirror of https://github.com/ImranR98/Obtainium.git synced 2025-10-31 05:23:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Better error for some incompatible APK cases (#981)

Browse Source
This commit is contained in:
Imran Remtulla
2023-10-12 19:24:23 -04:00
parent 503a01675e
commit e613a494ff
1 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lib/providers/apps_provider.dart
View File

@@ -263,25 +263,29 @@ class AppsProvider with ChangeNotifier {
return downloadedFile; return downloadedFile;
} }
Future<File> handleAPKIDChange(App app, PackageInfo newInfo, Future<File> handleAPKIDChange(App app, PackageInfo? newInfo,
File downloadedFile, String downloadUrl) async { 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 // 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 // The former case should be handled (give the App its real ID), the latter is a security issue
if (app.id != newInfo.packageName) { var isTempId = SourceProvider().isTempId(app);
var isTempId = SourceProvider().isTempId(app); if (newInfo != null) {
if (apps[app.id] != null && !isTempId && !app.allowIdChange) { if (app.id != newInfo.packageName) {
throw IDChangedError(newInfo.packageName!); if (apps[app.id] != null && !isTempId && !app.allowIdChange) {
} throw IDChangedError(newInfo.packageName!);
var idChangeWasAllowed = app.allowIdChange; }
app.allowIdChange = false; var idChangeWasAllowed = app.allowIdChange;
var originalAppId = app.id; app.allowIdChange = false;
app.id = newInfo.packageName!; var originalAppId = app.id;
downloadedFile = downloadedFile.renameSync( app.id = newInfo.packageName!;
'${downloadedFile.parent.path}/${app.id}-${downloadUrl.hashCode}.${downloadedFile.path.split('.').last}'); downloadedFile = downloadedFile.renameSync(
if (apps[originalAppId] != null) { '${downloadedFile.parent.path}/${app.id}-${downloadUrl.hashCode}.${downloadedFile.path.split('.').last}');
await removeApps([originalAppId]); if (apps[originalAppId] != null) {
await saveApps([app], onlyIfExists: !isTempId && !idChangeWasAllowed); await removeApps([originalAppId]);
await saveApps([app], onlyIfExists: !isTempId && !idChangeWasAllowed);
}
} }
} else if (isTempId) {
throw ObtainiumError('Could not get ID from APK');
} }
return downloadedFile; return downloadedFile;
} }
@@ -344,7 +348,7 @@ class AppsProvider with ChangeNotifier {
await pm.getPackageArchiveInfo(archiveFilePath: apks.first.path); await pm.getPackageArchiveInfo(archiveFilePath: apks.first.path);
} }
downloadedFile = downloadedFile =
await handleAPKIDChange(app, newInfo!, downloadedFile, downloadUrl); await handleAPKIDChange(app, newInfo, downloadedFile, downloadUrl);
// Delete older versions of the file if any // Delete older versions of the file if any
for (var file in downloadedFile.parent.listSync()) { for (var file in downloadedFile.parent.listSync()) {
var fn = file.path.split('/').last; var fn = file.path.split('/').last;