Organize code

Author: LisoUseInAIKyrios

extensions/cricbuzz/src/main/java/app/revanced/extension/cricbuzz/HideAdsPatch.java

@@ -5,15 +5,19 @@
 import java.util.Iterator;
 import app.revanced.extension.shared.Logger;
 
-
 @SuppressWarnings("unused")
 public class HideAdsPatch {
+
+    /**
+     * Injection point.
+     */
     public static void filterCb11(List<BottomBar> list) {
         try {
             Iterator<BottomBar> iterator = list.iterator();
             while (iterator.hasNext()) {
                 BottomBar bar = iterator.next();
                 if (bar.getName().equals("Cricbuzz11")) {
+                    Logger.printInfo(() -> "Removing Cricbuzz11 bar: " + bar, ex);
                     iterator.remove();
                 }
             }

patches/src/main/kotlin/app/revanced/patches/cricbuzz/ads/DisableAdsPatch.kt

@@ -11,6 +11,9 @@ import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.reference.FieldReference
 
+private const val EXTENSION_CLASS_DESCRIPTOR =
+    "Lapp/revanced/extension/cricbuzz/ads/HideAdsPatch;"
+
 @Suppress("unused")
 val disableAdsPatch = bytecodePatch (
     name = "Hide ads",
@@ -31,7 +34,7 @@ val disableAdsPatch = bytecodePatch (
             val getRegister = getInstruction<TwoRegisterInstruction>(getIndex).registerA
 
             addInstruction(getIndex + 1,
-                "invoke-static { v$getRegister }, Lapp/revanced/extension/cricbuzz/ads/HideAdsPatch;->filterCb11(Ljava/util/List;)V"
+                "invoke-static { v$getRegister }, $EXTENSION_CLASS_DESCRIPTOR->filterCb11(Ljava/util/List;)V"
             )
         }
     }

patches/src/main/kotlin/app/revanced/patches/cricbuzz/ads/Fingerprints.kt

@@ -4,15 +4,30 @@ import app.revanced.patcher.fingerprint
 import com.android.tools.smali.dexlib2.Opcode
 
 internal val userStateSwitchFingerprint = fingerprint {
-    strings("key.user.state", "NA")
     opcodes(Opcode.SPARSE_SWITCH)
+    strings("key.user.state", "NA")
 }
 
-internal val    cb11ConstructorFingerprint = fingerprint {
-    parameters("Ljava/lang/String;", "Ljava/lang/String;", "Ljava/lang/String;", "I", "Ljava/lang/String;", "Ljava/lang/String;", "Z", "Ljava/lang/String;", "Ljava/lang/String;", "L")
-    custom { _, classDef -> classDef.endsWith("CB11Details;") }
+internal val cb11ConstructorFingerprint = fingerprint {
+    parameters(
+        "Ljava/lang/String;",
+        "Ljava/lang/String;",
+        "Ljava/lang/String;",
+        "I",
+        "Ljava/lang/String;",
+        "Ljava/lang/String;",
+        "Z",
+        "Ljava/lang/String;",
+        "Ljava/lang/String;",
+        "L"
+    )
+    custom { _, classDef ->
+        classDef.endsWith("CB11Details;")
+    }
 }
 
 internal val getBottomBarFingerprint = fingerprint {
-    custom { method, classDef -> method.name == "getBottomBar" && classDef.endsWith("HomeMenu;") }
+    custom { method, classDef ->
+        method.name == "getBottomBar" && classDef.endsWith("HomeMenu;")
+    }
 }