From ea5748ca8e0c7130face5ca4c86cfe5e00a3ed65 Mon Sep 17 00:00:00 2001
From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com>
Date: Wed, 7 Feb 2024 15:23:40 +0400
Subject: [PATCH] fix(YouTube - Litho Filter): Do not show toast if protobuffer
 is empty or null (#563)

---
 .../patches/components/LithoFilterPatch.java  | 30 ++++++++++++-------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/components/LithoFilterPatch.java b/app/src/main/java/app/revanced/integrations/youtube/patches/components/LithoFilterPatch.java
index 66ad85f2..f98a5bb2 100644
--- a/app/src/main/java/app/revanced/integrations/youtube/patches/components/LithoFilterPatch.java
+++ b/app/src/main/java/app/revanced/integrations/youtube/patches/components/LithoFilterPatch.java
@@ -398,17 +398,17 @@ public final class LithoFilterPatch {
         final String path;
         final byte[] protoBuffer;
 
-        LithoFilterParameters(@Nullable String lithoIdentifier, StringBuilder lithoPath, ByteBuffer protoBuffer) {
+        LithoFilterParameters(@Nullable String lithoIdentifier, String lithoPath, byte[] protoBuffer) {
             this.identifier = lithoIdentifier;
-            this.path = lithoPath.toString();
-            this.protoBuffer = protoBuffer.array();
+            this.path = lithoPath;
+            this.protoBuffer = protoBuffer;
         }
 
         @NonNull
         @Override
         public String toString() {
             // Estimate the percentage of the buffer that are Strings.
-            StringBuilder builder = new StringBuilder(protoBuffer.length / 2);
+            StringBuilder builder = new StringBuilder(Math.max(100, protoBuffer.length / 2));
             builder.append( "ID: ");
             builder.append(identifier);
             builder.append(" Path: ");
@@ -457,6 +457,8 @@ public final class LithoFilterPatch {
     private static final StringTrieSearch pathSearchTree = new StringTrieSearch();
     private static final StringTrieSearch identifierSearchTree = new StringTrieSearch();
 
+    private static final byte[] EMPTY_BYTE_ARRAY = new byte[0];
+
     /**
      * Because litho filtering is multi-threaded and the buffer is passed in from a different injection point,
      * the buffer is saved to a ThreadLocal so each calling thread does not interfere with other threads.
@@ -520,17 +522,23 @@ public final class LithoFilterPatch {
                 return false;
 
             ByteBuffer protobufBuffer = bufferThreadLocal.get();
+            final byte[] bufferArray;
+            // The buffer can be null or empty when using YT 19.x.
+            // This is likely caused by different threads setting the buffer and calling this method.
+            // 100% fixing this would require passing the buffer into this method (which may not be so simple).
+            // For now, still filter with an empty buffer so the non proto buffer filters work correctly.
             if (protobufBuffer == null) {
-                Logger.printException(() -> "Proto buffer is null"); // Should never happen.
-                return false;
-            }
-
-            if (!protobufBuffer.hasArray()) {
+                Logger.printDebug(() -> "Proto buffer is null");
+                bufferArray = EMPTY_BYTE_ARRAY;
+            } else if (!protobufBuffer.hasArray()) {
                 Logger.printDebug(() -> "Proto buffer does not have an array");
-                return false;
+                bufferArray = EMPTY_BYTE_ARRAY;
+            } else {
+                bufferArray = protobufBuffer.array();
             }
 
-            LithoFilterParameters parameter = new LithoFilterParameters(lithoIdentifier, pathBuilder, protobufBuffer);
+            LithoFilterParameters parameter = new LithoFilterParameters(lithoIdentifier,
+                    pathBuilder.toString(), bufferArray);
             Logger.printDebug(() -> "Searching " + parameter);
 
             if (parameter.identifier != null) {