ReVanced/revanced-integrations
1
0
Fork 0
mirror of https://github.com/revanced/revanced-integrations.git synced 2025-04-30 14:44:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

chore: organize imports

Browse Source
This commit is contained in:
LisoUseInAIKyrios 2024-04-01 02:11:49 +04:00
parent e56fdf1cfe
commit 2e65ad234c
124 changed files with 370 additions and 511 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/app/revanced/integrations/all/connectivity/wifi/spoof/SpoofWifiPatch.java
View File

@ -2,14 +2,9 @@ package app.revanced.integrations.all.connectivity.wifi.spoof;
import android.app.PendingIntent;
import android.content.Context;
import android.net.ConnectivityManager;
import android.net.Network;
import android.net.NetworkCapabilities;
import android.net.NetworkInfo;
import android.net.NetworkRequest;
import android.net.*;
import android.os.Build;
import android.os.Handler;
import androidx.annotation.RequiresApi;
public class SpoofWifiPatch {

1
app/src/main/java/app/revanced/integrations/all/screencapture/removerestriction/RemoveScreencaptureRestrictionPatch.java
View File

@ -2,7 +2,6 @@ package app.revanced.integrations.all.screencapture.removerestriction;
import android.media.AudioAttributes;
import android.os.Build;
import androidx.annotation.RequiresApi;
public final class RemoveScreencaptureRestrictionPatch {

4
app/src/main/java/app/revanced/integrations/reddit/patches/FilterPromotedLinksPatch.java
View File

@ -1,10 +1,10 @@
package app.revanced.integrations.reddit.patches;
import com.reddit.domain.model.ILink;
import java.util.ArrayList;
import java.util.List;
import com.reddit.domain.model.ILink;
public final class FilterPromotedLinksPatch {
/**
* Filters list from promoted links.

10
app/src/main/java/app/revanced/integrations/shared/GmsCoreSupport.java
View File

@ -1,5 +1,10 @@
package app.revanced.integrations.shared;
import static app.revanced.integrations.shared.StringRef.str;
import java.net.MalformedURLException;
import java.net.URL;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.SearchManager;
@ -11,11 +16,6 @@ import android.os.Build;
import android.os.PowerManager;
import androidx.annotation.RequiresApi;
import java.net.MalformedURLException;
import java.net.URL;
import static app.revanced.integrations.shared.StringRef.str;
/**
* @noinspection unused
*/

12
app/src/main/java/app/revanced/integrations/shared/Logger.java
View File

@ -1,17 +1,13 @@
package app.revanced.integrations.shared;
import static app.revanced.integrations.shared.settings.BaseSettings.DEBUG;
import static app.revanced.integrations.shared.settings.BaseSettings.DEBUG_STACKTRACE;
import static app.revanced.integrations.shared.settings.BaseSettings.DEBUG_TOAST_ON_ERROR;
import android.util.Log;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import static app.revanced.integrations.shared.settings.BaseSettings.*;
import java.io.PrintWriter;
import java.io.StringWriter;
import android.util.Log;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import app.revanced.integrations.shared.settings.BaseSettings;
public class Logger {

9
app/src/main/java/app/revanced/integrations/shared/StringRef.java
View File

@ -1,14 +1,13 @@
package app.revanced.integrations.shared;
import android.content.Context;
import android.content.res.Resources;
import androidx.annotation.NonNull;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import android.content.Context;
import android.content.res.Resources;
import androidx.annotation.NonNull;
public class StringRef {
private static Resources resources;
private static String packageName;

23
app/src/main/java/app/revanced/integrations/shared/Utils.java
View File

@ -1,5 +1,12 @@
package app.revanced.integrations.shared;
import java.text.Bidi;
import java.util.Locale;
import java.util.Objects;
import java.util.SortedMap;
import java.util.TreeMap;
import java.util.concurrent.*;
import android.annotation.SuppressLint;
import android.content.Context;
import android.content.Intent;
@ -17,23 +24,9 @@ import android.view.View;
import android.view.ViewGroup;
import android.view.animation.Animation;
import android.view.animation.AnimationUtils;
import android.widget.FrameLayout;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.Toast;
import android.widget.Toolbar;
import android.widget.*;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import java.text.Bidi;
import java.util.*;
import java.util.concurrent.Callable;
import java.util.concurrent.Future;
import java.util.concurrent.SynchronousQueue;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import app.revanced.integrations.shared.settings.BooleanSetting;
import kotlin.text.Regex;

2
app/src/main/java/app/revanced/integrations/shared/settings/BaseSettings.java
View File

@ -1,8 +1,8 @@
package app.revanced.integrations.shared.settings;
import static app.revanced.integrations.shared.settings.Setting.parent;
import static java.lang.Boolean.FALSE;
import static java.lang.Boolean.TRUE;
import static app.revanced.integrations.shared.settings.Setting.parent;
/**
* Settings shared across multiple apps.

6
app/src/main/java/app/revanced/integrations/shared/settings/BooleanSetting.java
View File

@ -1,12 +1,12 @@
package app.revanced.integrations.shared.settings;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import java.util.Objects;
import org.json.JSONException;
import org.json.JSONObject;
import java.util.Objects;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@SuppressWarnings("unused")
public class BooleanSetting extends Setting<Boolean> {

11
app/src/main/java/app/revanced/integrations/shared/settings/EnumSetting.java
View File

@ -1,13 +1,14 @@
package app.revanced.integrations.shared.settings;
import java.util.Locale;
import java.util.Objects;
import org.json.JSONException;
import org.json.JSONObject;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import app.revanced.integrations.shared.Logger;
import org.json.JSONException;
import org.json.JSONObject;
import java.util.Locale;
import java.util.Objects;
/**
* If an Enum value is removed or changed, any saved or imported data using the

6
app/src/main/java/app/revanced/integrations/shared/settings/FloatSetting.java
View File

@ -1,12 +1,12 @@
package app.revanced.integrations.shared.settings;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import java.util.Objects;
import org.json.JSONException;
import org.json.JSONObject;
import java.util.Objects;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@SuppressWarnings("unused")
public class FloatSetting extends Setting<Float> {

6
app/src/main/java/app/revanced/integrations/shared/settings/IntegerSetting.java
View File

@ -1,12 +1,12 @@
package app.revanced.integrations.shared.settings;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import java.util.Objects;
import org.json.JSONException;
import org.json.JSONObject;
import java.util.Objects;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@SuppressWarnings("unused")
public class IntegerSetting extends Setting<Integer> {

6
app/src/main/java/app/revanced/integrations/shared/settings/LongSetting.java
View File

@ -1,12 +1,12 @@
package app.revanced.integrations.shared.settings;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import java.util.Objects;
import org.json.JSONException;
import org.json.JSONObject;
import java.util.Objects;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@SuppressWarnings("unused")
public class LongSetting extends Setting<Long> {

15
app/src/main/java/app/revanced/integrations/shared/settings/Setting.java
View File

@ -1,5 +1,13 @@
package app.revanced.integrations.shared.settings;
import static app.revanced.integrations.shared.StringRef.str;
import java.util.*;
import org.jetbrains.annotations.NotNull;
import org.json.JSONException;
import org.json.JSONObject;
import android.content.Context;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@ -8,13 +16,6 @@ import app.revanced.integrations.shared.StringRef;
import app.revanced.integrations.shared.Utils;
import app.revanced.integrations.shared.settings.preference.SharedPrefCategory;
import app.revanced.integrations.youtube.sponsorblock.SponsorBlockSettings;
import org.jetbrains.annotations.NotNull;
import org.json.JSONException;
import org.json.JSONObject;
import java.util.*;
import static app.revanced.integrations.shared.StringRef.str;
@SuppressWarnings("unused")
public abstract class Setting<T> {

6
app/src/main/java/app/revanced/integrations/shared/settings/StringSetting.java
View File

@ -1,12 +1,12 @@
package app.revanced.integrations.shared.settings;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import java.util.Objects;
import org.json.JSONException;
import org.json.JSONObject;
import java.util.Objects;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@SuppressWarnings("unused")
public class StringSetting extends Setting<String> {

5
app/src/main/java/app/revanced/integrations/shared/settings/preference/AbstractPreferenceFragment.java
View File

@ -1,5 +1,7 @@
package app.revanced.integrations.shared.settings.preference;
import static app.revanced.integrations.shared.StringRef.str;
import android.annotation.SuppressLint;
import android.app.AlertDialog;
import android.content.Context;
@ -8,14 +10,11 @@ import android.os.Bundle;
import android.preference.*;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import app.revanced.integrations.shared.Logger;
import app.revanced.integrations.shared.Utils;
import app.revanced.integrations.shared.settings.BooleanSetting;
import app.revanced.integrations.shared.settings.Setting;
import static app.revanced.integrations.shared.StringRef.str;
/**
*
*

6
app/src/main/java/app/revanced/integrations/shared/settings/preference/ImportExportPreference.java
View File

@ -1,5 +1,7 @@
package app.revanced.integrations.shared.settings.preference;
import static app.revanced.integrations.shared.StringRef.str;
import android.app.AlertDialog;
import android.content.Context;
import android.os.Build;
@ -9,11 +11,9 @@ import android.text.InputType;
import android.util.AttributeSet;
import android.util.TypedValue;
import android.widget.EditText;
import app.revanced.integrations.shared.settings.Setting;
import app.revanced.integrations.shared.Logger;
import app.revanced.integrations.shared.Utils;
import static app.revanced.integrations.shared.StringRef.str;
import app.revanced.integrations.shared.settings.Setting;
/** @noinspection deprecation, unused */
public class ImportExportPreference extends EditTextPreference implements Preference.OnPreferenceClickListener {

10
app/src/main/java/app/revanced/integrations/shared/settings/preference/ResettableEditTextPreference.java
View File

@ -1,5 +1,9 @@
package app.revanced.integrations.shared.settings.preference;
import static app.revanced.integrations.shared.StringRef.str;
import java.util.Objects;
import android.app.AlertDialog;
import android.content.Context;
import android.os.Bundle;
@ -7,12 +11,8 @@ import android.preference.EditTextPreference;
import android.util.AttributeSet;
import android.widget.Button;
import android.widget.EditText;
import app.revanced.integrations.shared.settings.Setting;
import app.revanced.integrations.shared.Logger;
import java.util.Objects;
import static app.revanced.integrations.shared.StringRef.str;
import app.revanced.integrations.shared.settings.Setting;
@SuppressWarnings("unused")
public class ResettableEditTextPreference extends EditTextPreference {

4
app/src/main/java/app/revanced/integrations/shared/settings/preference/SharedPrefCategory.java
View File

@ -1,5 +1,7 @@
package app.revanced.integrations.shared.settings.preference;
import java.util.Objects;
import android.content.Context;
import android.content.SharedPreferences;
import android.preference.PreferenceFragment;
@ -8,8 +10,6 @@ import androidx.annotation.Nullable;
import app.revanced.integrations.shared.Logger;
import app.revanced.integrations.shared.Utils;
import java.util.Objects;
/**
* Shared categories, and helper methods.
*

6
app/src/main/java/app/revanced/integrations/syncforreddit/FixSLinksPatch.java
View File

@ -1,11 +1,11 @@
package app.revanced.integrations.syncforreddit;
import android.os.StrictMode;
import app.revanced.integrations.shared.Logger;
import java.net.HttpURLConnection;
import java.net.URL;
import android.os.StrictMode;
import app.revanced.integrations.shared.Logger;
public final class FixSLinksPatch {
public static String resolveSLink(String link) {
if (link.matches(".*reddit\\.com/r/[^/]+/s/[^/]+")) {

3
app/src/main/java/app/revanced/integrations/tiktok/feedfilter/AdsFilter.java
View File

@ -1,8 +1,9 @@
package app.revanced.integrations.tiktok.feedfilter;
import app.revanced.integrations.tiktok.settings.Settings;
import com.ss.android.ugc.aweme.feed.model.Aweme;
import app.revanced.integrations.tiktok.settings.Settings;
public class AdsFilter implements IFilter {
@Override
public boolean getEnabled() {

6
app/src/main/java/app/revanced/integrations/tiktok/feedfilter/FeedItemsFilter.java
View File

@ -1,11 +1,11 @@
package app.revanced.integrations.tiktok.feedfilter;
import com.ss.android.ugc.aweme.feed.model.Aweme;
import com.ss.android.ugc.aweme.feed.model.FeedItemList;
import java.util.Iterator;
import java.util.List;
import com.ss.android.ugc.aweme.feed.model.Aweme;
import com.ss.android.ugc.aweme.feed.model.FeedItemList;
public final class FeedItemsFilter {
private static final List<IFilter> FILTERS = List.of(
new AdsFilter(),

3
app/src/main/java/app/revanced/integrations/tiktok/feedfilter/ImageVideoFilter.java
View File

@ -1,8 +1,9 @@
package app.revanced.integrations.tiktok.feedfilter;
import app.revanced.integrations.tiktok.settings.Settings;
import com.ss.android.ugc.aweme.feed.model.Aweme;
import app.revanced.integrations.tiktok.settings.Settings;
public class ImageVideoFilter implements IFilter {
@Override
public boolean getEnabled() {

5
app/src/main/java/app/revanced/integrations/tiktok/feedfilter/LikeCountFilter.java
View File

@ -1,10 +1,11 @@
package app.revanced.integrations.tiktok.feedfilter;
import app.revanced.integrations.tiktok.settings.Settings;
import static app.revanced.integrations.tiktok.Utils.parseMinMax;
import com.ss.android.ugc.aweme.feed.model.Aweme;
import com.ss.android.ugc.aweme.feed.model.AwemeStatistics;
import static app.revanced.integrations.tiktok.Utils.parseMinMax;
import app.revanced.integrations.tiktok.settings.Settings;
public final class LikeCountFilter implements IFilter {
final long minLike;

3
app/src/main/java/app/revanced/integrations/tiktok/feedfilter/LiveFilter.java
View File

@ -1,8 +1,9 @@
package app.revanced.integrations.tiktok.feedfilter;
import app.revanced.integrations.tiktok.settings.Settings;
import com.ss.android.ugc.aweme.feed.model.Aweme;
import app.revanced.integrations.tiktok.settings.Settings;
public class LiveFilter implements IFilter {
@Override
public boolean getEnabled() {

3
app/src/main/java/app/revanced/integrations/tiktok/feedfilter/StoryFilter.java
View File

@ -1,8 +1,9 @@
package app.revanced.integrations.tiktok.feedfilter;
import app.revanced.integrations.tiktok.settings.Settings;
import com.ss.android.ugc.aweme.feed.model.Aweme;
import app.revanced.integrations.tiktok.settings.Settings;
public class StoryFilter implements IFilter {
@Override
public boolean getEnabled() {

5
app/src/main/java/app/revanced/integrations/tiktok/feedfilter/ViewCountFilter.java
View File

@ -1,10 +1,11 @@
package app.revanced.integrations.tiktok.feedfilter;
import app.revanced.integrations.tiktok.settings.Settings;
import static app.revanced.integrations.tiktok.Utils.parseMinMax;
import com.ss.android.ugc.aweme.feed.model.Aweme;
import com.ss.android.ugc.aweme.feed.model.AwemeStatistics;
import static app.revanced.integrations.tiktok.Utils.parseMinMax;
import app.revanced.integrations.tiktok.settings.Settings;
public class ViewCountFilter implements IFilter {
final long minView;

9
app/src/main/java/app/revanced/integrations/tiktok/settings/AdPersonalizationActivityHook.java
View File

@ -1,5 +1,10 @@
package app.revanced.integrations.tiktok.settings;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import com.bytedance.ies.ugc.aweme.commercialize.compliance.personalization.AdPersonalizationActivity;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
@ -10,10 +15,6 @@ import android.widget.LinearLayout;
import app.revanced.integrations.shared.Logger;
import app.revanced.integrations.shared.Utils;
import app.revanced.integrations.tiktok.settings.preference.ReVancedPreferenceFragment;
import com.bytedance.ies.ugc.aweme.commercialize.compliance.personalization.AdPersonalizationActivity;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
/**
* Hooks AdPersonalizationActivity.

1
app/src/main/java/app/revanced/integrations/tiktok/settings/preference/DownloadPathPreference.java
View File

@ -14,7 +14,6 @@ import android.widget.EditText;
import android.widget.LinearLayout;
import android.widget.RadioButton;
import android.widget.RadioGroup;
import app.revanced.integrations.shared.settings.StringSetting;
@SuppressWarnings("deprecation")

1
app/src/main/java/app/revanced/integrations/tiktok/settings/preference/InputTextPreference.java
View File

@ -2,7 +2,6 @@ package app.revanced.integrations.tiktok.settings.preference;
import android.content.Context;
import android.preference.EditTextPreference;
import app.revanced.integrations.shared.settings.StringSetting;
public class InputTextPreference extends EditTextPreference {

1
app/src/main/java/app/revanced/integrations/tiktok/settings/preference/RangeValuePreference.java
View File

@ -12,7 +12,6 @@ import android.view.View;
import android.widget.EditText;
import android.widget.LinearLayout;
import android.widget.TextView;
import app.revanced.integrations.shared.settings.StringSetting;
@SuppressWarnings("deprecation")

3
app/src/main/java/app/revanced/integrations/tiktok/settings/preference/ReVancedPreferenceFragment.java
View File

@ -1,5 +1,7 @@
package app.revanced.integrations.tiktok.settings.preference;
import org.jetbrains.annotations.NotNull;
import android.preference.Preference;
import android.preference.PreferenceScreen;
import androidx.annotation.NonNull;
@ -9,7 +11,6 @@ import app.revanced.integrations.tiktok.settings.preference.categories.Downloads
import app.revanced.integrations.tiktok.settings.preference.categories.FeedFilterPreferenceCategory;
import app.revanced.integrations.tiktok.settings.preference.categories.IntegrationsPreferenceCategory;
import app.revanced.integrations.tiktok.settings.preference.categories.SimSpoofPreferenceCategory;
import org.jetbrains.annotations.NotNull;
/**
* Preference fragment for ReVanced settings

1
app/src/main/java/app/revanced/integrations/tiktok/settings/preference/TogglePreference.java
View File

@ -2,7 +2,6 @@ package app.revanced.integrations.tiktok.settings.preference;
import android.content.Context;
import android.preference.SwitchPreference;
import app.revanced.integrations.shared.settings.BooleanSetting;
@SuppressWarnings("deprecation")

2
app/src/main/java/app/revanced/integrations/tiktok/settings/preference/categories/FeedFilterPreferenceCategory.java
View File

@ -2,9 +2,9 @@ package app.revanced.integrations.tiktok.settings.preference.categories;
import android.content.Context;
import android.preference.PreferenceScreen;
import app.revanced.integrations.tiktok.settings.preference.RangeValuePreference;
import app.revanced.integrations.tiktok.settings.Settings;
import app.revanced.integrations.tiktok.settings.SettingsStatus;
import app.revanced.integrations.tiktok.settings.preference.RangeValuePreference;
import app.revanced.integrations.tiktok.settings.preference.TogglePreference;
@SuppressWarnings("deprecation")

1
app/src/main/java/app/revanced/integrations/tiktok/settings/preference/categories/IntegrationsPreferenceCategory.java
View File

@ -2,7 +2,6 @@ package app.revanced.integrations.tiktok.settings.preference.categories;
import android.content.Context;
import android.preference.PreferenceScreen;
import app.revanced.integrations.shared.settings.BaseSettings;
import app.revanced.integrations.tiktok.settings.preference.TogglePreference;

6
app/src/main/java/app/revanced/integrations/tudortmund/lockscreen/ShowOnLockscreenPatch.java
View File

@ -1,5 +1,8 @@
package app.revanced.integrations.tudortmund.lockscreen;
import static android.view.WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD;
import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED;
import android.content.Context;
import android.hardware.display.DisplayManager;
import android.os.Build;
@ -7,9 +10,6 @@ import android.view.Display;
import android.view.Window;
import androidx.appcompat.app.AppCompatActivity;
import static android.view.WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD;
import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED;
public class ShowOnLockscreenPatch {
/**
* @noinspection deprecation

6
app/src/main/java/app/revanced/integrations/tumblr/patches/TimelineFilterPatch.java
View File

@ -1,11 +1,11 @@
package app.revanced.integrations.tumblr.patches;
import com.tumblr.rumblr.model.TimelineObject;
import com.tumblr.rumblr.model.Timelineable;
import java.util.HashSet;
import java.util.List;
import com.tumblr.rumblr.model.TimelineObject;
import com.tumblr.rumblr.model.Timelineable;
public final class TimelineFilterPatch {
private static final HashSet<String> blockedObjectTypes = new HashSet<>();

4
app/src/main/java/app/revanced/integrations/twitch/adblock/LuminousService.java
View File

@ -1,11 +1,11 @@
package app.revanced.integrations.twitch.adblock;
import static app.revanced.integrations.shared.StringRef.str;
import app.revanced.integrations.shared.Logger;
import okhttp3.HttpUrl;
import okhttp3.Request;
import static app.revanced.integrations.shared.StringRef.str;
public class LuminousService implements IAdblockService {
@Override
public String friendlyName() {

10
app/src/main/java/app/revanced/integrations/twitch/adblock/PurpleAdblockService.java
View File

@ -1,15 +1,15 @@
package app.revanced.integrations.twitch.adblock;
import app.revanced.integrations.shared.Logger;
import app.revanced.integrations.twitch.api.RetrofitClient;
import okhttp3.HttpUrl;
import okhttp3.Request;
import static app.revanced.integrations.shared.StringRef.str;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import static app.revanced.integrations.shared.StringRef.str;
import app.revanced.integrations.shared.Logger;
import app.revanced.integrations.twitch.api.RetrofitClient;
import okhttp3.HttpUrl;
import okhttp3.Request;
public class PurpleAdblockService implements IAdblockService {
private final Map<String, Boolean> tunnels = new HashMap<>() {{

8
app/src/main/java/app/revanced/integrations/twitch/api/RequestInterceptor.java
View File

@ -1,5 +1,9 @@
package app.revanced.integrations.twitch.api;
import static app.revanced.integrations.shared.StringRef.str;
import java.io.IOException;
import androidx.annotation.NonNull;
import app.revanced.integrations.shared.Logger;
import app.revanced.integrations.shared.Utils;
@ -10,10 +14,6 @@ import app.revanced.integrations.twitch.settings.Settings;
import okhttp3.Interceptor;
import okhttp3.Response;
import java.io.IOException;
import static app.revanced.integrations.shared.StringRef.str;
public class RequestInterceptor implements Interceptor {
private IAdblockService activeService = null;

2
app/src/main/java/app/revanced/integrations/twitch/patches/ShowDeletedMessagesPatch.java
View File

@ -10,9 +10,7 @@ import android.text.SpannedString;
import android.text.style.ForegroundColorSpan;
import android.text.style.StrikethroughSpan;
import android.text.style.StyleSpan;
import androidx.annotation.Nullable;
import app.revanced.integrations.twitch.settings.Settings;
import tv.twitch.android.shared.chat.util.ClickableUsernameSpan;

6
app/src/main/java/app/revanced/integrations/twitch/settings/AppCompatActivityHook.java
View File

@ -1,5 +1,8 @@
package app.revanced.integrations.twitch.settings;
import java.util.ArrayList;
import java.util.List;
import android.content.Intent;
import android.os.Bundle;
import androidx.appcompat.app.ActionBar;
@ -9,9 +12,6 @@ import app.revanced.integrations.twitch.settings.preference.ReVancedPreferenceFr
import tv.twitch.android.feature.settings.menu.SettingsMenuGroup;
import tv.twitch.android.settings.SettingsActivity;
import java.util.ArrayList;
import java.util.List;
/**
* Hooks AppCompatActivity.
* <p>

8
app/src/main/java/app/revanced/integrations/twitch/settings/Settings.java
View File

@ -1,12 +1,12 @@
package app.revanced.integrations.twitch.settings;
import app.revanced.integrations.shared.settings.BooleanSetting;
import app.revanced.integrations.shared.settings.BaseSettings;
import app.revanced.integrations.shared.settings.StringSetting;
import static java.lang.Boolean.FALSE;
import static java.lang.Boolean.TRUE;
import app.revanced.integrations.shared.settings.BaseSettings;
import app.revanced.integrations.shared.settings.BooleanSetting;
import app.revanced.integrations.shared.settings.StringSetting;
public class Settings extends BaseSettings {
/* Ads */
public static final BooleanSetting BLOCK_VIDEO_ADS = new BooleanSetting("revanced_block_video_ads", TRUE);

2
app/src/main/java/app/revanced/integrations/twitter/patches/hook/json/JsonHookPatch.kt
View File

@ -3,9 +3,9 @@ package app.revanced.integrations.twitter.patches.hook.json
import app.revanced.integrations.twitter.patches.hook.patch.dummy.DummyHook
import app.revanced.integrations.twitter.utils.json.JsonUtils.parseJson
import app.revanced.integrations.twitter.utils.stream.StreamUtils
import org.json.JSONException
import java.io.IOException
import java.io.InputStream
import org.json.JSONException
object JsonHookPatch {
// Additional hooks added by corresponding patch.

4
app/src/main/java/app/revanced/integrations/twitter/utils/json/JsonUtils.kt
View File

@ -1,10 +1,10 @@
package app.revanced.integrations.twitter.utils.json
import app.revanced.integrations.twitter.utils.stream.StreamUtils
import org.json.JSONException
import org.json.JSONObject
import java.io.IOException
import java.io.InputStream
import org.json.JSONException
import org.json.JSONObject
object JsonUtils {
@JvmStatic

4
app/src/main/java/app/revanced/integrations/youtube/ByteTrieSearch.java
View File

@ -1,9 +1,9 @@
package app.revanced.integrations.youtube;
import androidx.annotation.NonNull;
import java.nio.charset.StandardCharsets;
import androidx.annotation.NonNull;
public final class ByteTrieSearch extends TrieSearch<byte[]> {
private static final class ByteTrieNode extends TrieNode<byte[]> {

6
app/src/main/java/app/revanced/integrations/youtube/TrieSearch.java
View File

@ -1,13 +1,13 @@
package app.revanced.integrations.youtube;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
/**
* Searches for a group of different patterns using a trie (prefix tree).
* Can significantly speed up searching for multiple patterns.

43
app/src/main/java/app/revanced/integrations/youtube/patches/AlternativeThumbnailsPatch.java
View File

@ -1,22 +1,8 @@
package app.revanced.integrations.youtube.patches;
import android.net.Uri;
import androidx.annotation.GuardedBy;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import app.revanced.integrations.shared.settings.BaseSettings;
import app.revanced.integrations.shared.settings.EnumSetting;
import app.revanced.integrations.shared.settings.Setting;
import app.revanced.integrations.youtube.settings.Settings;
import app.revanced.integrations.shared.Logger;
import app.revanced.integrations.shared.Utils;
import app.revanced.integrations.youtube.shared.NavigationBar;
import app.revanced.integrations.youtube.shared.PlayerType;
import org.chromium.net.UrlRequest;
import org.chromium.net.UrlResponseInfo;
import org.chromium.net.impl.CronetUrlRequest;
import static app.revanced.integrations.shared.StringRef.str;
import static app.revanced.integrations.youtube.settings.Settings.*;
import static app.revanced.integrations.youtube.shared.NavigationBar.NavigationButton;
import java.io.IOException;
import java.net.HttpURLConnection;
@ -26,13 +12,22 @@ import java.util.LinkedHashMap;
import java.util.Map;
import java.util.concurrent.ExecutionException;
import static app.revanced.integrations.shared.StringRef.str;
import static app.revanced.integrations.youtube.settings.Settings.ALT_THUMBNAIL_HOME;
import static app.revanced.integrations.youtube.settings.Settings.ALT_THUMBNAIL_LIBRARY;
import static app.revanced.integrations.youtube.settings.Settings.ALT_THUMBNAIL_PLAYER;
import static app.revanced.integrations.youtube.settings.Settings.ALT_THUMBNAIL_SEARCH;
import static app.revanced.integrations.youtube.settings.Settings.ALT_THUMBNAIL_SUBSCRIPTIONS;
import static app.revanced.integrations.youtube.shared.NavigationBar.NavigationButton;
import org.chromium.net.UrlRequest;
import org.chromium.net.UrlResponseInfo;
import org.chromium.net.impl.CronetUrlRequest;
import android.net.Uri;
import androidx.annotation.GuardedBy;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import app.revanced.integrations.shared.Logger;
import app.revanced.integrations.shared.Utils;
import app.revanced.integrations.shared.settings.BaseSettings;
import app.revanced.integrations.shared.settings.EnumSetting;
import app.revanced.integrations.shared.settings.Setting;
import app.revanced.integrations.youtube.settings.Settings;
import app.revanced.integrations.youtube.shared.NavigationBar;
import app.revanced.integrations.youtube.shared.PlayerType;
/**
* Alternative YouTube thumbnails.

3
app/src/main/java/app/revanced/integrations/youtube/patches/BypassURLRedirectsPatch.java
View File

@ -1,9 +1,8 @@
package app.revanced.integrations.youtube.patches;
import android.net.Uri;
import app.revanced.integrations.youtube.settings.Settings;
import app.revanced.integrations.shared.Logger;
import app.revanced.integrations.youtube.settings.Settings;
@SuppressWarnings("unused")
public class BypassURLRedirectsPatch {

1
app/src/main/java/app/revanced/integrations/youtube/patches/CopyVideoUrlPatch.java
View File

@ -3,7 +3,6 @@ package app.revanced.integrations.youtube.patches;
import static app.revanced.integrations.shared.StringRef.str;
import android.os.Build;
import app.revanced.integrations.shared.Logger;
import app.revanced.integrations.shared.Utils;

3
app/src/main/java/app/revanced/integrations/youtube/patches/CustomPlayerOverlayOpacityPatch.java
View File

@ -1,9 +1,8 @@
package app.revanced.integrations.youtube.patches;
import android.widget.ImageView;
import app.revanced.integrations.youtube.settings.Settings;
import app.revanced.integrations.shared.Utils;
import app.revanced.integrations.youtube.settings.Settings;
@SuppressWarnings("unused")
public class CustomPlayerOverlayOpacityPatch {

1
app/src/main/java/app/revanced/integrations/youtube/patches/DisablePreciseSeekingGesturePatch.java
View File

@ -2,7 +2,6 @@ package app.revanced.integrations.youtube.patches;
import android.view.MotionEvent;
import android.view.VelocityTracker;
import app.revanced.integrations.youtube.settings.Settings;
@SuppressWarnings("unused")

6
app/src/main/java/app/revanced/integrations/youtube/patches/DisableSuggestedVideoEndScreenPatch.java
View File

@ -1,13 +1,7 @@
package app.revanced.integrations.youtube.patches;
import android.annotation.SuppressLint;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewTreeObserver;
import android.widget.ImageView;
import androidx.annotation.NonNull;
import app.revanced.integrations.shared.Logger;
import app.revanced.integrations.youtube.settings.Settings;
/** @noinspection unused*/

8
app/src/main/java/app/revanced/integrations/youtube/patches/DownloadsPatch.java
View File

@ -1,15 +1,13 @@
package app.revanced.integrations.youtube.patches;
import java.lang.ref.WeakReference;
import java.util.Objects;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import androidx.annotation.NonNull;
import java.lang.ref.WeakReference;
import java.util.Objects;
import app.revanced.integrations.shared.Logger;
import app.revanced.integrations.shared.StringRef;
import app.revanced.integrations.shared.Utils;

1
app/src/main/java/app/revanced/integrations/youtube/patches/FixBackToExitGesturePatch.java
View File

@ -1,7 +1,6 @@
package app.revanced.integrations.youtube.patches;
import android.app.Activity;
import app.revanced.integrations.shared.Logger;
@SuppressWarnings("unused")

1
app/src/main/java/app/revanced/integrations/youtube/patches/FullscreenPanelsRemoverPatch.java
View File

@ -1,7 +1,6 @@
package app.revanced.integrations.youtube.patches;
import android.view.View;
import app.revanced.integrations.youtube.settings.Settings;
@SuppressWarnings("unused")

1
app/src/main/java/app/revanced/integrations/youtube/patches/HDRAutoBrightnessPatch.java
View File

@ -1,7 +1,6 @@
package app.revanced.integrations.youtube.patches;
import android.view.WindowManager;
import app.revanced.integrations.youtube.settings.Settings;
import app.revanced.integrations.youtube.swipecontrols.SwipeControlsHostActivity;

3
app/src/main/java/app/revanced/integrations/youtube/patches/HideAlbumCardsPatch.java
View File

@ -1,9 +1,8 @@
package app.revanced.integrations.youtube.patches;
import android.view.View;
import app.revanced.integrations.youtube.settings.Settings;
import app.revanced.integrations.shared.Utils;
import app.revanced.integrations.youtube.settings.Settings;
@SuppressWarnings("unused")
public class HideAlbumCardsPatch {

3
app/src/main/java/app/revanced/integrations/youtube/patches/HideBreakingNewsPatch.java
View File

@ -1,10 +1,9 @@
package app.revanced.integrations.youtube.patches;
import android.view.View;
import app.revanced.integrations.shared.Utils;
import app.revanced.integrations.youtube.patches.spoof.SpoofAppVersionPatch;
import app.revanced.integrations.youtube.settings.Settings;
import app.revanced.integrations.shared.Utils;
@SuppressWarnings("unused")
public class HideBreakingNewsPatch {

1
app/src/main/java/app/revanced/integrations/youtube/patches/HideCaptionsButtonPatch.java
View File

@ -1,7 +1,6 @@
package app.revanced.integrations.youtube.patches;
import android.widget.ImageView;
import app.revanced.integrations.youtube.settings.Settings;
@SuppressWarnings("unused")

1
app/src/main/java/app/revanced/integrations/youtube/patches/HideCastButtonPatch.java
View File

@ -1,7 +1,6 @@
package app.revanced.integrations.youtube.patches;
import android.view.View;
import app.revanced.integrations.youtube.settings.Settings;
@SuppressWarnings("unused")

3
app/src/main/java/app/revanced/integrations/youtube/patches/HideCrowdfundingBoxPatch.java
View File

@ -1,9 +1,8 @@
package app.revanced.integrations.youtube.patches;
import android.view.View;
import app.revanced.integrations.youtube.settings.Settings;
import app.revanced.integrations.shared.Utils;
import app.revanced.integrations.youtube.settings.Settings;
@SuppressWarnings("unused")
public class HideCrowdfundingBoxPatch {

1
app/src/main/java/app/revanced/integrations/youtube/patches/HideEndscreenCardsPatch.java
View File

@ -1,7 +1,6 @@
package app.revanced.integrations.youtube.patches;
import android.view.View;
import app.revanced.integrations.youtube.settings.Settings;
@SuppressWarnings("unused")

3
app/src/main/java/app/revanced/integrations/youtube/patches/HideFilterBarPatch.java
View File

@ -1,9 +1,8 @@
package app.revanced.integrations.youtube.patches;
import android.view.View;
import app.revanced.integrations.youtube.settings.Settings;
import app.revanced.integrations.shared.Utils;
import app.revanced.integrations.youtube.settings.Settings;
@SuppressWarnings("unused")
public final class HideFilterBarPatch {

1
app/src/main/java/app/revanced/integrations/youtube/patches/HideInfoCardsPatch.java
View File

@ -1,7 +1,6 @@
package app.revanced.integrations.youtube.patches;
import android.view.View;
import app.revanced.integrations.youtube.settings.Settings;
@SuppressWarnings("unused")

3
app/src/main/java/app/revanced/integrations/youtube/patches/HideLoadMoreButtonPatch.java
View File

@ -1,9 +1,8 @@
package app.revanced.integrations.youtube.patches;
import android.view.View;
import app.revanced.integrations.youtube.settings.Settings;
import app.revanced.integrations.shared.Utils;
import app.revanced.integrations.youtube.settings.Settings;
@SuppressWarnings("unused")
public class HideLoadMoreButtonPatch {

4
app/src/main/java/app/revanced/integrations/youtube/patches/NavigationButtonsPatch.java
View File

@ -2,12 +2,10 @@ package app.revanced.integrations.youtube.patches;
import static app.revanced.integrations.youtube.shared.NavigationBar.NavigationButton;
import android.view.View;
import java.util.EnumMap;
import java.util.Map;
import app.revanced.integrations.shared.Logger;
import android.view.View;
import app.revanced.integrations.youtube.settings.Settings;
@SuppressWarnings("unused")

3
app/src/main/java/app/revanced/integrations/youtube/patches/PlayerOverlaysHookPatch.java
View File

@ -1,9 +1,6 @@
package app.revanced.integrations.youtube.patches;
import android.view.ViewGroup;
import androidx.annotation.Nullable;
import app.revanced.integrations.youtube.shared.PlayerOverlays;
@SuppressWarnings("unused")

1
app/src/main/java/app/revanced/integrations/youtube/patches/PlayerTypeHookPatch.java
View File

@ -1,7 +1,6 @@
package app.revanced.integrations.youtube.patches;
import androidx.annotation.Nullable;
import app.revanced.integrations.youtube.shared.PlayerType;
import app.revanced.integrations.youtube.shared.VideoState;

19
app/src/main/java/app/revanced/integrations/youtube/patches/ReturnYouTubeDislikePatch.java
View File

@ -1,5 +1,12 @@
package app.revanced.integrations.youtube.patches;
import static app.revanced.integrations.youtube.returnyoutubedislike.ReturnYouTubeDislike.Vote;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import android.graphics.Rect;
import android.graphics.drawable.ShapeDrawable;
import android.os.Build;
@ -8,22 +15,14 @@ import android.view.View;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import app.revanced.integrations.shared.Logger;
import app.revanced.integrations.shared.Utils;
import app.revanced.integrations.youtube.patches.components.ReturnYouTubeDislikeFilterPatch;
import app.revanced.integrations.youtube.patches.spoof.SpoofAppVersionPatch;
import app.revanced.integrations.youtube.returnyoutubedislike.ReturnYouTubeDislike;
import app.revanced.integrations.youtube.returnyoutubedislike.requests.ReturnYouTubeDislikeApi;
import app.revanced.integrations.youtube.settings.Settings;
import app.revanced.integrations.youtube.shared.PlayerType;
import app.revanced.integrations.shared.Logger;
import app.revanced.integrations.shared.Utils;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import static app.revanced.integrations.youtube.returnyoutubedislike.ReturnYouTubeDislike.Vote;
/**
* Handles all interaction of UI patch components.

12
app/src/main/java/app/revanced/integrations/youtube/patches/VideoInformation.java
View File

@ -1,15 +1,15 @@
package app.revanced.integrations.youtube.patches;
import androidx.annotation.NonNull;
import app.revanced.integrations.youtube.patches.playback.speed.RememberPlaybackSpeedPatch;
import app.revanced.integrations.youtube.shared.VideoState;
import app.revanced.integrations.shared.Logger;
import app.revanced.integrations.shared.Utils;
import java.lang.ref.WeakReference;
import java.lang.reflect.Method;
import java.util.Objects;
import androidx.annotation.NonNull;
import app.revanced.integrations.shared.Logger;
import app.revanced.integrations.shared.Utils;
import app.revanced.integrations.youtube.patches.playback.speed.RememberPlaybackSpeedPatch;
import app.revanced.integrations.youtube.shared.VideoState;
/**
* Hooking class for the current playing video.
* @noinspection unused

32
app/src/main/java/app/revanced/integrations/youtube/patches/announcements/AnnouncementsPatch.java
View File

@ -1,18 +1,8 @@
package app.revanced.integrations.youtube.patches.announcements;
import android.app.Activity;
import android.os.Build;
import android.text.Html;
import android.text.method.LinkMovementMethod;
import android.widget.TextView;
import androidx.annotation.RequiresApi;
import app.revanced.integrations.shared.Logger;
import app.revanced.integrations.shared.Utils;
import app.revanced.integrations.youtube.patches.announcements.requests.AnnouncementsRoutes;
import app.revanced.integrations.youtube.requests.Requester;
import app.revanced.integrations.youtube.settings.Settings;
import org.json.JSONObject;
import static android.text.Html.FROM_HTML_MODE_COMPACT;
import static app.revanced.integrations.shared.StringRef.str;
import static app.revanced.integrations.youtube.patches.announcements.requests.AnnouncementsRoutes.GET_LATEST_ANNOUNCEMENT;
import java.io.IOException;
import java.net.HttpURLConnection;
@ -20,9 +10,19 @@ import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.util.Locale;
import static android.text.Html.FROM_HTML_MODE_COMPACT;
import static app.revanced.integrations.shared.StringRef.str;
import static app.revanced.integrations.youtube.patches.announcements.requests.AnnouncementsRoutes.GET_LATEST_ANNOUNCEMENT;
import org.json.JSONObject;
import android.app.Activity;
import android.os.Build;
import android.text.Html;
import android.text.method.LinkMovementMethod;
import android.widget.TextView;
import androidx.annotation.RequiresApi;
import app.revanced.integrations.shared.Logger;
import app.revanced.integrations.shared.Utils;
import app.revanced.integrations.youtube.patches.announcements.requests.AnnouncementsRoutes;
import app.revanced.integrations.youtube.requests.Requester;
import app.revanced.integrations.youtube.settings.Settings;
@SuppressWarnings("unused")
public final class AnnouncementsPatch {

6
app/src/main/java/app/revanced/integrations/youtube/patches/announcements/requests/AnnouncementsRoutes.java
View File

@ -1,12 +1,12 @@
package app.revanced.integrations.youtube.patches.announcements.requests;
import app.revanced.integrations.youtube.requests.Requester;
import app.revanced.integrations.youtube.requests.Route;
import static app.revanced.integrations.youtube.requests.Route.Method.GET;
import java.io.IOException;
import java.net.HttpURLConnection;
import static app.revanced.integrations.youtube.requests.Route.Method.GET;
import app.revanced.integrations.youtube.requests.Requester;
import app.revanced.integrations.youtube.requests.Route;
public class AnnouncementsRoutes {
private static final String ANNOUNCEMENTS_PROVIDER = "https://api.revanced.app/v2";

4
app/src/main/java/app/revanced/integrations/youtube/patches/components/AdsFilter.java
View File

@ -5,13 +5,11 @@ import static app.revanced.integrations.shared.StringRef.str;
import android.app.Instrumentation;
import android.view.KeyEvent;
import android.view.View;
import androidx.annotation.Nullable;
import app.revanced.integrations.youtube.settings.Settings;
import app.revanced.integrations.shared.Logger;
import app.revanced.integrations.shared.Utils;
import app.revanced.integrations.youtube.StringTrieSearch;
import app.revanced.integrations.youtube.settings.Settings;
@SuppressWarnings("unused")
public final class AdsFilter extends Filter {

1
app/src/main/java/app/revanced/integrations/youtube/patches/components/ButtonsFilter.java
View File

@ -1,7 +1,6 @@
package app.revanced.integrations.youtube.patches.components;
import androidx.annotation.Nullable;
import app.revanced.integrations.youtube.settings.Settings;
@SuppressWarnings("unused")

11
app/src/main/java/app/revanced/integrations/youtube/patches/components/CustomFilter.java
View File

@ -2,17 +2,12 @@ package app.revanced.integrations.youtube.patches.components;
import static app.revanced.integrations.shared.StringRef.str;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import app.revanced.integrations.shared.Logger;
import app.revanced.integrations.shared.Utils;
import app.revanced.integrations.youtube.ByteTrieSearch;

2
app/src/main/java/app/revanced/integrations/youtube/patches/components/DescriptionComponentsFilter.java
View File

@ -1,8 +1,8 @@
package app.revanced.integrations.youtube.patches.components;
import androidx.annotation.Nullable;
import app.revanced.integrations.youtube.settings.Settings;
import app.revanced.integrations.youtube.StringTrieSearch;
import app.revanced.integrations.youtube.settings.Settings;
@SuppressWarnings("unused")
final class DescriptionComponentsFilter extends Filter {

10
app/src/main/java/app/revanced/integrations/youtube/patches/components/KeywordContentFilter.java
View File

@ -4,16 +4,14 @@ import static app.revanced.integrations.shared.StringRef.str;
import static app.revanced.integrations.youtube.ByteTrieSearch.convertStringsToBytes;
import static app.revanced.integrations.youtube.shared.NavigationBar.NavigationButton;
import android.os.Build;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import java.util.Arrays;
import java.util.LinkedHashSet;
import java.util.Set;
import android.os.Build;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import app.revanced.integrations.shared.Logger;
import app.revanced.integrations.shared.Utils;
import app.revanced.integrations.youtube.ByteTrieSearch;

4
app/src/main/java/app/revanced/integrations/youtube/patches/components/LayoutComponentsFilter.java
View File

@ -1,13 +1,11 @@
package app.revanced.integrations.youtube.patches.components;
import android.os.Build;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import app.revanced.integrations.youtube.settings.Settings;
import app.revanced.integrations.shared.Logger;
import app.revanced.integrations.youtube.StringTrieSearch;
import app.revanced.integrations.youtube.settings.Settings;
@SuppressWarnings("unused")
public final class LayoutComponentsFilter extends Filter {

15
app/src/main/java/app/revanced/integrations/youtube/patches/components/LithoFilterPatch.java
View File

@ -1,21 +1,16 @@
package app.revanced.integrations.youtube.patches.components;
import java.nio.ByteBuffer;
import java.util.*;
import java.util.function.Consumer;
import android.os.Build;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import java.util.Spliterator;
import java.util.function.Consumer;
import app.revanced.integrations.shared.Logger;
import app.revanced.integrations.shared.settings.BooleanSetting;
import app.revanced.integrations.shared.settings.BaseSettings;
import app.revanced.integrations.shared.settings.BooleanSetting;
import app.revanced.integrations.youtube.ByteTrieSearch;
import app.revanced.integrations.youtube.StringTrieSearch;
import app.revanced.integrations.youtube.TrieSearch;

1
app/src/main/java/app/revanced/integrations/youtube/patches/components/PlaybackSpeedMenuFilterPatch.java
View File

@ -1,7 +1,6 @@
package app.revanced.integrations.youtube.patches.components;
import androidx.annotation.Nullable;
import app.revanced.integrations.youtube.patches.playback.speed.CustomPlaybackSpeedPatch;
/**

2
app/src/main/java/app/revanced/integrations/youtube/patches/components/PlayerFlyoutMenuItemsFilter.java
View File

@ -1,10 +1,8 @@
package app.revanced.integrations.youtube.patches.components;
import android.os.Build;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import app.revanced.integrations.youtube.settings.Settings;
import app.revanced.integrations.youtube.shared.PlayerType;

11
app/src/main/java/app/revanced/integrations/youtube/patches/components/ReturnYouTubeDislikeFilterPatch.java
View File

@ -1,18 +1,17 @@
package app.revanced.integrations.youtube.patches.components;
import androidx.annotation.GuardedBy;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.Map;
import androidx.annotation.GuardedBy;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import app.revanced.integrations.shared.Logger;
import app.revanced.integrations.youtube.TrieSearch;
import app.revanced.integrations.youtube.patches.ReturnYouTubeDislikePatch;
import app.revanced.integrations.youtube.patches.VideoInformation;
import app.revanced.integrations.youtube.settings.Settings;
import app.revanced.integrations.shared.Logger;
import app.revanced.integrations.youtube.TrieSearch;
/**
* Searches for video id's in the proto buffer of Shorts dislike.

6
app/src/main/java/app/revanced/integrations/youtube/patches/components/ShortsFilter.java
View File

@ -2,12 +2,10 @@ package app.revanced.integrations.youtube.patches.components;
import static app.revanced.integrations.shared.Utils.hideViewUnderCondition;
import android.view.View;
import androidx.annotation.Nullable;
import com.google.android.libraries.youtube.rendering.ui.pivotbar.PivotBar;
import android.view.View;
import androidx.annotation.Nullable;
import app.revanced.integrations.shared.Utils;
import app.revanced.integrations.youtube.settings.Settings;
import app.revanced.integrations.youtube.shared.NavigationBar;

1
app/src/main/java/app/revanced/integrations/youtube/patches/components/VideoQualityMenuFilterPatch.java
View File

@ -1,7 +1,6 @@
package app.revanced.integrations.youtube.patches.components;
import androidx.annotation.Nullable;
import app.revanced.integrations.youtube.patches.playback.quality.RestoreOldVideoQualityMenuPatch;
import app.revanced.integrations.youtube.settings.Settings;

15
app/src/main/java/app/revanced/integrations/youtube/patches/playback/quality/RememberVideoQualityPatch.java
View File

@ -1,19 +1,18 @@
package app.revanced.integrations.youtube.patches.playback.quality;
import androidx.annotation.Nullable;
import app.revanced.integrations.shared.settings.IntegerSetting;
import app.revanced.integrations.youtube.settings.Settings;
import app.revanced.integrations.shared.Logger;
import app.revanced.integrations.shared.Utils;
import static app.revanced.integrations.shared.StringRef.str;
import static app.revanced.integrations.shared.Utils.NetworkType;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
import static app.revanced.integrations.shared.StringRef.str;
import static app.revanced.integrations.shared.Utils.NetworkType;
import androidx.annotation.Nullable;
import app.revanced.integrations.shared.Logger;
import app.revanced.integrations.shared.Utils;
import app.revanced.integrations.shared.settings.IntegerSetting;
import app.revanced.integrations.youtube.settings.Settings;
@SuppressWarnings("unused")
public class RememberVideoQualityPatch {

3
app/src/main/java/app/revanced/integrations/youtube/patches/playback/quality/RestoreOldVideoQualityMenuPatch.java
View File

@ -4,10 +4,9 @@ import android.support.v7.widget.RecyclerView;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ListView;
import app.revanced.integrations.shared.Logger;
import app.revanced.integrations.youtube.patches.components.VideoQualityMenuFilterPatch;
import app.revanced.integrations.youtube.settings.Settings;
import app.revanced.integrations.shared.Logger;
/**
* This patch contains the logic to show the old video quality menu.

9
app/src/main/java/app/revanced/integrations/youtube/patches/playback/speed/CustomPlaybackSpeedPatch.java
View File

@ -2,18 +2,17 @@ package app.revanced.integrations.youtube.patches.playback.speed;
import static app.revanced.integrations.shared.StringRef.str;
import java.util.Arrays;
import android.preference.ListPreference;
import android.support.v7.widget.RecyclerView;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.NonNull;
import app.revanced.integrations.youtube.patches.components.PlaybackSpeedMenuFilterPatch;
import app.revanced.integrations.youtube.settings.Settings;
import app.revanced.integrations.shared.Logger;
import app.revanced.integrations.shared.Utils;
import java.util.Arrays;
import app.revanced.integrations.youtube.patches.components.PlaybackSpeedMenuFilterPatch;
import app.revanced.integrations.youtube.settings.Settings;
@SuppressWarnings("unused")
public class CustomPlaybackSpeedPatch {

4
app/src/main/java/app/revanced/integrations/youtube/patches/playback/speed/RememberPlaybackSpeedPatch.java
View File

@ -2,10 +2,10 @@ package app.revanced.integrations.youtube.patches.playback.speed;
import static app.revanced.integrations.shared.StringRef.str;
import app.revanced.integrations.youtube.patches.VideoInformation;
import app.revanced.integrations.youtube.settings.Settings;
import app.revanced.integrations.shared.Logger;
import app.revanced.integrations.shared.Utils;
import app.revanced.integrations.youtube.patches.VideoInformation;
import app.revanced.integrations.youtube.settings.Settings;
@SuppressWarnings("unused")
public final class RememberPlaybackSpeedPatch {

16
app/src/main/java/app/revanced/integrations/youtube/patches/spoof/SpoofSignaturePatch.java
View File

@ -1,5 +1,13 @@
package app.revanced.integrations.youtube.patches.spoof;
import static app.revanced.integrations.shared.Utils.containsAny;
import static app.revanced.integrations.youtube.patches.spoof.requests.StoryboardRendererRequester.getStoryboardRenderer;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
@ -10,14 +18,6 @@ import app.revanced.integrations.youtube.patches.VideoInformation;
import app.revanced.integrations.youtube.settings.Settings;
import app.revanced.integrations.youtube.shared.PlayerType;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import static app.revanced.integrations.shared.Utils.containsAny;
import static app.revanced.integrations.youtube.patches.spoof.requests.StoryboardRendererRequester.getStoryboardRenderer;
/** @noinspection unused*/
@Deprecated
public class SpoofSignaturePatch {

4
app/src/main/java/app/revanced/integrations/youtube/patches/spoof/StoryboardRenderer.java
View File

@ -1,9 +1,9 @@
package app.revanced.integrations.youtube.patches.spoof;
import androidx.annotation.Nullable;
import org.jetbrains.annotations.NotNull;
import androidx.annotation.Nullable;
@Deprecated
public final class StoryboardRenderer {
@Nullable

15
app/src/main/java/app/revanced/integrations/youtube/patches/spoof/requests/PlayerRoutes.java
View File

@ -1,15 +1,16 @@
package app.revanced.integrations.youtube.patches.spoof.requests;
import app.revanced.integrations.youtube.requests.Requester;
import app.revanced.integrations.youtube.requests.Route;
import app.revanced.integrations.shared.Logger;
import app.revanced.integrations.shared.Utils;
import org.json.JSONException;
import org.json.JSONObject;
import java.io.IOException;
import java.net.HttpURLConnection;
import org.json.JSONException;
import org.json.JSONObject;
import app.revanced.integrations.shared.Logger;
import app.revanced.integrations.shared.Utils;
import app.revanced.integrations.youtube.requests.Requester;
import app.revanced.integrations.youtube.requests.Route;
@Deprecated
final class PlayerRoutes {
private static final String YT_API_URL = "https://www.youtube.com/youtubei/v1/";

23
app/src/main/java/app/revanced/integrations/youtube/patches/spoof/requests/StoryboardRendererRequester.java
View File

@ -1,14 +1,7 @@
package app.revanced.integrations.youtube.patches.spoof.requests;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import app.revanced.integrations.shared.settings.BaseSettings;
import app.revanced.integrations.youtube.patches.spoof.StoryboardRenderer;
import app.revanced.integrations.youtube.requests.Requester;
import app.revanced.integrations.shared.Logger;
import app.revanced.integrations.shared.Utils;
import org.json.JSONException;
import org.json.JSONObject;
import static app.revanced.integrations.shared.StringRef.str;
import static app.revanced.integrations.youtube.patches.spoof.requests.PlayerRoutes.*;
import java.io.IOException;
import java.net.HttpURLConnection;
@ -16,8 +9,16 @@ import java.net.SocketTimeoutException;
import java.nio.charset.StandardCharsets;
import java.util.Objects;
import static app.revanced.integrations.shared.StringRef.str;
import static app.revanced.integrations.youtube.patches.spoof.requests.PlayerRoutes.*;
import org.json.JSONException;
import org.json.JSONObject;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import app.revanced.integrations.shared.Logger;
import app.revanced.integrations.shared.Utils;
import app.revanced.integrations.shared.settings.BaseSettings;
import app.revanced.integrations.youtube.patches.spoof.StoryboardRenderer;
import app.revanced.integrations.youtube.requests.Requester;
@Deprecated
public class StoryboardRendererRequester {

2
app/src/main/java/app/revanced/integrations/youtube/patches/theme/ProgressBarDrawable.java
View File

@ -5,10 +5,8 @@ import android.graphics.ColorFilter;
import android.graphics.Paint;
import android.graphics.PixelFormat;
import android.graphics.drawable.Drawable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import app.revanced.integrations.youtube.patches.HideSeekbarPatch;
import app.revanced.integrations.youtube.settings.Settings;

3
app/src/main/java/app/revanced/integrations/youtube/patches/theme/SeekbarColorPatch.java
View File

@ -3,10 +3,9 @@ package app.revanced.integrations.youtube.patches.theme;
import static app.revanced.integrations.shared.StringRef.str;
import android.graphics.Color;
import app.revanced.integrations.youtube.settings.Settings;
import app.revanced.integrations.shared.Logger;
import app.revanced.integrations.shared.Utils;
import app.revanced.integrations.youtube.settings.Settings;
@SuppressWarnings("unused")
public final class SeekbarColorPatch {

2
app/src/main/java/app/revanced/integrations/youtube/patches/theme/ThemePatch.java
View File

@ -1,8 +1,8 @@
package app.revanced.integrations.youtube.patches.theme;
import app.revanced.integrations.youtube.settings.Settings;
import app.revanced.integrations.shared.Utils;
import app.revanced.integrations.youtube.ThemeHelper;
import app.revanced.integrations.youtube.settings.Settings;
@SuppressWarnings("unused")
public class ThemePatch {

11
app/src/main/java/app/revanced/integrations/youtube/requests/Requester.java
View File

@ -1,10 +1,5 @@
package app.revanced.integrations.youtube.requests;
import app.revanced.integrations.shared.Utils;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
@ -12,6 +7,12 @@ import java.io.InputStreamReader;
import java.net.HttpURLConnection;
import java.net.URL;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import app.revanced.integrations.shared.Utils;
public class Requester {
private Requester() {
}

21
app/src/main/java/app/revanced/integrations/youtube/returnyoutubedislike/ReturnYouTubeDislike.java
View File

@ -2,6 +2,13 @@ package app.revanced.integrations.youtube.returnyoutubedislike;
import static app.revanced.integrations.shared.StringRef.str;
import java.text.NumberFormat;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.*;
import android.graphics.Canvas;
import android.graphics.Paint;
import android.graphics.Rect;
@ -20,23 +27,9 @@ import android.text.style.ImageSpan;
import android.text.style.ReplacementSpan;
import android.util.DisplayMetrics;
import android.util.TypedValue;
import androidx.annotation.GuardedBy;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import java.text.NumberFormat;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import app.revanced.integrations.shared.Logger;
import app.revanced.integrations.shared.Utils;
import app.revanced.integrations.youtube.ThemeHelper;

4
app/src/main/java/app/revanced/integrations/youtube/returnyoutubedislike/requests/RYDVoteData.java
View File

@ -2,11 +2,11 @@ package app.revanced.integrations.youtube.returnyoutubedislike.requests;
import static app.revanced.integrations.youtube.returnyoutubedislike.ReturnYouTubeDislike.Vote;
import androidx.annotation.NonNull;
import org.json.JSONException;
import org.json.JSONObject;
import androidx.annotation.NonNull;
/**
* ReturnYouTubeDislike API estimated like/dislike/view counts.
*

20
app/src/main/java/app/revanced/integrations/youtube/returnyoutubedislike/requests/ReturnYouTubeDislikeApi.java
View File

@ -1,15 +1,7 @@
package app.revanced.integrations.youtube.returnyoutubedislike.requests;
import static app.revanced.integrations.youtube.returnyoutubedislike.requests.ReturnYouTubeDislikeRoutes.getRYDConnectionFromRoute;
import static app.revanced.integrations.shared.StringRef.str;
import android.util.Base64;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import org.json.JSONException;
import org.json.JSONObject;
import static app.revanced.integrations.youtube.returnyoutubedislike.requests.ReturnYouTubeDislikeRoutes.getRYDConnectionFromRoute;
import java.io.IOException;
import java.io.OutputStream;
@ -22,11 +14,17 @@ import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
import java.util.Objects;
import org.json.JSONException;
import org.json.JSONObject;
import android.util.Base64;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import app.revanced.integrations.shared.Logger;
import app.revanced.integrations.shared.Utils;
import app.revanced.integrations.youtube.requests.Requester;
import app.revanced.integrations.youtube.returnyoutubedislike.ReturnYouTubeDislike;
import app.revanced.integrations.youtube.settings.Settings;
import app.revanced.integrations.shared.Logger;
import app.revanced.integrations.shared.Utils;
public class ReturnYouTubeDislikeApi {
/**

Some files were not shown because too many files have changed in this diff Show More