feat(twitch): remove block-embedded-ads patch (ReVanced#230)

SVNKoch · Nov 30, 2022 · 2f32786 · 2f32786
1 parent 3a2536a
commit 2f32786
Show file tree

Hide file tree

Showing 11 changed files with 1 addition and 290 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -46,6 +46,4 @@ dependencies {
     compileOnly(project(mapOf("path" to ":dummy")))
     compileOnly("androidx.annotation:annotation:1.5.0")
     compileOnly("androidx.appcompat:appcompat:1.5.1")
-    compileOnly("com.squareup.okhttp3:okhttp:4.10.0")
-    compileOnly("com.squareup.retrofit2:retrofit:2.9.0")
 }
diff --git a/app/src/main/java/app/revanced/twitch/adblock/IAdblockService.kt b/app/src/main/java/app/revanced/twitch/adblock/IAdblockService.kt
diff --git a/app/src/main/java/app/revanced/twitch/adblock/PurpleAdblockService.kt b/app/src/main/java/app/revanced/twitch/adblock/PurpleAdblockService.kt
diff --git a/app/src/main/java/app/revanced/twitch/adblock/TTVLolService.kt b/app/src/main/java/app/revanced/twitch/adblock/TTVLolService.kt
diff --git a/app/src/main/java/app/revanced/twitch/api/PurpleAdblockApi.java b/app/src/main/java/app/revanced/twitch/api/PurpleAdblockApi.java
diff --git a/app/src/main/java/app/revanced/twitch/api/RequestInterceptor.kt b/app/src/main/java/app/revanced/twitch/api/RequestInterceptor.kt
diff --git a/app/src/main/java/app/revanced/twitch/api/RetrofitClient.java b/app/src/main/java/app/revanced/twitch/api/RetrofitClient.java
diff --git a/app/src/main/java/app/revanced/twitch/patches/EmbeddedAdsPatch.java b/app/src/main/java/app/revanced/twitch/patches/EmbeddedAdsPatch.java
diff --git a/app/src/main/java/app/revanced/twitch/settings/SettingsEnum.java b/app/src/main/java/app/revanced/twitch/settings/SettingsEnum.java
@@ -10,7 +10,6 @@ public enum SettingsEnum {
     /* Ads */
     BLOCK_VIDEO_ADS("revanced_block_video_ads", true, ReturnType.BOOLEAN),
     BLOCK_AUDIO_ADS("revanced_block_audio_ads", true, ReturnType.BOOLEAN),
-    BLOCK_EMBEDDED_ADS("revanced_block_embedded_ads", "ttv-lol", ReturnType.STRING),
 
     /* Chat */
     SHOW_DELETED_MESSAGES("revanced_show_deleted_messages", "cross-out", ReturnType.STRING),

diff --git a/app/src/main/java/app/revanced/twitch/utils/LogHelper.java b/app/src/main/java/app/revanced/twitch/utils/LogHelper.java
@@ -43,7 +43,7 @@ public static void printException(String message, Throwable ex) {
 
     private static void showDebugToast(String msg) {
         if(SettingsEnum.DEBUG_MODE.getBoolean()) {
-            ReVancedUtils.toast(msg, false);
+            ReVancedUtils.ifContextAttached((c) -> Toast.makeText(c, msg, Toast.LENGTH_SHORT).show());
         }
     }
 }
diff --git a/app/src/main/java/app/revanced/twitch/utils/ReVancedUtils.java b/app/src/main/java/app/revanced/twitch/utils/ReVancedUtils.java
@@ -2,9 +2,6 @@
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.os.Handler;
-import android.os.Looper;
-import android.widget.Toast;
 
 public class ReVancedUtils {
     @SuppressLint("StaticFieldLeak")
@@ -56,10 +53,6 @@ public interface SafeContextAccessLambda {
         void run(Context ctx);
     }
 
-    public static void runOnMainThread(Runnable runnable) {
-        new Handler(Looper.getMainLooper()).post(runnable);
-    }
-
     /**
      * Get resource id safely
      * @return May return 0 if resource not found or context not attached
@@ -91,13 +84,4 @@ public static int getDrawableId(String name) {
     public static String getString(String name) {
         return ifContextAttached((c) -> c.getString(getStringId(name)), "");
     }
-
-    public static void toast(String message) {
-        toast(message, true);
-    }
-    public static void toast(String message, boolean longLength) {
-        ifContextAttached((c) -> {
-            runOnMainThread(() -> Toast.makeText(c, message, longLength ? Toast.LENGTH_LONG : Toast.LENGTH_SHORT).show());
-        });
-    }
 }