ReVanced/revanced-patches-ex
1
0
Fork 0
mirror of https://github.com/inotia00/revanced-patches.git synced 2025-06-13 05:37:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(YouTube Music - Hide ads): When the fullscreen ad is shown more than twice, the dialog does not close

Browse Source
This commit is contained in:
inotia00
2025-02-11 17:37:49 +09:00
parent e5be4c5157
commit b1776cf007
1 changed files with 56 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
extensions/shared/src/main/java/app/revanced/extension/shared/patches/FullscreenAdsPatch.java
View File

@ -4,7 +4,10 @@ import static app.revanced.extension.shared.utils.StringRef.str;
import static app.revanced.extension.shared.utils.Utils.hideViewBy0dpUnderCondition;
import android.app.Dialog;
import android.content.DialogInterface;
import android.view.View;
import android.view.Window;
import android.view.WindowManager;
import app.revanced.extension.shared.patches.components.ByteArrayFilterGroup;
import app.revanced.extension.shared.settings.BaseSettings;
@ -21,8 +24,21 @@ public class FullscreenAdsPatch {
"post_image_lightbox.eml" // Community post image in fullscreen
);
/**
* Whether the last built dialog contains an ad
*/
private static boolean isFullscreenAds = false;
/**
* {@link Dialog#dismiss()} can be used after {@link Dialog#show()}
* When {@link Dialog#show()} is invoked, byte buffer register may not exist
* (byte buffer register has already been assigned to another value)
* <p>
* Therefore, make sure that the dialog contains the ads at the beginning of the Method
*
* @param bytes proto buffer array
* @param type dialog type (similar to {@link Enum#ordinal()})
*/
public static void checkDialog(byte[] bytes, int type) {
if (!HIDE_FULLSCREEN_ADS) {
return;
@ -32,12 +48,12 @@ public class FullscreenAdsPatch {
// The dialog type of a fullscreen dialog is always {@code DialogType.FULLSCREEN}
if (dialogType != DialogType.FULLSCREEN) {
Logger.printDebug(() -> "Ignoring dialogType " + dialogName);
Logger.printDebug(() -> "Ignoring dialogType: " + dialogName);
isFullscreenAds = false;
return;
}
// Image in community post in fullscreen is not filtered
// Whether dialog is community post image (not ads)
final boolean isException = bytes != null &&
exception.check(bytes).isFiltered();
@ -47,22 +63,46 @@ public class FullscreenAdsPatch {
isFullscreenAds = !isException;
}
/**
* Called after {@link #checkDialog(byte[], int)}
*
* @param customDialog Custom dialog which bound by litho
* Can be cast as {@link Dialog} or {@link DialogInterface}
*/
public static void dismissDialog(Object customDialog) {
if (!isFullscreenAds) {
return;
}
if (customDialog instanceof Dialog dialog) {
dialog.hide();
// Perhaps this is not necessary.
dialog.dismiss();
if (BaseSettings.ENABLE_DEBUG_LOGGING.get()) {
Utils.showToastShort(str("revanced_fullscreen_ads_closed_toast"));
if (isFullscreenAds && customDialog instanceof Dialog dialog) {
Window window = dialog.getWindow();
if (window != null) {
WindowManager.LayoutParams params = window.getAttributes();
params.height = 0;
params.width = 0;
// Change the size of dialog to 0.
window.setAttributes(params);
// Disable dialog's background dim.
window.clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
// Hide DecorView.
View decorView = window.getDecorView();
decorView.setVisibility(View.GONE);
// Dismiss dialog.
dialog.dismiss();
if (BaseSettings.ENABLE_DEBUG_LOGGING.get()) {
Utils.showToastShort(str("revanced_fullscreen_ads_closed_toast"));
}
}
} else {
Logger.printDebug(() -> "customDialog type: " + customDialog.getClass().getName());
}
}
/**
* Injection point.
* Invoke only in old clients.
*/
public static void hideFullscreenAds(View view) {
hideViewBy0dpUnderCondition(
HIDE_FULLSCREEN_ADS,
@ -70,6 +110,11 @@ public class FullscreenAdsPatch {
);
}
/**
* YouTube and YouTube Music do not have Enum class for DialogType,
* but they have structures similar to Enum
* It can also be replaced by {@link Enum#ordinal()}
*/
private enum DialogType {
NULL(0),
ALERT(1),