From b32301fd85a403526f548d6f6f159974dca30e82 Mon Sep 17 00:00:00 2001 From: inotia00 <108592928+inotia00@users.noreply.github.com> Date: Tue, 17 Dec 2024 14:17:15 +0900 Subject: [PATCH] chore: Lint code --- .../components/ActionButtonsFilter.java | 2 +- .../music/patches/player/PlayerPatch.java | 4 ---- .../patches/utils/InitializationPatch.java | 1 - .../utils/ReturnYouTubeDislikePatch.java | 2 +- .../shared/patches/BlockRequestPatch.java | 2 +- .../patches/ReturnYouTubeUsernamePatch.java | 6 +++--- .../shared/patches/spans/Filter.java | 2 +- .../patches/spans/InclusiveSpanPatch.java | 17 ++++++++-------- .../spoof/SpoofStreamingDataPatch.java | 8 ++++---- .../spoof/requests/StreamingDataRequest.java | 8 +++++--- .../shared/settings/BaseSettings.java | 1 - .../patches/general/MiniplayerPatch.java | 12 ++++++++--- .../patches/player/SeekbarColorPatch.java | 20 +++++++++++-------- .../patches/utils/PlayerTypeHookPatch.java | 1 + 14 files changed, 47 insertions(+), 39 deletions(-) diff --git a/extensions/shared/src/main/java/app/revanced/extension/music/patches/components/ActionButtonsFilter.java b/extensions/shared/src/main/java/app/revanced/extension/music/patches/components/ActionButtonsFilter.java index 8d6af2d49..0115a8ce7 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/music/patches/components/ActionButtonsFilter.java +++ b/extensions/shared/src/main/java/app/revanced/extension/music/patches/components/ActionButtonsFilter.java @@ -2,11 +2,11 @@ package app.revanced.extension.music.patches.components; import androidx.annotation.Nullable; +import app.revanced.extension.music.settings.Settings; import app.revanced.extension.shared.patches.components.ByteArrayFilterGroup; import app.revanced.extension.shared.patches.components.ByteArrayFilterGroupList; import app.revanced.extension.shared.patches.components.Filter; import app.revanced.extension.shared.patches.components.StringFilterGroup; -import app.revanced.extension.music.settings.Settings; @SuppressWarnings("unused") public final class ActionButtonsFilter extends Filter { diff --git a/extensions/shared/src/main/java/app/revanced/extension/music/patches/player/PlayerPatch.java b/extensions/shared/src/main/java/app/revanced/extension/music/patches/player/PlayerPatch.java index 04658e6d8..71eed73e2 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/music/patches/player/PlayerPatch.java +++ b/extensions/shared/src/main/java/app/revanced/extension/music/patches/player/PlayerPatch.java @@ -8,15 +8,11 @@ import android.annotation.SuppressLint; import android.graphics.Color; import android.view.View; -import androidx.annotation.NonNull; - import java.util.Arrays; -import java.util.Objects; import app.revanced.extension.music.settings.Settings; import app.revanced.extension.music.shared.VideoType; import app.revanced.extension.music.utils.VideoUtils; -import app.revanced.extension.shared.utils.Logger; import app.revanced.extension.shared.utils.Utils; @SuppressWarnings({"unused"}) diff --git a/extensions/shared/src/main/java/app/revanced/extension/music/patches/utils/InitializationPatch.java b/extensions/shared/src/main/java/app/revanced/extension/music/patches/utils/InitializationPatch.java index a924e39c8..d968f6886 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/music/patches/utils/InitializationPatch.java +++ b/extensions/shared/src/main/java/app/revanced/extension/music/patches/utils/InitializationPatch.java @@ -6,7 +6,6 @@ import android.app.Activity; import androidx.annotation.NonNull; -import app.revanced.extension.music.utils.ExtendedUtils; import app.revanced.extension.shared.settings.BaseSettings; import app.revanced.extension.shared.utils.Utils; diff --git a/extensions/shared/src/main/java/app/revanced/extension/music/patches/utils/ReturnYouTubeDislikePatch.java b/extensions/shared/src/main/java/app/revanced/extension/music/patches/utils/ReturnYouTubeDislikePatch.java index 947269349..5e74f70a5 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/music/patches/utils/ReturnYouTubeDislikePatch.java +++ b/extensions/shared/src/main/java/app/revanced/extension/music/patches/utils/ReturnYouTubeDislikePatch.java @@ -30,7 +30,7 @@ public class ReturnYouTubeDislikePatch { * This method is sometimes called on the main thread, but it usually is called _off_ the main thread. * This method can be called multiple times for the same UI element (including after dislikes was added). * - * @param original Original char sequence was created or reused by Litho. + * @param original Original char sequence was created or reused by Litho. * @return The original char sequence (if nothing should change), or a replacement char sequence that contains dislikes. */ public static CharSequence onLithoTextLoaded(@NonNull Object conversionContext, diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/patches/BlockRequestPatch.java b/extensions/shared/src/main/java/app/revanced/extension/shared/patches/BlockRequestPatch.java index 297ad3e5d..8e7837e1d 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/shared/patches/BlockRequestPatch.java +++ b/extensions/shared/src/main/java/app/revanced/extension/shared/patches/BlockRequestPatch.java @@ -3,9 +3,9 @@ package app.revanced.extension.shared.patches; import android.net.Uri; import app.revanced.extension.music.settings.Settings; +import app.revanced.extension.shared.settings.BaseSettings; import app.revanced.extension.shared.utils.Logger; import app.revanced.extension.shared.utils.PackageUtils; -import app.revanced.extension.shared.settings.BaseSettings; @SuppressWarnings("unused") public class BlockRequestPatch { diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/patches/ReturnYouTubeUsernamePatch.java b/extensions/shared/src/main/java/app/revanced/extension/shared/patches/ReturnYouTubeUsernamePatch.java index 32e177c17..45a79db40 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/shared/patches/ReturnYouTubeUsernamePatch.java +++ b/extensions/shared/src/main/java/app/revanced/extension/shared/patches/ReturnYouTubeUsernamePatch.java @@ -39,14 +39,14 @@ public class ReturnYouTubeUsernamePatch { */ @NonNull public static CharSequence onLithoTextLoaded(@NonNull Object conversionContext, - @NonNull CharSequence original) { + @NonNull CharSequence original) { return onLithoTextLoaded(conversionContext, original, false); } @NonNull private static CharSequence onLithoTextLoaded(@NonNull Object conversionContext, - @NonNull CharSequence original, - boolean fetchNeeded) { + @NonNull CharSequence original, + boolean fetchNeeded) { try { if (!RETURN_YOUTUBE_USERNAME_ENABLED) { return original; diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/patches/spans/Filter.java b/extensions/shared/src/main/java/app/revanced/extension/shared/patches/spans/Filter.java index e22d73f52..566fb96e0 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/shared/patches/spans/Filter.java +++ b/extensions/shared/src/main/java/app/revanced/extension/shared/patches/spans/Filter.java @@ -31,7 +31,7 @@ public abstract class Filter { protected final List callbacks = new ArrayList<>(); /** - * Adds callbacks to {@link #skip(String, SpannableString , Object, int, int, int, boolean, SpanType, StringFilterGroup)} + * Adds callbacks to {@link #skip(String, SpannableString, Object, int, int, int, boolean, SpanType, StringFilterGroup)} * if any of the groups are found. */ protected final void addCallbacks(StringFilterGroup... groups) { diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/patches/spans/InclusiveSpanPatch.java b/extensions/shared/src/main/java/app/revanced/extension/shared/patches/spans/InclusiveSpanPatch.java index f82bcfe87..fead03f7e 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/shared/patches/spans/InclusiveSpanPatch.java +++ b/extensions/shared/src/main/java/app/revanced/extension/shared/patches/spans/InclusiveSpanPatch.java @@ -22,7 +22,8 @@ import app.revanced.extension.shared.utils.StringTrieSearch; /** * Placeholder for actual filters. */ -final class DummyFilter extends Filter { } +final class DummyFilter extends Filter { +} @SuppressWarnings("unused") public final class InclusiveSpanPatch { @@ -107,7 +108,7 @@ public final class InclusiveSpanPatch { : spanType.type; } - private static final Filter[] filters = new Filter[] { + private static final Filter[] filters = new Filter[]{ new DummyFilter() // Replaced by patch. }; @@ -185,12 +186,12 @@ public final class InclusiveSpanPatch { /** * Injection point. * - * @param spannableString Original SpannableString. - * @param span Span such as {@link ClickableSpan}, {@link ForegroundColorSpan}, - * {@link AbsoluteSizeSpan}, {@link TypefaceSpan}, {@link ImageSpan}. - * @param start Start index of {@link Spannable#setSpan(Object, int, int, int)}. - * @param end End index of {@link Spannable#setSpan(Object, int, int, int)}. - * @param flags Flags of {@link Spannable#setSpan(Object, int, int, int)}. + * @param spannableString Original SpannableString. + * @param span Span such as {@link ClickableSpan}, {@link ForegroundColorSpan}, + * {@link AbsoluteSizeSpan}, {@link TypefaceSpan}, {@link ImageSpan}. + * @param start Start index of {@link Spannable#setSpan(Object, int, int, int)}. + * @param end End index of {@link Spannable#setSpan(Object, int, int, int)}. + * @param flags Flags of {@link Spannable#setSpan(Object, int, int, int)}. */ public static void setSpan(SpannableString spannableString, Object span, int start, int end, int flags) { if (returnEarly(spannableString, span, start, end, flags)) { diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/patches/spoof/SpoofStreamingDataPatch.java b/extensions/shared/src/main/java/app/revanced/extension/shared/patches/spoof/SpoofStreamingDataPatch.java index c43bbad5b..6872eb7db 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/shared/patches/spoof/SpoofStreamingDataPatch.java +++ b/extensions/shared/src/main/java/app/revanced/extension/shared/patches/spoof/SpoofStreamingDataPatch.java @@ -15,10 +15,10 @@ import java.util.Map; import app.revanced.extension.shared.patches.BlockRequestPatch; import app.revanced.extension.shared.patches.client.AppClient.ClientType; +import app.revanced.extension.shared.patches.spoof.requests.StreamingDataRequest; +import app.revanced.extension.shared.settings.BaseSettings; import app.revanced.extension.shared.utils.Logger; import app.revanced.extension.shared.utils.Utils; -import app.revanced.extension.shared.settings.BaseSettings; -import app.revanced.extension.shared.patches.spoof.requests.StreamingDataRequest; @SuppressWarnings("unused") public class SpoofStreamingDataPatch extends BlockRequestPatch { @@ -101,7 +101,7 @@ public class SpoofStreamingDataPatch extends BlockRequestPatch { * Fix playback by replace the streaming data. * Called after {@link #fetchStreams(String, Map)}. * - * @param originalStreamingData Original StreamingData. + * @param originalStreamingData Original StreamingData. */ @Nullable public static ByteBuffer getStreamingData(String videoId, StreamingDataOuterClass$StreamingData originalStreamingData) { @@ -149,7 +149,7 @@ public class SpoofStreamingDataPatch extends BlockRequestPatch { *

* Called after {@link #getStreamingData(String, StreamingDataOuterClass$StreamingData)}. * - * @param spoofedStreamingData Spoofed StreamingData. + * @param spoofedStreamingData Spoofed StreamingData. */ public static StreamingDataOuterClass$StreamingData getOriginalStreamingData(String videoId, StreamingDataOuterClass$StreamingData spoofedStreamingData) { if (SPOOF_STREAMING_DATA) { diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/patches/spoof/requests/StreamingDataRequest.java b/extensions/shared/src/main/java/app/revanced/extension/shared/patches/spoof/requests/StreamingDataRequest.java index e5944d9e6..d7c9e8f83 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/shared/patches/spoof/requests/StreamingDataRequest.java +++ b/extensions/shared/src/main/java/app/revanced/extension/shared/patches/spoof/requests/StreamingDataRequest.java @@ -15,17 +15,19 @@ import java.net.HttpURLConnection; import java.net.SocketTimeoutException; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; -import java.util.*; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Objects; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import app.revanced.extension.shared.patches.client.AppClient.ClientType; - +import app.revanced.extension.shared.settings.BaseSettings; import app.revanced.extension.shared.utils.Logger; import app.revanced.extension.shared.utils.Utils; -import app.revanced.extension.shared.settings.BaseSettings; /** * Video streaming data. Fetching is tied to the behavior YT uses, diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/settings/BaseSettings.java b/extensions/shared/src/main/java/app/revanced/extension/shared/settings/BaseSettings.java index ba2c43503..d3ce72547 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/shared/settings/BaseSettings.java +++ b/extensions/shared/src/main/java/app/revanced/extension/shared/settings/BaseSettings.java @@ -2,7 +2,6 @@ package app.revanced.extension.shared.settings; import static java.lang.Boolean.FALSE; import static java.lang.Boolean.TRUE; - import static app.revanced.extension.shared.patches.PatchStatus.HideFullscreenAdsDefaultBoolean; import static app.revanced.extension.shared.patches.PatchStatus.SpoofStreamingDataDefaultClient; diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/general/MiniplayerPatch.java b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/general/MiniplayerPatch.java index a7337ea39..cdc2a8802 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/general/MiniplayerPatch.java +++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/general/MiniplayerPatch.java @@ -1,7 +1,11 @@ package app.revanced.extension.youtube.patches.general; import static app.revanced.extension.shared.utils.StringRef.str; -import static app.revanced.extension.youtube.patches.general.MiniplayerPatch.MiniplayerType.*; +import static app.revanced.extension.youtube.patches.general.MiniplayerPatch.MiniplayerType.DISABLED; +import static app.revanced.extension.youtube.patches.general.MiniplayerPatch.MiniplayerType.MODERN_1; +import static app.revanced.extension.youtube.patches.general.MiniplayerPatch.MiniplayerType.MODERN_2; +import static app.revanced.extension.youtube.patches.general.MiniplayerPatch.MiniplayerType.MODERN_3; +import static app.revanced.extension.youtube.patches.general.MiniplayerPatch.MiniplayerType.ORIGINAL; import static app.revanced.extension.youtube.utils.ExtendedUtils.IS_19_20_OR_GREATER; import static app.revanced.extension.youtube.utils.ExtendedUtils.IS_19_21_OR_GREATER; import static app.revanced.extension.youtube.utils.ExtendedUtils.IS_19_26_OR_GREATER; @@ -16,10 +20,10 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import app.revanced.extension.shared.settings.Setting; import app.revanced.extension.shared.utils.Logger; import app.revanced.extension.shared.utils.ResourceUtils; import app.revanced.extension.shared.utils.Utils; -import app.revanced.extension.shared.settings.Setting; import app.revanced.extension.youtube.settings.Settings; @SuppressWarnings({"unused", "SpellCheckingInspection"}) @@ -34,7 +38,9 @@ public final class MiniplayerPatch { * Only available with 19.43+ */ DISABLED(false, null), - /** Unmodified type, and same as un-patched. */ + /** + * Unmodified type, and same as un-patched. + */ ORIGINAL(null, null), /** * Exactly the same as MINIMAL and only here for migration of user settings. diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/player/SeekbarColorPatch.java b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/player/SeekbarColorPatch.java index 65e379851..d31788832 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/player/SeekbarColorPatch.java +++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/player/SeekbarColorPatch.java @@ -6,14 +6,14 @@ import android.content.res.Resources; import android.graphics.Color; import android.graphics.drawable.AnimatedVectorDrawable; +import java.util.Arrays; +import java.util.Locale; + import app.revanced.extension.shared.utils.Logger; import app.revanced.extension.shared.utils.ResourceUtils; import app.revanced.extension.shared.utils.Utils; import app.revanced.extension.youtube.settings.Settings; -import java.util.Arrays; -import java.util.Locale; - @SuppressWarnings("unused") public class SeekbarColorPatch { @@ -29,12 +29,12 @@ public class SeekbarColorPatch { /** * Default colors of the gradient seekbar. */ - private static final int[] ORIGINAL_SEEKBAR_GRADIENT_COLORS = { 0xFFFF0033, 0xFFFF2791 }; + private static final int[] ORIGINAL_SEEKBAR_GRADIENT_COLORS = {0xFFFF0033, 0xFFFF2791}; /** * Default positions of the gradient seekbar. */ - private static final float[] ORIGINAL_SEEKBAR_GRADIENT_POSITIONS = { 0.8f, 1.0f }; + private static final float[] ORIGINAL_SEEKBAR_GRADIENT_POSITIONS = {0.8f, 1.0f}; /** * Default YouTube seekbar color brightness. @@ -240,7 +240,7 @@ public class SeekbarColorPatch { final int replacementAlpha = clamp(Color.alpha(seekbarColor) + alphaDifference, 0, 255); final int replacementColor = Color.HSVToColor(replacementAlpha, hsv); Logger.printDebug(() -> String.format("Original color: #%08X replacement color: #%08X", - originalColor, replacementColor)); + originalColor, replacementColor)); return replacementColor; } catch (Exception ex) { Logger.printException(() -> "getSeekbarColorValue failure", ex); @@ -248,12 +248,16 @@ public class SeekbarColorPatch { } } - /** @noinspection SameParameterValue */ + /** + * @noinspection SameParameterValue + */ private static int clamp(int value, int lower, int upper) { return Math.max(lower, Math.min(value, upper)); } - /** @noinspection SameParameterValue */ + /** + * @noinspection SameParameterValue + */ private static float clamp(float value, float lower, float upper) { return Math.max(lower, Math.min(value, upper)); } diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/utils/PlayerTypeHookPatch.java b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/utils/PlayerTypeHookPatch.java index ea9bd114c..38d479512 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/utils/PlayerTypeHookPatch.java +++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/utils/PlayerTypeHookPatch.java @@ -42,6 +42,7 @@ public class PlayerTypeHookPatch { public void onViewAttachedToWindow(@Nullable View v) { ShortsPlayerState.set(ShortsPlayerState.OPEN); } + @Override public void onViewDetachedFromWindow(@Nullable View v) { ShortsPlayerState.set(ShortsPlayerState.CLOSED);