ReVanced-Mirror/revanced-integrations
1
0
Fork 0
mirror of https://github.com/revanced/revanced-integrations.git synced 2024-11-27 14:26:49 +01:00
Code Issues Projects Releases Wiki Activity

fix(YouTube - Check environment patch): Show if patched apk is too old, if the install source is not Manager or ADB

Browse Source
This commit is contained in:
LisoUseInAIKyrios 2024-09-06 05:39:33 -04:00
parent dffe7f6c34
commit 18048f3324
1 changed files with 26 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
app/src/main/java/app/revanced/integrations/shared/checks/CheckEnvironmentPatch.java
View File

@ -188,6 +188,7 @@ public final class CheckEnvironmentPatch {
*/
long durationBetweenPatchingAndInstallation;
@NonNull
@Override
protected Boolean check() {
try {
@ -213,8 +214,7 @@ public final class CheckEnvironmentPatch {
}
// User installed more than 30 minutes after patching.
// Don't fail this, to allow adb install of older patched apps.
return null;
return false;
}
@Override
@ -271,34 +271,33 @@ public final class CheckEnvironmentPatch {
failedChecks.add(sameHardware);
}
CheckIsNearPatchTime nearPatchTime = new CheckIsNearPatchTime();
Boolean timeCheckPassed = nearPatchTime.check();
if (timeCheckPassed != null) {
if (timeCheckPassed && !DEBUG_ALWAYS_SHOW_CHECK_FAILED_DIALOG) {
if (failedChecks.isEmpty()) {
// Recently patched and installed. No further checks are needed.
// Stopping here also prevents showing warnings if patching and installing with Termux.
CheckExpectedInstaller installerCheck = new CheckExpectedInstaller();
if (installerCheck.check() && !DEBUG_ALWAYS_SHOW_CHECK_FAILED_DIALOG) {
// If the installer package is Manager but this code is reached,
// that means it must not be the right Manager otherwise the hardware hash
// signatures would be present and this check would not have run.
if (installerCheck.installerFound == InstallationType.MANAGER) {
failedChecks.add(installerCheck);
// Also could not have been patched on this device.
failedChecks.add(sameHardware);
} else if (failedChecks.isEmpty()) {
// ADB install of CLI build. Allow even if patched a long time ago.
Check.disableForever();
return;
}
} else {
failedChecks.add(nearPatchTime);
}
}
CheckExpectedInstaller installerCheck = new CheckExpectedInstaller();
// If the installer package is Manager but this code is reached,
// that means it must not be the right Manager otherwise the hardware hash
// signatures would be present and this check would not have run.
final boolean isManagerInstall = installerCheck.installerFound == InstallationType.MANAGER;
if (!installerCheck.check() || isManagerInstall) {
failedChecks.add(installerCheck);
if (isManagerInstall) {
// If using Manager and reached here, then this must
// have been patched on a different device.
failedChecks.add(sameHardware);
}
CheckIsNearPatchTime nearPatchTime = new CheckIsNearPatchTime();
Boolean timeCheckPassed = nearPatchTime.check();
if (timeCheckPassed && !DEBUG_ALWAYS_SHOW_CHECK_FAILED_DIALOG) {
// Allow installing recently patched apks,
// even if the install source is not Manager or ADB.
Check.disableForever();
return;
} else {
failedChecks.add(nearPatchTime);
}
if (DEBUG_ALWAYS_SHOW_CHECK_FAILED_DIALOG) {
@ -310,11 +309,6 @@ public final class CheckEnvironmentPatch {
);
}
if (failedChecks.isEmpty()) {
Check.disableForever();
return;
}
//noinspection ComparatorCombinators
Collections.sort(failedChecks, (o1, o2) -> o1.uiSortingValue() - o2.uiSortingValue());