ReVanced/revanced-manager
1
0
Fork 0
mirror of https://github.com/ReVanced/revanced-manager.git synced 2026-01-11 21:56:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Allow different app version when downloading via plugin if setting is off (#2579)

Browse Source 
Co-authored-by: Ax333l <main@axelen.xyz>
This commit is contained in:
brosssh
2025-07-05 18:44:11 +02:00
committed by oSumAtrIX
parent 1fb94b711f
commit 59d233e15c
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/app/revanced/manager/domain/repository/DownloadedAppRepository.kt
View File

@@ -40,6 +40,8 @@ class DownloadedAppRepository(
data: Parcelable, data: Parcelable,
expectedPackageName: String, expectedPackageName: String,
expectedVersion: String?, expectedVersion: String?,
appCompatibilityCheck: Boolean,
patchesCompatibilityCheck: Boolean,
onDownload: suspend (downloadProgress: Pair<Long, Long?>) -> Unit, onDownload: suspend (downloadProgress: Pair<Long, Long?>) -> Unit,
): File { ): File {
// Converted integers cannot contain / or .. unlike the package name or version, so they are safer to use here. // Converted integers cannot contain / or .. unlike the package name or version, so they are safer to use here.
@@ -96,7 +98,12 @@ class DownloadedAppRepository(
val pkgInfo = val pkgInfo =
pm.getPackageInfo(targetFile.toFile()) ?: error("Downloaded APK file is invalid") pm.getPackageInfo(targetFile.toFile()) ?: error("Downloaded APK file is invalid")
if (pkgInfo.packageName != expectedPackageName) error("Downloaded APK has the wrong package name. Expected: $expectedPackageName, Actual: ${pkgInfo.packageName}") if (pkgInfo.packageName != expectedPackageName) error("Downloaded APK has the wrong package name. Expected: $expectedPackageName, Actual: ${pkgInfo.packageName}")
if (expectedVersion != null && pkgInfo.versionName != expectedVersion) error("Downloaded APK has the wrong version. Expected: $expectedVersion, Actual: ${pkgInfo.versionName}") expectedVersion?.let {
if (
pkgInfo.versionName != expectedVersion &&
(appCompatibilityCheck || patchesCompatibilityCheck)
) error("The selected app version ($pkgInfo.versionName) doesn't match the suggested version. Please use the suggested version ($expectedVersion), or adjust your settings by disabling \"Require suggested app version\" and enabling \"Disable version compatibility check\".")
}
// Delete the previous copy (if present). // Delete the previous copy (if present).
dao.get(pkgInfo.packageName, pkgInfo.versionName!!)?.directory?.let { dao.get(pkgInfo.packageName, pkgInfo.versionName!!)?.directory?.let {

2
app/src/main/java/app/revanced/manager/patcher/worker/PatcherWorker.kt
View File

@@ -158,6 +158,8 @@ class PatcherWorker(
data, data,
args.packageName, args.packageName,
args.input.version, args.input.version,
prefs.suggestedVersionSafeguard.get(),
!prefs.disablePatchVersionCompatCheck.get(),
onDownload = args.onDownloadProgress onDownload = args.onDownloadProgress
).also { ).also {
args.setInputFile(it) args.setInputFile(it)