chore(release): 0.96.0-dev.1 [skip ci]

# [0.96.0-dev.1](https://github.com/revanced/revanced-integrations/compare/v0.95.0...v0.96.0-dev.1) (2023-02-10)

### Features

* **youtube/general-ads:** hide pill to view products ([43e419e](43e419e6a6))

.github/workflows/pull_request.yml

@@ -0,0 +1,25 @@
+name: PR to main
+
+on:
+  push:
+    branches:
+      - dev
+  workflow_dispatch:
+
+env:
+  MESSAGE: merge branch `${{ github.head_ref || github.ref_name }}` to `main`
+
+jobs:
+  pull-request:
+    name: Open pull request
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Open pull request
+        uses: repo-sync/pull-request@v2
+        with:
+          destination_branch: 'main'
+          pr_title: 'chore: ${{ env.MESSAGE }}'
+          pr_body: 'This pull request will ${{ env.MESSAGE }}.'
+          pr_draft: true

.github/workflows/release.yml

@@ -12,13 +12,19 @@ on:
       - dev
 
 jobs:
-  build:
+  release:
+    name: Release
     runs-on: ubuntu-latest
     steps:
     - name: Cancel previou runs
       uses: styfle/cancel-workflow-action@0.11.0
     - name: Checkout
       uses: actions/checkout@v3
+      with:
+        # Make sure the release step uses its own credentials:
+        # https://github.com/cycjimmy/semantic-release-action#private-packages
+        persist-credentials: false
+        fetch-depth: 0
     - name: Set up JDK
       uses: actions/setup-java@v3
       with:
@@ -29,11 +35,9 @@ jobs:
       with:
         node-version: "latest"
         cache: 'npm'
-    - name: Build with Gradle
-      run: ./gradlew build --no-daemon
     - name: Setup semantic-release
-      run: npm install semantic-release @semantic-release/git @semantic-release/changelog gradle-semantic-release-plugin -D
+      run: npm install semantic-release@19.0.5 @saithodev/semantic-release-backmerge @semantic-release/git @semantic-release/changelog gradle-semantic-release-plugin@1.7.4 -D
     - name: Release
       env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        GITHUB_TOKEN: ${{ secrets.REPOSITORY_PUSH_ACCESS }}
       run: npx semantic-release

.releaserc

@@ -7,11 +7,7 @@
     }
   ],
   "plugins": [
-     ["@semantic-release/commit-analyzer", {
-      "releaseRules": [
-        {"type": "build", "release": "patch"}
-      ]
-    }],
+    "@semantic-release/commit-analyzer",
     "@semantic-release/release-notes-generator",
     "@semantic-release/changelog",
     "gradle-semantic-release-plugin",
@@ -31,7 +27,15 @@
           {
             "path": "app/build/outputs/apk/release/*.apk"
           }
-        ]
+        ],
+        successComment: false
+      }
+    ],
+    [
+      "@saithodev/semantic-release-backmerge",
+      {
+        branches: [{from: "main", to: "dev"}],
+        clearWorkspace: true
       }
     ]
   ]

app/build.gradle.kts

@@ -8,29 +8,31 @@ plugins {
 
 android {
     compileSdk = 33
-    buildToolsVersion = "33.0.0"
+    buildToolsVersion = "33.0.1"
     namespace = "app.revanced.integrations"
 
     defaultConfig {
         applicationId = "app.revanced.integrations"
         minSdk = 23
         targetSdk = 33
-        versionCode = 1
-        versionName = "1.0"
         multiDexEnabled = false
-
-        val properties = Properties()
-        if (rootProject.file("local.properties").exists()) {
-            properties.load(FileInputStream(rootProject.file("local.properties")))
-        }
-
-        buildConfigField("String", "YT_API_KEY", "\"${properties.getProperty("youtubeAPIKey", "")}\"")
+        versionName = project.version as String
     }
 
     buildTypes {
         release {
             isMinifyEnabled = true
-            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+        applicationVariants.all {
+            outputs.all {
+                this as com.android.build.gradle.internal.api.ApkVariantOutputImpl
+
+                outputFileName = "${rootProject.name}-$versionName.apk"
+            }
         }
     }
     compileOptions {
@@ -46,6 +48,8 @@ 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.okhttp3:okhttp:5.0.0-alpha.11")
     compileOnly("com.squareup.retrofit2:retrofit:2.9.0")
 }
+
+tasks.register("publish") { dependsOn("build") }

app/src/main/java/app/revanced/all/screenshot/removerestriction/RemoveScreenshotRestrictionPatch.java

@@ -0,0 +1,11 @@
+package app.revanced.all.screenshot.removerestriction;
+
+import android.view.Window;
+import android.view.WindowManager;
+
+public class RemoveScreenshotRestrictionPatch {
+
+    public static void setFlags(Window window, int flags, int mask) {
+        window.setFlags(flags & ~WindowManager.LayoutParams.FLAG_SECURE, mask & ~WindowManager.LayoutParams.FLAG_SECURE);
+    }
+}

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

@@ -0,0 +1,27 @@
+package app.revanced.integrations.patches;
+
+import android.content.Context;
+import android.widget.Toast;
+
+import app.revanced.integrations.sponsorblock.StringRef;
+import app.revanced.integrations.utils.LogHelper;
+import app.revanced.integrations.utils.ReVancedUtils;
+
+public class CopyVideoUrlPatch {
+    public static void copyUrl(Boolean withTimestamp) {
+        try {
+            String url = String.format("https://youtu.be/%s", VideoInformation.getCurrentVideoId());
+            if (withTimestamp) {
+                long seconds = VideoInformation.getVideoTime() / 1000;
+                url += String.format("?t=%s", seconds);
+            }
+
+            Context context = ReVancedUtils.getContext();
+
+            ReVancedUtils.setClipboard(url);
+            if (context != null) Toast.makeText(context, StringRef.str("share_copy_url_success"), Toast.LENGTH_SHORT).show();
+        } catch (Exception e) {
+            LogHelper.printException(() -> "Failed to generate video url", e);
+        }
+    }
+}

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

@@ -0,0 +1,42 @@
+package app.revanced.integrations.patches;
+
+import com.google.android.apps.youtube.app.watchwhile.WatchWhileActivity;
+import app.revanced.integrations.utils.LogHelper;
+
+public class FixBackToExitGesturePatch {
+    /**
+     * State whether the scroll position reaches the top.
+     */
+    public static boolean isTopView = false;
+
+    /**
+     * Handle the event after clicking the back button.
+     *
+     * @param activity The activity, the app is launched with to finish.
+     */
+    public static void onBackPressed(WatchWhileActivity activity) {
+        if (!isTopView) return;
+
+        LogHelper.printDebug(() -> "Activity is closed");
+
+        activity.finish();
+    }
+
+    /**
+     * Handle the event when the homepage list of views is being scrolled.
+     */
+    public static void onScrollingViews() {
+        LogHelper.printDebug(() -> "Views are scrolling");
+
+        isTopView = false;
+    }
+
+    /**
+     * Handle the event when the homepage list of views reached the top.
+     */
+    public static void onTopView() {
+        LogHelper.printDebug(() -> "Scrolling reached the top");
+
+        isTopView = true;
+    }
+}

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

@@ -1,40 +0,0 @@
-package app.revanced.integrations.patches;
-
-import app.revanced.integrations.settings.SettingsEnum;
-import app.revanced.integrations.utils.LogHelper;
-
-public final class FixPlaybackPatch {
-    private static Thread currentThread = null;
-    private static String videoId;
-
-    public static void newVideoLoaded(final String videoId) {
-        if (!SettingsEnum.FIX_PLAYBACK.getBoolean()) return;
-
-        if (videoId.equals(FixPlaybackPatch.videoId)) return;
-        else FixPlaybackPatch.videoId = videoId;
-
-        if (currentThread != null) {
-            currentThread.interrupt();
-        }
-
-        currentThread = new Thread(() -> {
-            try {
-                while (true) {
-                    var currentVideoTime = VideoInformation.getVideoTime();
-
-                    if (currentVideoTime > -1) {
-                        VideoInformation.seekTo(Integer.MAX_VALUE);
-                        VideoInformation.seekTo(currentVideoTime);
-                        return;
-                    }
-
-                    Thread.sleep(10);
-                }
-            } catch (InterruptedException e) {
-                LogHelper.printDebug(() -> "Thread was interrupted");
-            }
-        });
-
-        currentThread.start();
-    }
-}

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

@@ -1,7 +1,6 @@
 package app.revanced.integrations.patches;
 
 import android.view.View;
-
 import app.revanced.integrations.adremover.AdRemoverAPI;
 import app.revanced.integrations.settings.SettingsEnum;
 import app.revanced.integrations.utils.LogHelper;
@@ -13,9 +12,7 @@ public final class GeneralAdsPatch extends Filter {
             "related_video_with_context",
             "comment_thread", // skip blocking anything in the comments
             "|comment.", // skip blocking anything in the comments replies
-            "download_",
             "library_recent_shelf",
-            "playlist_add_to_option_wrapper" // do not block on "add to playlist" flyout menu
     };
 
     private final BlockRule custom = new CustomBlockRule(
@@ -26,18 +23,20 @@ public final class GeneralAdsPatch extends Filter {
     public GeneralAdsPatch() {
         var communityPosts = new BlockRule(SettingsEnum.ADREMOVER_COMMUNITY_POSTS_REMOVAL, "post_base_wrapper");
         var communityGuidelines = new BlockRule(SettingsEnum.ADREMOVER_COMMUNITY_GUIDELINES_REMOVAL, "community_guidelines");
+        var subscribersCommunityGuidelines = new BlockRule(SettingsEnum.ADREMOVER_SUBSCRIBERS_COMMUNITY_GUIDELINES_REMOVAL, "sponsorships_comments_upsell");
+        var channelMemberShelf = new BlockRule(SettingsEnum.ADREMOVER_CHANNEL_MEMBER_SHELF_REMOVAL, "member_recognition_shelf");
         var compactBanner = new BlockRule(SettingsEnum.ADREMOVER_COMPACT_BANNER_REMOVAL, "compact_banner");
         var inFeedSurvey = new BlockRule(SettingsEnum.ADREMOVER_FEED_SURVEY_REMOVAL, "in_feed_survey");
         var medicalPanel = new BlockRule(SettingsEnum.ADREMOVER_MEDICAL_PANEL_REMOVAL, "medical_panel");
         var paidContent = new BlockRule(SettingsEnum.ADREMOVER_PAID_CONTENT_REMOVAL, "paid_content_overlay");
         var merchandise = new BlockRule(SettingsEnum.ADREMOVER_MERCHANDISE_REMOVAL, "product_carousel");
         var infoPanel = new BlockRule(SettingsEnum.ADREMOVER_INFO_PANEL_REMOVAL, "publisher_transparency_panel", "single_item_information_panel");
-        var suggestions = new BlockRule(SettingsEnum.ADREMOVER_SUGGESTIONS_REMOVAL, "horizontal_video_shelf");
         var latestPosts = new BlockRule(SettingsEnum.ADREMOVER_HIDE_LATEST_POSTS, "post_shelf");
         var channelGuidelines = new BlockRule(SettingsEnum.ADREMOVER_HIDE_CHANNEL_GUIDELINES, "channel_guidelines_entry_banner");
         var artistCard = new BlockRule(SettingsEnum.HIDE_ARTIST_CARD, "official_card");
         var selfSponsor = new BlockRule(SettingsEnum.ADREMOVER_SELF_SPONSOR_REMOVAL, "cta_shelf_card");
         var chapterTeaser = new BlockRule(SettingsEnum.ADREMOVER_CHAPTER_TEASER_REMOVAL, "expandable_metadata");
+        var viewProducts = new BlockRule(SettingsEnum.ADREMOVER_GRAY_SEPARATOR, "product_item", "products_in_video");
         var graySeparator = new BlockRule(SettingsEnum.ADREMOVER_GRAY_SEPARATOR,
                 "cell_divider" // layout residue (gray line above the buttoned ad),
         );
@@ -69,19 +68,21 @@ public final class GeneralAdsPatch extends Filter {
                 buttonedAd,
                 communityPosts,
                 paidContent,
-                suggestions,
                 latestPosts,
                 movieAds,
                 chapterTeaser,
                 communityGuidelines,
                 compactBanner,
                 inFeedSurvey,
+                viewProducts,
                 medicalPanel,
                 merchandise,
                 infoPanel,
                 channelGuidelines,
                 artistCard,
-                selfSponsor
+                selfSponsor,
+                subscribersCommunityGuidelines,
+                channelMemberShelf
         );
 
         var carouselAd = new BlockRule(SettingsEnum.ADREMOVER_GENERAL_ADS_REMOVAL,
@@ -113,7 +114,7 @@ public final class GeneralAdsPatch extends Filter {
         else
             result = BlockResult.UNBLOCKED;
 
-        log(String.format("%s (ID: %s): %s", result.message, identifier, path));
+        LogHelper.printDebug(() -> String.format("%s (ID: %s): %s", result.message, identifier, path));
 
         return result.filter;
     }
@@ -142,7 +143,7 @@ public final class GeneralAdsPatch extends Filter {
     private static void hideView(SettingsEnum condition, View view) {
         if (!condition.getBoolean()) return;
 
-        log("Hiding view with setting: " + condition);
+        LogHelper.printDebug(() -> "Hiding view with setting: " + condition);
 
         AdRemoverAPI.HideViewWithLayout1dp(view);
     }
@@ -165,7 +166,4 @@ public final class GeneralAdsPatch extends Filter {
         hideView(SettingsEnum.ADREMOVER_SHORTS_REMOVAL, view);
     }
 
-    private static void log(String message) {
-        LogHelper.printDebug(() -> message);
-    }
 }

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

@@ -0,0 +1,14 @@
+package app.revanced.integrations.patches;
+
+import android.view.View;
+
+import app.revanced.integrations.adremover.AdRemoverAPI;
+import app.revanced.integrations.settings.SettingsEnum;
+
+public class HideBreakingNewsPatch {
+    //Used by app.revanced.patches.youtube.layout.homepage.breakingnews.patch.BreakingNewsPatch
+    public static void hideBreakingNews(View view) {
+        if (!SettingsEnum.HIDE_BREAKING_NEWS.getBoolean()) return;
+        AdRemoverAPI.HideViewWithLayout1dp(view);
+    }
+}

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

@@ -10,8 +10,7 @@ public class HideCreateButtonPatch {
     //Used by app.revanced.patches.youtube.layout.createbutton.patch.CreateButtonRemoverPatch
     public static void hideCreateButton(View view) {
         boolean hidden = SettingsEnum.HIDE_CREATE_BUTTON.getBoolean();
-        String message =  "Create button: " + (hidden ? "hidden" : "shown");
-        LogHelper.printDebug(() -> message);
+        LogHelper.printDebug(() -> "Create button: " + (hidden ? "hidden" : "shown"));
         view.setVisibility(hidden ? View.GONE : View.VISIBLE);
     }
 }

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

@@ -0,0 +1,11 @@
+package app.revanced.integrations.patches;
+
+
+import app.revanced.integrations.settings.SettingsEnum;
+
+public final class HidePlayerButtonsPatch {
+
+    public static boolean hideButtons() {
+        return SettingsEnum.HIDE_PLAYER_BUTTONS.getBoolean();
+    }
+}

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

@@ -12,10 +12,9 @@ public class HideShortsButtonPatch {
     public static void hideShortsButton(View view) {
         if (lastPivotTab != null && lastPivotTab.name() == "TAB_SHORTS") {
             boolean hide = SettingsEnum.HIDE_SHORTS_BUTTON.getBoolean();
-            String message = hide ? "Shorts button: hidden" : "Shorts button: shown";
-            LogHelper.printDebug(() -> message);
+            LogHelper.printDebug(() -> hide ? "Shorts button: hidden" : "Shorts button: shown");
             if (hide) {
-                view.setVisibility(hide ? View.GONE : View.VISIBLE);
+                view.setVisibility(View.GONE);
             }
         }
     }

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

@@ -1,33 +1,50 @@
 package app.revanced.integrations.patches;
 
-import static app.revanced.integrations.sponsorblock.StringRef.str;
-
+import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.widget.Toast;
-
 import app.revanced.integrations.utils.LogHelper;
 import app.revanced.integrations.utils.ReVancedUtils;
 
+import java.util.Objects;
+
+import static app.revanced.integrations.sponsorblock.StringRef.str;
+
 public class MicroGSupport {
     private static final String MICROG_VENDOR = "com.mgoogle";
-    private static final String MICROG_PACKAGE_NAME = "com.mgoogle.android.gms";
+    private static final String MICROG_PACKAGE_NAME = MICROG_VENDOR + ".android.gms";
     private static final String VANCED_MICROG_DOWNLOAD_LINK = "https://github.com/TeamVanced/VancedMicroG/releases/latest";
+    private static final String DONT_KILL_MY_APP_LINK = "https://dontkillmyapp.com";
+    private static final Uri VANCED_MICROG_PROVIDER = Uri.parse("content://" + MICROG_VENDOR + ".android.gsf.gservices/prefix");
+
+    private static void startIntent(Context context, String uriString, String message) {
+        Toast.makeText(context, message, Toast.LENGTH_LONG).show();
+
+        var intent = new Intent(Intent.ACTION_VIEW);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        intent.setData(Uri.parse(uriString));
+        context.startActivity(intent);
+    }
 
     public static void checkAvailability() {
-        var context = ReVancedUtils.getContext();
-        assert context != null;
+        var context = Objects.requireNonNull(ReVancedUtils.getContext());
+
         try {
             context.getPackageManager().getPackageInfo(MICROG_PACKAGE_NAME, PackageManager.GET_ACTIVITIES);
-            LogHelper.printDebug(() -> "MicroG is installed on the device");
         } catch (PackageManager.NameNotFoundException exception) {
-            LogHelper.printException(() -> ("MicroG was not found"), exception);
-            Toast.makeText(context, str("microg_not_installed_warning"), Toast.LENGTH_LONG).show();
+            LogHelper.printInfo(() -> "Vanced MicroG was not found", exception);
+            startIntent(context, VANCED_MICROG_DOWNLOAD_LINK, str("microg_not_installed_warning"));
 
-            var intent = new Intent(Intent.ACTION_VIEW);
-            intent.setData(Uri.parse(VANCED_MICROG_DOWNLOAD_LINK));
-            context.startActivity(intent);
+            // Gracefully exit the app, so it does not crash.
+            System.exit(0);
+        }
+
+        try (var client = context.getContentResolver().acquireContentProviderClient(VANCED_MICROG_PROVIDER)) {
+            if (client != null) return;
+            LogHelper.printInfo(() -> "Vanced MicroG is not running in the background");
+            startIntent(context, DONT_KILL_MY_APP_LINK, str("microg_not_running_warning"));
         }
     }
 }

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

@@ -0,0 +1,19 @@
+package app.revanced.integrations.patches;
+
+import app.revanced.integrations.settings.SettingsEnum;
+
+public class OpenLinksExternallyPatch {
+    /**
+     * Override 'android.support.customtabs.action.CustomTabsService',
+     * in order to open links in the default browser. This is done by returning an empty string,
+     * for the service that handles custom tabs in the Android support library
+     * which opens links in the default service instead.
+     *
+     * @param original The original custom tabs service.
+     * @return The new, default service to open links with or the original service.
+     */
+    public static String enableExternalBrowser(String original) {
+        if (SettingsEnum.ENABLE_EXTERNAL_BROWSER.getBoolean()) original = "";
+        return original;
+    }
+}

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

@@ -2,8 +2,8 @@ package app.revanced.integrations.patches;
 
 import androidx.annotation.Nullable;
 
-import app.revanced.integrations.utils.LogHelper;
 import app.revanced.integrations.shared.PlayerType;
+import app.revanced.integrations.utils.LogHelper;
 
 /**
  * Hook receiver class for 'player-type-hook' patch
@@ -24,7 +24,9 @@ public class PlayerTypeHookPatch {
 
         // update current player type
         final PlayerType newType = PlayerType.safeParseFromString(type.toString());
-        if (newType != null) {
+        if (newType == null) {
+            LogHelper.printException(() -> "Unknown PlayerType encountered: " + type);
+        } else {
             PlayerType.setCurrent(newType);
             LogHelper.printDebug(() -> "YouTubePlayerOverlaysLayout player type was updated to " + newType);
         }

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

@@ -0,0 +1,15 @@
+package app.revanced.integrations.patches;
+
+import app.revanced.integrations.settings.SettingsEnum;
+
+public class SpoofAppVersionPatch {
+
+    public static String getYouTubeVersionOverride(String version) {
+        if (SettingsEnum.SPOOF_APP_VERSION.getBoolean()){
+            // Override with the most recent version that does not show the new UI player layout.
+            // If the new UI shows up for some users, then change this to an older version (such as 17.29.34).
+            return "17.30.34";
+        }
+        return version;
+    }
+}

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

@@ -17,6 +17,7 @@ public final class VideoInformation {
     private static WeakReference<Object> playerController;
     private static Method seekMethod;
 
+    private static String videoId = "";
     private static long videoLength = 1;
     private static long videoTime = -1;
 
@@ -35,10 +36,21 @@ public final class VideoInformation {
             seekMethod = thisRef.getClass().getMethod(SEEK_METHOD_NAME, Long.TYPE);
             seekMethod.setAccessible(true);
         } catch (NoSuchMethodException ex) {
-            LogHelper.printDebug(() -> "Failed to initialize: " + ex.getMessage());
+            LogHelper.printException(() -> "Failed to initialize", ex);
         }
     }
 
+    /**
+     * Set the video id.
+     *
+     * @param videoId The id of the video.
+     */
+    public static void setVideoId(String videoId) {
+        LogHelper.printDebug(() -> "Setting current video id to: " + videoId);
+
+        VideoInformation.videoId = videoId;
+    }
+
     /**
      * Set the video length.
      *
@@ -75,11 +87,20 @@ public final class VideoInformation {
                 LogHelper.printDebug(() -> "Seeking to " + millisecond);
                 seekMethod.invoke(playerController.get(), millisecond);
             } catch (Exception ex) {
-                LogHelper.printDebug(() -> "Failed to seek: " + ex.getMessage());
+                LogHelper.printException(() -> "Failed to seek", ex);
             }
         });
     }
 
+    /**
+     * Get the id of the current video playing.
+     *
+     * @return The id of the video. Empty string if not set yet.
+     */
+    public static String getCurrentVideoId() {
+        return videoId;
+    }
+
     /**
      * Get the length of the current video playing.
      *

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

@@ -1,177 +0,0 @@
-package app.revanced.integrations.patches;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import app.revanced.integrations.settings.SettingsEnum;
-import app.revanced.integrations.utils.LogHelper;
-import app.revanced.integrations.utils.ReVancedUtils;
-
-public class VideoSpeedPatch {
-
-    public static final float[] videoSpeeds = { 0, 0 }; // Values are useless as they are being overridden by the respective patch
-    private static Boolean userChangedSpeed = false;
-
-    public static int getDefaultSpeed(Object[] speeds, int speed, Object qInterface) {
-        int speed2;
-        Exception e;
-        if (!ReVancedUtils.isNewVideoStarted()) {
-            return speed;
-        }
-        ReVancedUtils.setNewVideo(false);
-        LogHelper.printDebug(() -> "Speed: " + speed);
-        float preferredSpeed = SettingsEnum.PREFERRED_VIDEO_SPEED.getFloat();
-        LogHelper.printDebug(() -> "Preferred speed: " + preferredSpeed);
-        if (preferredSpeed == -2.0f) {
-            return speed;
-        }
-        Class<?> floatType = Float.TYPE;
-        ArrayList<Float> iStreamSpeeds = new ArrayList<>();
-        try {
-            for (Object streamSpeed : speeds) {
-                Field[] fields = streamSpeed.getClass().getFields();
-                for (Field field : fields) {
-                    if (field.getType().isAssignableFrom(floatType)) {
-                        float value = field.getFloat(streamSpeed);
-                        if (field.getName().length() <= 2) {
-                            iStreamSpeeds.add(value);
-                        }
-                    }
-                }
-            }
-        } catch (Exception ignored) {
-        }
-        Iterator<Float> it = iStreamSpeeds.iterator();
-        int index = 0;
-        while (it.hasNext()) {
-            float streamSpeed2 = it.next();
-            final int logIndex = index;
-            LogHelper.printDebug(() -> "Speed at index " + logIndex + ": " + streamSpeed2);
-            index++;
-        }
-        int speed3 = -1;
-        for (float streamSpeed3 : iStreamSpeeds) {
-            if (streamSpeed3 <= preferredSpeed) {
-                speed3++;
-                final int speed3ToLog = speed3;
-                LogHelper.printDebug(() -> "Speed loop at index " + speed3ToLog + ": " + streamSpeed3);
-            }
-        }
-        if (speed3 == -1) {
-            LogHelper.printDebug(() -> "Speed was not found");
-            speed2 = 3;
-        } else {
-            speed2 = speed3;
-        }
-        try {
-            Method[] declaredMethods = qInterface.getClass().getDeclaredMethods();
-            for (Method method : declaredMethods) {
-                if (method.getName().length() <= 2) {
-                    LogHelper.printDebug(() -> "Method name: " + method.getName());
-                    try {
-                        try {
-                            method.invoke(qInterface, videoSpeeds[speed2]);
-                        } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException ignored) {
-                        } catch (final Exception e6) {
-                            LogHelper.printException(() -> (e6.getMessage()));
-                            return speed2;
-                        }
-                    } catch (Exception ignored) {
-                    }
-                }
-            }
-        } catch (Exception e10) {
-            e = e10;
-        }
-        LogHelper.printDebug(() -> "Speed changed to: " + speed2);
-        return speed2;
-    }
-
-    public static void userChangedSpeed() {
-        userChangedSpeed = true;
-    }
-
-    public static float getSpeedValue(Object[] speeds, int speed) {
-        int i = 0;
-        if (!ReVancedUtils.isNewVideoStarted() || userChangedSpeed) {
-            if (SettingsEnum.DEBUG.getBoolean() && userChangedSpeed) {
-                LogHelper.printDebug(() -> "Skipping speed change because user changed it: " + speed);
-            }
-            userChangedSpeed = false;
-            return -1.0f;
-        }
-        ReVancedUtils.setNewVideo(false);
-        LogHelper.printDebug(() -> "Speed: " + speed);
-        float preferredSpeed = SettingsEnum.PREFERRED_VIDEO_SPEED.getFloat();
-        LogHelper.printDebug(() -> "Preferred speed: " + preferredSpeed);
-        if (preferredSpeed == -2.0f) {
-            return -1.0f;
-        }
-        Class<?> floatType = Float.TYPE;
-        ArrayList<Float> iStreamSpeeds = new ArrayList<>();
-        try {
-            int length = speeds.length;
-            int i2 = 0;
-            while (i2 < length) {
-                Object streamSpeed = speeds[i2];
-                Field[] fields = streamSpeed.getClass().getFields();
-                int length2 = fields.length;
-                while (i < length2) {
-                    Field field = fields[i];
-                    if (field.getType().isAssignableFrom(floatType)) {
-                        float value = field.getFloat(streamSpeed);
-                        if (field.getName().length() <= 2) {
-                            iStreamSpeeds.add(value);
-                        }
-                    }
-                    i++;
-                }
-                i2++;
-                i = 0;
-            }
-        } catch (Exception ignored) {
-        }
-        int index = 0;
-        for (Float iStreamSpeed : iStreamSpeeds) {
-            float streamSpeed2 = iStreamSpeed;
-            final int indexToLog = index;
-            LogHelper.printDebug(() -> "Speed at index " + indexToLog + ": " + streamSpeed2);
-            index++;
-        }
-        int newSpeedIndex = -1;
-        for (Float iStreamSpeed : iStreamSpeeds) {
-            float streamSpeed3 = iStreamSpeed;
-            if (streamSpeed3 <= preferredSpeed) {
-                newSpeedIndex++;
-                final int newSpeedIndexToLog = newSpeedIndex;
-                LogHelper.printDebug(() -> "Speed loop at index " + newSpeedIndexToLog + ": " + streamSpeed3);
-            }
-        }
-        if (newSpeedIndex == -1) {
-            LogHelper.printDebug(() -> "Speed was not found");
-            newSpeedIndex = 3;
-        }
-        if (newSpeedIndex == speed) {
-            final int newSpeedIndexToLog = newSpeedIndex;
-            LogHelper.printDebug(() -> "Trying to set speed to what it already is, skipping...: " + newSpeedIndexToLog);
-            return -1.0f;
-        }
-        final int newSpeedIndexToLog = newSpeedIndex;
-        LogHelper.printDebug(() -> "Speed changed to: " + newSpeedIndexToLog);
-        return getSpeedByIndex(newSpeedIndex);
-    }
-
-    private static float getSpeedByIndex(int index) {
-        if (index == -2) {
-            return 1.0f;
-        }
-        try {
-            return videoSpeeds[index];
-        } catch (Exception e) {
-            return 1.0f;
-        }
-    }
-}

app/src/main/java/app/revanced/integrations/patches/downloads/DownloadsPatch.java

@@ -1,27 +0,0 @@
-package app.revanced.integrations.patches.downloads;
-
-import app.revanced.integrations.utils.LogHelper;
-
-/**
- * Used by app.revanced.patches.youtube.interaction.downloads.bytecode.patch.DownloadsBytecodePatch
- */
-public class DownloadsPatch {
-    private static String videoId;
-
-    /**
-     * Called when the video changes
-     * @param videoId The current video id
-     */
-    public static void setVideoId(String videoId) {
-        LogHelper.printDebug(() -> "newVideoLoaded - " + videoId);
-
-        DownloadsPatch.videoId = videoId;
-    }
-
-    /**
-     * @return The current video id
-     */
-    public static String getCurrentVideoId() {
-        return videoId;
-    }
-}

app/src/main/java/app/revanced/integrations/patches/playback/quality/RememberVideoQualityPatch.java

@@ -1,5 +1,6 @@
 package app.revanced.integrations.patches.playback.quality;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
@@ -25,25 +26,26 @@ public class RememberVideoQualityPatch {
         Context context = ReVancedUtils.getContext();
         if (isConnectedWifi(context)) {
             try {
-                SharedPrefHelper.saveString(context, SharedPrefHelper.SharedPrefNames.REVANCED_PREFS, "wifi_quality", defaultQuality + "");
+                SharedPrefHelper.saveString(SharedPrefHelper.SharedPrefNames.REVANCED_PREFS, "wifi_quality", defaultQuality + "");
+                String message = "Changing default Wi-Fi quality to: " + defaultQuality;
+                LogHelper.printDebug(() -> message);
+                Toast.makeText(context, message, Toast.LENGTH_SHORT).show();
             } catch (Exception ex) {
-                LogHelper.printException(() -> ("Failed to change default WI-FI quality:" + ex));
-                Toast.makeText(context, "Failed to change default WI-FI quality:", Toast.LENGTH_SHORT).show();
+                LogHelper.printException(() -> "Failed to change default WI-FI quality", ex);
             }
-            LogHelper.printDebug(() -> "Changing default Wi-Fi quality to: " + defaultQuality);
-            Toast.makeText(context, "Changing default Wi-Fi quality to: " + defaultQuality, Toast.LENGTH_SHORT).show();
         } else if (isConnectedMobile(context)) {
             try {
-                SharedPrefHelper.saveString(context, SharedPrefHelper.SharedPrefNames.REVANCED_PREFS, "mobile_quality", defaultQuality + "");
+                SharedPrefHelper.saveString(SharedPrefHelper.SharedPrefNames.REVANCED_PREFS, "mobile_quality", defaultQuality + "");
+                String message = "Changing default mobile data quality to:" + defaultQuality;
+                LogHelper.printDebug(() -> message);
+                Toast.makeText(context, message, Toast.LENGTH_SHORT).show();
             } catch (Exception ex) {
-                LogHelper.printDebug(() -> "Failed to change default mobile data quality" + ex);
-                Toast.makeText(context, "Failed to change default mobile data quality", Toast.LENGTH_SHORT).show();
+                LogHelper.printException(() -> "Failed to change default mobile data quality", ex);
             }
-            LogHelper.printDebug(() -> "Changing default mobile data quality to:" + defaultQuality);
-            Toast.makeText(context, "Changing default mobile data quality to:" + defaultQuality, Toast.LENGTH_SHORT).show();
         } else {
-            LogHelper.printDebug(() -> "No internet connection.");
-            Toast.makeText(context, "No internet connection.", Toast.LENGTH_SHORT).show();
+            String message = "No internet connection.";
+            LogHelper.printDebug(() -> message);
+            Toast.makeText(context, message, Toast.LENGTH_SHORT).show();
         }
         userChangedQuality = false;
     }
@@ -88,14 +90,14 @@ public class RememberVideoQualityPatch {
         LogHelper.printDebug(() -> "Quality: " + qualityToLog);
         Context context = ReVancedUtils.getContext();
         if (context == null) {
-            LogHelper.printException(() -> ("Context is null or settings not initialized, returning quality: " + qualityToLog));
+            LogHelper.printException(() -> "Context is null or settings not initialized, returning quality: " + qualityToLog);
             return quality;
         }
         if (isConnectedWifi(context)) {
-            preferredQuality = SharedPrefHelper.getInt(context, SharedPrefHelper.SharedPrefNames.REVANCED_PREFS, "wifi_quality", -2);
+            preferredQuality = SharedPrefHelper.getInt(SharedPrefHelper.SharedPrefNames.REVANCED_PREFS, "wifi_quality", -2);
             LogHelper.printDebug(() -> "Wi-Fi connection detected, preferred quality: " + preferredQuality);
         } else if (isConnectedMobile(context)) {
-            preferredQuality = SharedPrefHelper.getInt(context, SharedPrefHelper.SharedPrefNames.REVANCED_PREFS, "mobile_quality", -2);
+            preferredQuality = SharedPrefHelper.getInt(SharedPrefHelper.SharedPrefNames.REVANCED_PREFS, "mobile_quality", -2);
             LogHelper.printDebug(() -> "Mobile data connection detected, preferred quality: " + preferredQuality);
         } else {
             LogHelper.printDebug(() -> "No Internet connection!");
@@ -129,15 +131,14 @@ public class RememberVideoQualityPatch {
             LogHelper.printDebug(() -> "Quality changed to: " + qualityIndex);
             return qualityIndex;
         } catch (Exception ex) {
-            LogHelper.printException(() -> ("Failed to set quality"), ex);
-            Toast.makeText(context, "Failed to set quality", Toast.LENGTH_SHORT).show();
+            LogHelper.printException(() -> "Failed to set quality", ex);
             return qualityIndex;
         }
     }
 
     public static void userChangedQuality(int selectedQuality) {
         // Do not remember a **new** quality if REMEMBER_VIDEO_QUALITY is false
-        if (SettingsEnum.REMEMBER_VIDEO_QUALITY_LAST_SELECTED.getBoolean() == false) return;
+        if (!SettingsEnum.REMEMBER_VIDEO_QUALITY_LAST_SELECTED.getBoolean()) return;
 
         selectedQuality1 = selectedQuality;
         userChangedQuality = true;
@@ -147,6 +148,7 @@ public class RememberVideoQualityPatch {
         newVideo = true;
     }
 
+    @SuppressLint("MissingPermission")
     private static NetworkInfo getNetworkInfo(Context context) {
         ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
         return cm.getActiveNetworkInfo();

app/src/main/java/app/revanced/integrations/patches/playback/speed/CustomVideoSpeedPatch.java

@@ -1,5 +1,9 @@
 package app.revanced.integrations.patches.playback.speed;
 
 public class CustomVideoSpeedPatch {
-    public static final float[] videoSpeeds = { 0, 0 }; // Values are useless as they are being overridden by the respective patch
+    // Values are useless as they are being overridden by the respective patch.
+    // This generates a .array segment in Dalvik bytecode
+    // which the patch utilizes to store the video speeds in, only
+    // if it has two or more default values.
+    public static final float[] videoSpeeds = { 0, 0 };
 }

app/src/main/java/app/revanced/integrations/patches/playback/speed/RememberPlaybackRatePatch.java

@@ -0,0 +1,32 @@
+package app.revanced.integrations.patches.playback.speed;
+
+import static app.revanced.integrations.utils.SharedPrefHelper.SharedPrefNames.REVANCED_PREFS;
+import static app.revanced.integrations.utils.SharedPrefHelper.getFloat;
+import static app.revanced.integrations.utils.SharedPrefHelper.saveFloat;
+
+import android.widget.Toast;
+
+import app.revanced.integrations.settings.SettingsEnum;
+import app.revanced.integrations.utils.LogHelper;
+import app.revanced.integrations.utils.ReVancedUtils;
+
+
+public final class RememberPlaybackRatePatch {
+    private static final String REMEMBERED_PLAYBACK_RATE_PREFERENCE_KEY = "revanced_remember_playback_rate_last_value";
+
+    public static void rememberPlaybackRate(final float selectedPlaybackRate) {
+        if (!SettingsEnum.REMEMBER_PLAYBACK_RATE_SELECTED.getBoolean()) return;
+
+        Toast.makeText(ReVancedUtils.getContext(), "Playback rate will be remembered", Toast.LENGTH_SHORT).show();
+
+        LogHelper.printDebug(() -> "Remembering playback rate: " + selectedPlaybackRate);
+        saveFloat(REVANCED_PREFS, REMEMBERED_PLAYBACK_RATE_PREFERENCE_KEY, selectedPlaybackRate);
+    }
+
+    public static float getRememberedPlaybackRate() {
+        final var playbackRateOverride = getFloat(REVANCED_PREFS, REMEMBERED_PLAYBACK_RATE_PREFERENCE_KEY, -2f);
+
+        LogHelper.printDebug(() -> "Overriding playback rate: " + playbackRateOverride);
+        return playbackRateOverride;
+    }
+}

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

@@ -97,7 +97,7 @@ public class ReturnYouTubeDislikeApi {
     private static volatile long fetchCallResponseTimeMin;
     private static volatile long fetchCallResponseTimeMax;
 
-    public static final int FETCH_CALL_RESPONSE_TIME_VALUE_RATE_LIMIT = -2;
+    public static final int FETCH_CALL_RESPONSE_TIME_VALUE_RATE_LIMIT = -1;
 
     /**
      * If rate limit was hit, this returns {@link #FETCH_CALL_RESPONSE_TIME_VALUE_RATE_LIMIT}
@@ -128,8 +128,8 @@ public class ReturnYouTubeDislikeApi {
     } // utility class
 
     /**
-     * Only to simulate a slow api call, for debugging the app UI with slow url calls.
      * Simulates a slow response by doing meaningless calculations.
+     * Used to debug the app UI and verify UI timeout logic works
      *
      * @param maximumTimeToWait maximum time to wait
      */
@@ -185,11 +185,15 @@ public class ReturnYouTubeDislikeApi {
             lastTimeRateLimitWasHit = System.currentTimeMillis();
             LogHelper.printDebug(() -> "API rate limit was hit. Stopping API calls for the next "
                     + RATE_LIMIT_BACKOFF_SECONDS + " seconds");
+            ReVancedUtils.runOnMainThread(() -> { // must show toasts on main thread
+                Toast.makeText(ReVancedUtils.getContext(), str("revanced_ryd_failure_client_rate_limit_requested"), Toast.LENGTH_LONG).show();
+            });
             return true;
         }
         return false;
     }
 
+    @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");
@@ -202,11 +206,9 @@ public class ReturnYouTubeDislikeApi {
         if (connectionError) {
             fetchCallResponseTimeLast = responseTimeOfFetchCall;
             fetchCallNumberOfFailures++;
-            showToast("revanced_ryd_failure_connection_timeout");
         } else if (rateLimitHit) {
             fetchCallResponseTimeLast = FETCH_CALL_RESPONSE_TIME_VALUE_RATE_LIMIT;
             numberOfRateLimitRequestsEncountered++;
-            showToast("revanced_ryd_failure_client_rate_limit_requested");
         } else {
             fetchCallResponseTimeLast = responseTimeOfFetchCall;
         }
@@ -226,6 +228,7 @@ public class ReturnYouTubeDislikeApi {
         LogHelper.printDebug(() -> "Fetching votes for: " + videoId);
         final long timeNetworkCallStarted = System.currentTimeMillis();
 
+        String connectionErrorMessageStringKey = "revanced_ryd_failure_connection_timeout";
         try {
             HttpURLConnection connection = getRYDConnectionFromRoute(ReturnYouTubeDislikeRoutes.GET_DISLIKES, videoId);
             // request headers, as per https://returnyoutubedislike.com/docs/fetching
@@ -261,12 +264,12 @@ public class ReturnYouTubeDislikeApi {
                     // fall thru to update statistics
                 }
             } else {
-                LogHelper.printDebug(() -> "Failed to fetch votes for video: " + videoId
-                        + " response code was: " + responseCode);
+                LogHelper.printException(() -> "Failed to fetch votes for video: " + videoId
+                        + " response code was: " + responseCode, null, str(connectionErrorMessageStringKey));
                 connection.disconnect(); // something went wrong, might as well disconnect
             }
         } catch (Exception ex) { // connection timed out, response timeout, or some other network error
-            LogHelper.printException(() -> "Failed to fetch votes", ex);
+            LogHelper.printException(() -> "Failed to fetch votes", ex, str(connectionErrorMessageStringKey));
         }
 
         updateStatistics(timeNetworkCallStarted, System.currentTimeMillis(), true, false);
@@ -304,13 +307,12 @@ public class ReturnYouTubeDislikeApi {
                 String solution = solvePuzzle(challenge, difficulty);
                 return confirmRegistration(userId, solution);
             }
-            LogHelper.printDebug(() -> "Failed to register new user: " + userId
+            LogHelper.printException(() -> "Failed to register new user: " + userId
                     + " response code was: " + responseCode);
             connection.disconnect();
         } catch (Exception ex) {
             LogHelper.printException(() -> "Failed to register user", ex);
         }
-        showToast("revanced_ryd_failure_register_user");
         return null;
     }
 
@@ -344,10 +346,10 @@ public class ReturnYouTubeDislikeApi {
                     LogHelper.printDebug(() -> "Registration confirmation successful for user: " + userId);
                     return userId;
                 }
-                LogHelper.printDebug(() -> "Failed to confirm registration for user: " + userId
+                LogHelper.printException(() -> "Failed to confirm registration for user: " + userId
                         + " solution: " + solution + " response string was: " + result);
             } else {
-                LogHelper.printDebug(() -> "Failed to confirm registration for user: " + userId
+                LogHelper.printException(() -> "Failed to confirm registration for user: " + userId
                         + " solution: " + solution + " response code was: " + responseCode);
             }
             connection.disconnect(); // something went wrong, might as well disconnect
@@ -355,8 +357,6 @@ public class ReturnYouTubeDislikeApi {
             LogHelper.printException(() -> "Failed to confirm registration for user: " + userId
                     + "solution: " + solution, ex);
         }
-        showToast("revanced_ryd_failure_confirm_user");
-
         return null;
     }
 
@@ -395,14 +395,13 @@ public class ReturnYouTubeDislikeApi {
                 String solution = solvePuzzle(challenge, difficulty);
                 return confirmVote(videoId, userId, solution);
             }
-            LogHelper.printDebug(() -> "Failed to send vote for video: " + videoId
+            LogHelper.printException(() -> "Failed to send vote for video: " + videoId
                     + " userId: " + userId + " 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);
         }
-        showToast("revanced_ryd_failure_send_vote_failed");
         return false;
     }
 
@@ -438,10 +437,10 @@ public class ReturnYouTubeDislikeApi {
                     LogHelper.printDebug(() -> "Vote confirm successful for video: " + videoId);
                     return true;
                 }
-                LogHelper.printDebug(() -> "Failed to confirm vote for video: " + videoId
+                LogHelper.printException(() -> "Failed to confirm vote for video: " + videoId
                         + " user: " + userId + " solution: " + solution + " response string was: " + result);
             } else {
-                LogHelper.printDebug(() -> "Failed to confirm vote for video: " + videoId
+                LogHelper.printException(() -> "Failed to confirm vote for video: " + videoId
                         + " user: " + userId + " solution: " + solution + " response code was: " + responseCode);
             }
             connection.disconnect(); // something went wrong, might as well disconnect
@@ -449,16 +448,9 @@ public class ReturnYouTubeDislikeApi {
             LogHelper.printException(() -> "Failed to confirm vote for video: " + videoId
                     + " user: " + userId + " solution: " + solution, ex);
         }
-        showToast("revanced_ryd_failure_confirm_vote_failed");
         return false;
     }
 
-    private static void showToast(String toastTextStringKey) {
-        ReVancedUtils.runOnMainThread(() -> { // must show toasts on main thread
-            Toast.makeText(ReVancedUtils.getContext(), str(toastTextStringKey), Toast.LENGTH_LONG).show();
-        });
-    }
-
     private static void applyCommonPostRequestSettings(HttpURLConnection connection) throws ProtocolException {
         connection.setRequestMethod("POST");
         connection.setRequestProperty("Content-Type", "application/json");
@@ -477,7 +469,7 @@ public class ReturnYouTubeDislikeApi {
         byte[] decodedChallenge = Base64.decode(challenge, Base64.NO_WRAP);
 
         byte[] buffer = new byte[20];
-        for (int i = 4; i < 20; i++) {
+        for (int i = 4; i < 20; i++) { // FIXME replace with System.arrayCopy
             buffer[i] = decodedChallenge[i - 4];
         }
 

app/src/main/java/app/revanced/integrations/settingsmenu/ReVancedSettingActivity.java

@@ -7,6 +7,8 @@ import android.view.ViewGroup;
 import android.widget.ImageButton;
 import android.widget.TextView;
 
+import androidx.annotation.Nullable;
+
 import com.google.android.libraries.social.licenses.LicenseActivity;
 
 import app.revanced.integrations.utils.LogHelper;
@@ -44,15 +46,23 @@ public class ReVancedSettingActivity {
         }
 
         try {
-            getTextView((ViewGroup) base.findViewById(getIdentifier("toolbar", "id"))).setText(preferenceIdentifier);
+            TextView toolbar = getTextView((ViewGroup) base.findViewById(getIdentifier("toolbar", "id")));
+            if (toolbar == null) {
+                // FIXME
+                // https://github.com/revanced/revanced-patches/issues/1384
+                LogHelper.printDebug(() -> "Could not find toolbar");
+            } else {
+                toolbar.setText(preferenceIdentifier);
+            }
         } catch (Exception e) {
-            LogHelper.printException(() -> ("Couldn't set Toolbar title"), e);
+            LogHelper.printException(() -> "Could not set Toolbar title", e);
         }
 
         base.getFragmentManager().beginTransaction().replace(getIdentifier("revanced_settings_fragments", "id"), preferenceFragment).commit();
     }
 
 
+    @Nullable
     public static <T extends View> T getView(Class<T> typeClass, ViewGroup viewGroup) {
         if (viewGroup == null) {
             return null;
@@ -67,10 +77,12 @@ public class ReVancedSettingActivity {
         return null;
     }
 
+    @Nullable
     public static ImageButton getImageButton(ViewGroup viewGroup) {
         return getView(ImageButton.class, viewGroup);
     }
 
+    @Nullable
     public static TextView getTextView(ViewGroup viewGroup) {
         return getView(TextView.class, viewGroup);
     }

app/src/main/java/app/revanced/integrations/settingsmenu/ReVancedSettingsFragment.java

@@ -26,7 +26,6 @@ import app.revanced.integrations.settings.SettingsEnum;
 import app.revanced.integrations.utils.LogHelper;
 import app.revanced.integrations.utils.ReVancedUtils;
 import app.revanced.integrations.utils.SharedPrefHelper;
-import app.revanced.integrations.videoplayer.DownloadButton;
 
 public class ReVancedSettingsFragment extends PreferenceFragment {
 
@@ -67,30 +66,12 @@ public class ReVancedSettingsFragment extends PreferenceFragment {
                         value = Integer.parseInt(editPref.getText());
                         break;
                     default:
-                        LogHelper.printException(() -> ("Setting has no valid return type! " + setting.getReturnType()));
+                        LogHelper.printException(() -> "Setting has no valid return type! " + setting.getReturnType());
                         break;
                 }
                 setting.setValue(value);
-            } else if (pref instanceof ListPreference) {
-                ListPreference listPref = (ListPreference) pref;
-                if (setting == SettingsEnum.PREFERRED_VIDEO_SPEED) {
-                    try {
-                        String value = sharedPreferences.getString(setting.getPath(), setting.getDefaultValue() + "");
-                        listPref.setDefaultValue(value);
-                        listPref.setSummary(videoSpeedEntries[listPref.findIndexOfValue(value)]);
-                        SettingsEnum.PREFERRED_VIDEO_SPEED.saveValue(value);
-                    } catch (Throwable th) {
-                        LogHelper.printException(() -> ("Error setting value of speed" + th));
-                    }
-                } else {
-                    LogHelper.printException(() -> ("No valid setting found: " + setting.toString()));
-                }
-
-                if ("pref_download_button_list".equals(str)) {
-                    DownloadButton.refreshShouldBeShown();
-                }
             } else {
-                LogHelper.printException(() -> ("Setting cannot be handled! " + pref.toString()));
+                LogHelper.printException(() -> "Setting cannot be handled: " +  pref.getClass() + " " + pref.toString());
             }
 
             if (ReVancedUtils.getContext() != null && settingsInitialized && setting.shouldRebootOnChange()) {
@@ -115,7 +96,7 @@ public class ReVancedSettingsFragment extends PreferenceFragment {
 
             this.settingsInitialized = true;
         } catch (Throwable th) {
-            LogHelper.printException(() -> ("Error during onCreate()"), th);
+            LogHelper.printException(() -> "Error during onCreate()", th);
         }
     }
 
@@ -130,7 +111,7 @@ public class ReVancedSettingsFragment extends PreferenceFragment {
 
     private Preference findPreferenceOnScreen(CharSequence key) {
         if (key == null) {
-            LogHelper.printException(() -> ("Key cannot be null!"));
+            LogHelper.printException(() -> "Key cannot be null!");
             return null;
         }
         Preference pref = null;
@@ -163,7 +144,7 @@ public class ReVancedSettingsFragment extends PreferenceFragment {
     private String getPackageName() {
         Context context = ReVancedUtils.getContext();
         if (context == null) {
-            LogHelper.printException(() -> ("Context is null, returning com.google.android.youtube!"));
+            LogHelper.printException(() -> "Context is null, returning com.google.android.youtube!");
             return "com.google.android.youtube";
         }
         String PACKAGE_NAME = context.getPackageName();
@@ -188,7 +169,7 @@ public class ReVancedSettingsFragment extends PreferenceFragment {
             Resources res = context.getResources();
             return res.getString(res.getIdentifier(name, "string", context.getPackageName()));
         } catch (Throwable exception) {
-            LogHelper.printException(() -> ("Resource not found."), exception);
+            LogHelper.printException(() -> "Resource not found.", exception);
             return "";
         }
     }

app/src/main/java/app/revanced/integrations/settingsmenu/ReturnYouTubeDislikeSettingsFragment.java

@@ -29,18 +29,27 @@ public class ReturnYouTubeDislikeSettingsFragment extends PreferenceFragment {
      */
     private SwitchPreference percentagePreference;
 
+    /**
+     * If segmented like/dislike button uses smaller compact layout
+     */
+    private SwitchPreference compactLayoutPreference;
+
     private void updateUIState() {
         final boolean rydIsEnabled = SettingsEnum.RYD_ENABLED.getBoolean();
-        final boolean dislikePercentageEnabled = SettingsEnum.RYD_SHOW_DISLIKE_PERCENTAGE.getBoolean();
 
         enabledPreference.setSummary(rydIsEnabled
                 ? str("revanced_ryd_enable_summary_on")
                 : str("revanced_ryd_enable_summary_off"));
 
-        percentagePreference.setSummary(dislikePercentageEnabled
+        percentagePreference.setSummary(SettingsEnum.RYD_SHOW_DISLIKE_PERCENTAGE.getBoolean()
                 ? str("revanced_ryd_dislike_percentage_summary_on")
                 : str("revanced_ryd_dislike_percentage_summary_off"));
         percentagePreference.setEnabled(rydIsEnabled);
+
+        compactLayoutPreference.setSummary(SettingsEnum.RYD_USE_COMPACT_LAYOUT.getBoolean()
+                ? str("revanced_ryd_compact_layout_summary_on")
+                : str("revanced_ryd_compact_layout_summary_off"));
+        compactLayoutPreference.setEnabled(rydIsEnabled);
     }
 
     @Override
@@ -53,8 +62,6 @@ public class ReturnYouTubeDislikeSettingsFragment extends PreferenceFragment {
         setPreferenceScreen(preferenceScreen);
 
         enabledPreference = new SwitchPreference(context);
-        enabledPreference.setKey(SettingsEnum.RYD_ENABLED.getPath());
-        enabledPreference.setDefaultValue(SettingsEnum.RYD_ENABLED.getDefaultValue());
         enabledPreference.setChecked(SettingsEnum.RYD_ENABLED.getBoolean());
         enabledPreference.setTitle(str("revanced_ryd_enable_title"));
         enabledPreference.setOnPreferenceChangeListener((pref, newValue) -> {
@@ -68,8 +75,6 @@ public class ReturnYouTubeDislikeSettingsFragment extends PreferenceFragment {
         preferenceScreen.addPreference(enabledPreference);
 
         percentagePreference = new SwitchPreference(context);
-        percentagePreference.setKey(SettingsEnum.RYD_SHOW_DISLIKE_PERCENTAGE.getPath());
-        percentagePreference.setDefaultValue(SettingsEnum.RYD_SHOW_DISLIKE_PERCENTAGE.getDefaultValue());
         percentagePreference.setChecked(SettingsEnum.RYD_SHOW_DISLIKE_PERCENTAGE.getBoolean());
         percentagePreference.setTitle(str("revanced_ryd_dislike_percentage_title"));
         percentagePreference.setOnPreferenceChangeListener((pref, newValue) -> {
@@ -80,6 +85,17 @@ public class ReturnYouTubeDislikeSettingsFragment extends PreferenceFragment {
         });
         preferenceScreen.addPreference(percentagePreference);
 
+        compactLayoutPreference = new SwitchPreference(context);
+        compactLayoutPreference.setChecked(SettingsEnum.RYD_USE_COMPACT_LAYOUT.getBoolean());
+        compactLayoutPreference.setTitle(str("revanced_ryd_compact_layout_title"));
+        compactLayoutPreference.setOnPreferenceChangeListener((pref, newValue) -> {
+            SettingsEnum.RYD_USE_COMPACT_LAYOUT.saveValue((Boolean)newValue);
+
+            updateUIState();
+            return true;
+        });
+        preferenceScreen.addPreference(compactLayoutPreference);
+
         updateUIState();
 
 

app/src/main/java/app/revanced/integrations/settingsmenu/SponsorBlockSettingsFragment.java

@@ -52,7 +52,7 @@ public class SponsorBlockSettingsFragment extends PreferenceFragment implements
         PreferenceScreen preferenceScreen = getPreferenceManager().createPreferenceScreen(context);
         setPreferenceScreen(preferenceScreen);
 
-        SponsorBlockSettings.update(context);
+        SponsorBlockSettings.update(getActivity());
 
         {
             SwitchPreference preference = new SwitchPreference(context);
@@ -171,6 +171,7 @@ public class SponsorBlockSettingsFragment extends PreferenceFragment implements
         screen.addPreference(colorPreference);
         colorPreference.setTitle(str("color_change"));
         colorPreference.setSummary(str("color_change_sum"));
+        colorPreference.setSelectable(false);
         preferencesToDisableWhenSBDisabled.add(colorPreference);
     }
 
@@ -184,6 +185,7 @@ public class SponsorBlockSettingsFragment extends PreferenceFragment implements
             Preference preference = new Preference(context);
             category.addPreference(preference);
             preference.setTitle(str("stats_loading"));
+            preference.setSelectable(false);
 
             SBRequester.retrieveUserStats(category, preference);
         }
@@ -211,6 +213,7 @@ public class SponsorBlockSettingsFragment extends PreferenceFragment implements
             Preference preference = new Preference(context);
             screen.addPreference(preference);
             preference.setTitle(str("about_madeby"));
+            preference.setSelectable(false);
         }
 
     }
@@ -233,11 +236,14 @@ public class SponsorBlockSettingsFragment extends PreferenceFragment implements
         }
 
         {
-            Preference preference = new SwitchPreference(context);
+            SwitchPreference preference = new SwitchPreference(context);
             preference.setTitle(str("general_skiptoast"));
             preference.setSummary(str("general_skiptoast_sum"));
-            preference.setKey(SettingsEnum.SB_SHOW_TOAST_WHEN_SKIP.getPath());
-            preference.setDefaultValue(SettingsEnum.SB_SHOW_TOAST_WHEN_SKIP.getDefaultValue());
+            preference.setChecked(SettingsEnum.SB_SHOW_TOAST_WHEN_SKIP.getBoolean());
+            preference.setOnPreferenceChangeListener((preference1, newValue) -> {
+                SettingsEnum.SB_SHOW_TOAST_WHEN_SKIP.saveValue(newValue);
+                return true;
+            });
             preference.setOnPreferenceClickListener(preference12 -> {
                 Toast.makeText(preference12.getContext(), str("skipped_sponsor"), Toast.LENGTH_SHORT).show();
                 return false;
@@ -247,21 +253,28 @@ public class SponsorBlockSettingsFragment extends PreferenceFragment implements
         }
 
         {
-            Preference preference = new SwitchPreference(context);
+            SwitchPreference preference = new SwitchPreference(context);
             preference.setTitle(str("general_skipcount"));
             preference.setSummary(str("general_skipcount_sum"));
-            preference.setKey(SettingsEnum.SB_COUNT_SKIPS.getPath());
-            preference.setDefaultValue(SettingsEnum.SB_COUNT_SKIPS.getDefaultValue());
+            preference.setChecked(SettingsEnum.SB_COUNT_SKIPS.getBoolean());
+            preference.setOnPreferenceChangeListener((preference1, newValue) -> {
+                SettingsEnum.SB_COUNT_SKIPS.saveValue(newValue);
+                return true;
+            });
             preferencesToDisableWhenSBDisabled.add(preference);
             screen.addPreference(preference);
         }
 
         {
-            Preference preference = new SwitchPreference(context);
+            SwitchPreference preference = new SwitchPreference(context);
             preference.setTitle(str("general_time_without_sb"));
             preference.setSummary(str("general_time_without_sb_sum"));
-            preference.setKey(SettingsEnum.SB_SHOW_TIME_WITHOUT_SEGMENTS.getPath());
-            preference.setDefaultValue(SettingsEnum.SB_SHOW_TIME_WITHOUT_SEGMENTS.getDefaultValue());
+            preference.setChecked(SettingsEnum.SB_SHOW_TIME_WITHOUT_SEGMENTS.getBoolean());
+            preference.setOnPreferenceChangeListener((preference1, newValue) -> {
+                SettingsEnum.SB_SHOW_TIME_WITHOUT_SEGMENTS.saveValue(newValue);
+                return true;
+            });
+
             preferencesToDisableWhenSBDisabled.add(preference);
             screen.addPreference(preference);
         }
@@ -271,8 +284,11 @@ public class SponsorBlockSettingsFragment extends PreferenceFragment implements
             preference.getEditText().setInputType(InputType.TYPE_CLASS_NUMBER);
             preference.setTitle(str("general_adjusting"));
             preference.setSummary(str("general_adjusting_sum"));
-            preference.setKey(SettingsEnum.SB_ADJUST_NEW_SEGMENT_STEP.getPath());
-            preference.setDefaultValue(SettingsEnum.SB_ADJUST_NEW_SEGMENT_STEP.getDefaultValue() + "");
+            preference.setText(String.valueOf(SettingsEnum.SB_ADJUST_NEW_SEGMENT_STEP.getInt()));
+            preference.setOnPreferenceChangeListener((preference1, newValue) -> {
+                SettingsEnum.SB_ADJUST_NEW_SEGMENT_STEP.saveValue(Integer.valueOf(newValue.toString()));
+                return true;
+            });
             screen.addPreference(preference);
             preferencesToDisableWhenSBDisabled.add(preference);
         }
@@ -282,18 +298,25 @@ public class SponsorBlockSettingsFragment extends PreferenceFragment implements
             preference.getEditText().setInputType(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_DECIMAL);
             preference.setTitle(str("general_min_duration"));
             preference.setSummary(str("general_min_duration_sum"));
-            preference.setKey(SettingsEnum.SB_MIN_DURATION.getPath());
-            preference.setDefaultValue(SettingsEnum.SB_MIN_DURATION.getDefaultValue() + "");
+            preference.setText(String.valueOf(SettingsEnum.SB_MIN_DURATION.getFloat()));
+            preference.setOnPreferenceChangeListener((preference1, newValue) -> {
+                SettingsEnum.SB_MIN_DURATION.saveValue(Float.valueOf(newValue.toString()));
+                return true;
+            });
             screen.addPreference(preference);
             preferencesToDisableWhenSBDisabled.add(preference);
         }
 
         {
-            Preference preference = new EditTextPreference(context);
+            EditTextPreference preference = new EditTextPreference(context);
             preference.setTitle(str("general_uuid"));
             preference.setSummary(str("general_uuid_sum"));
-            preference.setKey(SettingsEnum.SB_UUID.getPath());
-            preference.setDefaultValue(SettingsEnum.SB_UUID.getDefaultValue() + "");
+            preference.setText(SettingsEnum.SB_UUID.getString());
+            preference.setOnPreferenceChangeListener((preference1, newValue) -> {
+                SettingsEnum.SB_UUID.saveValue(newValue.toString());
+                return true;
+            });
+
             screen.addPreference(preference);
             preferencesToDisableWhenSBDisabled.add(preference);
         }
@@ -349,7 +372,6 @@ public class SponsorBlockSettingsFragment extends PreferenceFragment implements
                 return;
             Context context = ((AlertDialog) dialog).getContext();
             Context applicationContext = context.getApplicationContext();
-            SharedPreferences preferences = SharedPrefHelper.getPreferences(context, SharedPrefHelper.SharedPrefNames.SPONSOR_BLOCK);
 
             switch (which) {
                 case DialogInterface.BUTTON_NEUTRAL: