chore(release): 0.103.0-dev.5 [skip ci]

# [0.103.0-dev.5](https://github.com/revanced/revanced-integrations/compare/v0.103.0-dev.4...v0.103.0-dev.5) (2023-04-19)

### Bug Fixes

* **youtube/return-youtube-dislike:** render dislikes when scrolling into the screen ([#350](https://github.com/revanced/revanced-integrations/issues/350)) ([41c07f7](41c07f77f4))

CHANGELOG.md

@@ -1,3 +1,24 @@
+# [0.103.0-dev.5](https://github.com/revanced/revanced-integrations/compare/v0.103.0-dev.4...v0.103.0-dev.5) (2023-04-19)
+
+
+### Bug Fixes
+
+* **youtube/return-youtube-dislike:** render dislikes when scrolling into the screen ([#350](https://github.com/revanced/revanced-integrations/issues/350)) ([41c07f7](https://github.com/revanced/revanced-integrations/commit/41c07f77f47d726fdc16120bb5695407a7dec1fc))
+
+# [0.103.0-dev.4](https://github.com/revanced/revanced-integrations/compare/v0.103.0-dev.3...v0.103.0-dev.4) (2023-04-18)
+
+
+### Bug Fixes
+
+* minor syntax error ([8797765](https://github.com/revanced/revanced-integrations/commit/8797765efa0fb98b6e11a7198ecce3943df3daf5))
+
+# [0.103.0-dev.3](https://github.com/revanced/revanced-integrations/compare/v0.103.0-dev.2...v0.103.0-dev.3) (2023-04-17)
+
+
+### Features
+
+* **youtube/general-ads:** hide new type of movie offer ad ([da7b669](https://github.com/revanced/revanced-integrations/commit/da7b669c97d18bef51de98ddfde8a514ebb61ecf))
+
 # [0.103.0-dev.2](https://github.com/revanced/revanced-integrations/compare/v0.103.0-dev.1...v0.103.0-dev.2) (2023-04-16)
 
 

app/src/main/java/app/revanced/integrations/patches/GeneralAdsPatch.java

@@ -74,7 +74,8 @@ public final class GeneralAdsPatch extends Filter {
                 "compact_movie",
                 "horizontal_movie_shelf",
                 "movie_and_show_upsell_card",
-                "compact_tvfilm_item"
+                "compact_tvfilm_item",
+                "offer_module_root"
         );
 
         this.pathRegister.registerAll(

app/src/main/java/app/revanced/integrations/patches/ReturnYouTubeDislikePatch.java

@@ -1,48 +1,108 @@
 package app.revanced.integrations.patches;
 
+import static app.revanced.integrations.returnyoutubedislike.ReturnYouTubeDislike.Vote;
+
+import android.text.SpannableString;
 import android.text.Spanned;
-import app.revanced.integrations.returnyoutubedislike.ReturnYouTubeDislike;
+
+import androidx.annotation.NonNull;
 
 import java.util.concurrent.atomic.AtomicReference;
 
-/**
- * TODO: delete this empty class, and point the patch to {@link ReturnYouTubeDislike}
- */
+import app.revanced.integrations.returnyoutubedislike.ReturnYouTubeDislike;
+import app.revanced.integrations.settings.SettingsEnum;
+import app.revanced.integrations.utils.LogHelper;
+
 public class ReturnYouTubeDislikePatch {
 
     /**
-     * Injection point
+     * Injection point.
      */
     public static void newVideoLoaded(String videoId) {
-        ReturnYouTubeDislike.newVideoLoaded(videoId);
+        try {
+            if (!SettingsEnum.RYD_ENABLED.getBoolean()) return;
+            ReturnYouTubeDislike.newVideoLoaded(videoId);
+        } catch (Exception ex) {
+            LogHelper.printException(() -> "newVideoLoaded failure", ex);
+        }
     }
 
     /**
-     * Injection point
+     * Injection point.
      *
-     * Called when a litho text component is created
+     * Called when a litho text component is initially created,
+     * and also when a Span is later reused again (such as scrolling off/on screen).
+     *
+     * 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 textRef Cache reference to the like/dislike char sequence,
+     *                which may or may not be the same as the original span parameter.
+     *                If dislikes are added, the atomic reference must be set to the replacement span.
+     * @param original Original span that was created or reused by Litho.
+     * @return The original span (if nothing should change), or a replacement span that contains dislikes.
      */
-    public static void onComponentCreated(Object conversionContext, AtomicReference<Object> textRef) {
-        ReturnYouTubeDislike.onComponentCreated(conversionContext, textRef);
+    @NonNull
+    public static CharSequence onLithoTextLoaded(@NonNull Object conversionContext,
+                                                 @NonNull AtomicReference<CharSequence> textRef,
+                                                 @NonNull CharSequence original) {
+        try {
+            if (!SettingsEnum.RYD_ENABLED.getBoolean()) {
+                return original;
+            }
+            SpannableString replacement = ReturnYouTubeDislike.getDislikeSpanForContext(conversionContext, original);
+            if (replacement != null) {
+                textRef.set(replacement);
+                return replacement;
+            }
+        } catch (Exception ex) {
+            LogHelper.printException(() -> "onComponentCreated AtomicReference failure", ex);
+        }
+        return original;
     }
 
     /**
-     * Injection point
+     * Injection point.
      *
-     * Called when a Shorts dislike Spannable is created
+     * Called when a Shorts dislike Spanned is created.
      */
-    public static Spanned onShortsComponentCreated(Spanned dislike) {
-        return ReturnYouTubeDislike.onShortsComponentCreated(dislike);
+    public static Spanned onShortsComponentCreated(Spanned original) {
+        try {
+            if (!SettingsEnum.RYD_ENABLED.getBoolean()) {
+                return original;
+            }
+            SpannableString replacement = ReturnYouTubeDislike.getDislikeSpanForShort(original);
+            if (replacement != null) {
+                return replacement;
+            }
+        } catch (Exception ex) {
+            LogHelper.printException(() -> "onShortsComponentCreated failure", ex);
+        }
+        return original;
     }
 
     /**
-     * Injection point
+     * Injection point.
      *
-     * Called when the like/dislike button is clicked
+     * Called when the user likes or dislikes.
      *
-     * @param vote -1 (dislike), 0 (none) or 1 (like)
+     * @param vote int that matches {@link ReturnYouTubeDislike.Vote#value}
      */
     public static void sendVote(int vote) {
-        ReturnYouTubeDislike.sendVote(vote);
+        try {
+            if (!SettingsEnum.RYD_ENABLED.getBoolean()) {
+                return;
+            }
+
+            for (Vote v : Vote.values()) {
+                if (v.value == vote) {
+                    ReturnYouTubeDislike.sendVote(v);
+                    return;
+                }
+            }
+            LogHelper.printException(() -> "Unknown vote type: " + vote);
+        } catch (Exception ex) {
+            LogHelper.printException(() -> "sendVote failure", ex);
+        }
     }
 }

app/src/main/java/app/revanced/integrations/returnyoutubedislike/requests/ReturnYouTubeDislikeApi.java

@@ -203,7 +203,7 @@ public class ReturnYouTubeDislikeApi {
     @SuppressWarnings("NonAtomicOperationOnVolatileField") // do not want to pay performance cost of full synchronization for debug fields that are only estimates anyways
     private static void updateStatistics(long timeNetworkCallStarted, long timeNetworkCallEnded, boolean connectionError, boolean rateLimitHit) {
         if (connectionError && rateLimitHit) {
-            throw new IllegalArgumentException("both connection error and rate limit parameter were true");
+            throw new IllegalArgumentException();
         }
         final long responseTimeOfFetchCall = timeNetworkCallEnded - timeNetworkCallStarted;
         fetchCallResponseTimeTotal += responseTimeOfFetchCall;
@@ -320,7 +320,7 @@ public class ReturnYouTubeDislikeApi {
                 return confirmRegistration(userId, solution);
             }
             LogHelper.printException(() -> "Failed to register new user: " + userId
-                    + " response code was: " + responseCode);
+                    + " response code was: " + responseCode); // failed attempt, and ok to log userId
             connection.disconnect();
         } catch (Exception ex) {
             LogHelper.printException(() -> "Failed to register user", ex);
@@ -337,7 +337,7 @@ public class ReturnYouTubeDislikeApi {
             if (checkIfRateLimitInEffect("confirmRegistration")) {
                 return null;
             }
-            LogHelper.printDebug(() -> "Trying to confirm registration for user: " + userId + " with solution: " + solution);
+            LogHelper.printDebug(() -> "Trying to confirm registration with solution: " + solution);
 
             HttpURLConnection connection = getRYDConnectionFromRoute(ReturnYouTubeDislikeRoutes.CONFIRM_REGISTRATION, userId);
             applyCommonPostRequestSettings(connection);
@@ -355,7 +355,7 @@ public class ReturnYouTubeDislikeApi {
             if (responseCode == HTTP_STATUS_CODE_SUCCESS) {
                 String result = Requester.parseJson(connection);
                 if (result.equalsIgnoreCase("true")) {
-                    LogHelper.printDebug(() -> "Registration confirmation successful for user: " + userId);
+                    LogHelper.printDebug(() -> "Registration confirmation successful");
                     return userId;
                 }
                 LogHelper.printException(() -> "Failed to confirm registration for user: " + userId
@@ -382,8 +382,7 @@ public class ReturnYouTubeDislikeApi {
             if (checkIfRateLimitInEffect("sendVote")) {
                 return false;
             }
-            LogHelper.printDebug(() -> "Trying to vote for video: "
-                    + videoId + " with vote: " + vote + " user: " + userId);
+            LogHelper.printDebug(() -> "Trying to vote for video: " + videoId + " with vote: " + vote);
 
             HttpURLConnection connection = getRYDConnectionFromRoute(ReturnYouTubeDislikeRoutes.SEND_VOTE);
             applyCommonPostRequestSettings(connection);
@@ -408,11 +407,10 @@ public class ReturnYouTubeDislikeApi {
                 return confirmVote(videoId, userId, solution);
             }
             LogHelper.printException(() -> "Failed to send vote for video: " + videoId
-                    + " userId: " + userId + " vote: " + vote + " response code was: " + responseCode);
+                    + " vote: " + vote + " response code was: " + responseCode);
             connection.disconnect(); // something went wrong, might as well disconnect
         } catch (Exception ex) {
-            LogHelper.printException(() -> "Failed to send vote for video: " + videoId
-                    + " user: " + userId + " vote: " + vote, ex);
+            LogHelper.printException(() -> "Failed to send vote for video: " + videoId + " vote: " + vote, ex);
         }
         return false;
     }
@@ -427,8 +425,7 @@ public class ReturnYouTubeDislikeApi {
             if (checkIfRateLimitInEffect("confirmVote")) {
                 return false;
             }
-            LogHelper.printDebug(() -> "Trying to confirm vote for video: "
-                    + videoId + " user: " + userId + " solution: " + solution);
+            LogHelper.printDebug(() -> "Trying to confirm vote for video: " + videoId + " solution: " + solution);
             HttpURLConnection connection = getRYDConnectionFromRoute(ReturnYouTubeDislikeRoutes.CONFIRM_VOTE);
             applyCommonPostRequestSettings(connection);
 
@@ -450,15 +447,15 @@ public class ReturnYouTubeDislikeApi {
                     return true;
                 }
                 LogHelper.printException(() -> "Failed to confirm vote for video: " + videoId
-                        + " user: " + userId + " solution: " + solution + " response string was: " + result);
+                        + " solution: " + solution + " response string was: " + result);
             } else {
                 LogHelper.printException(() -> "Failed to confirm vote for video: " + videoId
-                        + " user: " + userId + " solution: " + solution + " response code was: " + responseCode);
+                        + " solution: " + solution + " response code was: " + responseCode);
             }
             connection.disconnect(); // something went wrong, might as well disconnect
         } catch (Exception ex) {
             LogHelper.printException(() -> "Failed to confirm vote for video: " + videoId
-                    + " user: " + userId + " solution: " + solution, ex);
+                    + " solution: " + solution, ex);
         }
         return false;
     }

gradle.properties

@@ -1,3 +1,3 @@
 org.gradle.jvmargs = -Xmx2048m
 android.useAndroidX = true
-version = 0.103.0-dev.2
+version = 0.103.0-dev.5