Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: compose-dev
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/java/app/revanced/manager/domain/repository/DownloadedAppRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ class DownloadedAppRepository(
val pkgInfo =
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 (expectedVersion != null && pkgInfo.versionName != expectedVersion) error("Downloaded APK has the wrong version. Expected: $expectedVersion, Actual: ${pkgInfo.versionName}")
if (expectedVersion != null && pkgInfo.versionName != expectedVersion) error("The version of the app you have selected does not match the suggested version.\nPlease use the suggested version: $expectedVersion\n\nTo continue anyway, disable \"Require suggested app version\" in the advanced settings.")

// Delete the previous copy (if present).
dao.get(pkgInfo.packageName, pkgInfo.versionName!!)?.directory?.let {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/app/revanced/manager/patcher/worker/PatcherWorker.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ class PatcherWorker(
plugin,
data,
args.packageName,
args.input.version,
if (prefs.suggestedVersionSafeguard.get()) args.input.version else null,
onDownload = args.onDownloadProgress
).also {
args.setInputFile(it)
Expand Down