chore: Merge branch dev to main (#4041)

CHANGELOG.md

@@ -1,3 +1,10 @@
+## [5.2.2-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.2.1...v5.2.2-dev.1) (2024-12-05)
+
+
+### Bug Fixes
+
+* **YouTube - Spoof video streams:** Use system language as default iOS audio stream ([#4042](https://github.com/ReVanced/revanced-patches/issues/4042)) ([4017185](https://github.com/ReVanced/revanced-patches/commit/4017185e760c0569e6644b94bbe66a84fa245b4b))
+
 ## [5.2.1](https://github.com/ReVanced/revanced-patches/compare/v5.2.0...v5.2.1) (2024-12-04)
 
 

extensions/all/misc/connectivity/wifi/spoof/spoof-wifi/build.gradle.kts

@@ -0,0 +1,5 @@
+android.namespace = "app.revanced.extension"
+
+dependencies {
+    compileOnly(libs.annotation)
+}

extensions/spoof-wifi/src/main/AndroidManifest.xml → extensions/all/misc/connectivity/wifi/spoof/spoof-wifi/src/main/AndroidManifest.xml

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
 </manifest>

extensions/all/misc/screencapture/remove-screen-capture-restriction/build.gradle.kts

@@ -0,0 +1,5 @@
+android.namespace = "app.revanced.extension"
+
+dependencies {
+    compileOnly(libs.annotation)
+}

extensions/all/misc/screenshot/remove-screenshot-restriction/build.gradle.kts

@@ -0,0 +1 @@
+android.namespace = "app.revanced.extension"

extensions/boostforreddit/build.gradle.kts

@@ -0,0 +1,4 @@
+dependencies {
+    compileOnly(project(":extensions:shared:library"))
+    compileOnly(project(":extensions:boostforreddit:stub"))
+}

extensions/boostforreddit/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest/>

extensions/shared/src/main/java/app/revanced/extension/boostforreddit/FixSLinksPatch.java → extensions/boostforreddit/src/main/java/app/revanced/extension/boostforreddit/FixSLinksPatch.java

@@ -4,7 +4,9 @@
 
 import app.revanced.extension.shared.fixes.slink.BaseFixSLinksPatch;
 
-/** @noinspection unused*/
+/**
+ * @noinspection unused
+ */
 public class FixSLinksPatch extends BaseFixSLinksPatch {
     static {
         INSTANCE = new FixSLinksPatch();

extensions/boostforreddit/stub/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest/>

extensions/reddit/build.gradle.kts

@@ -0,0 +1,3 @@
+dependencies {
+    compileOnly(project(":extensions:reddit:stub"))
+}

extensions/reddit/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest/>

extensions/shared/src/main/java/app/revanced/extension/reddit/patches/FilterPromotedLinksPatch.java → extensions/reddit/src/main/java/app/revanced/extension/patches/FilterPromotedLinksPatch.java

@@ -1,4 +1,4 @@
-package app.revanced.extension.reddit.patches;
+package app.revanced.extension.patches;
 
 import com.reddit.domain.model.ILink;
 

extensions/reddit/stub/build.gradle.kts

@@ -0,0 +1,17 @@
+plugins {
+    id(libs.plugins.android.library.get().pluginId)
+}
+
+android {
+    namespace = "app.revanced.extension"
+    compileSdk = 33
+
+    defaultConfig {
+        minSdk = 24
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+}

extensions/reddit/stub/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest/>

extensions/shared/build.gradle.kts

@@ -1,22 +1,3 @@
-extension {
-    name = "extensions/shared.rve"
-}
-
-android {
-    namespace = "app.revanced.extension"
-
-    buildTypes {
-        release {
-            isMinifyEnabled = true
-        }
-    }
-}
-
 dependencies {
-    compileOnly(libs.appcompat)
-    compileOnly(libs.annotation)
-    compileOnly(libs.okhttp)
-    compileOnly(libs.retrofit)
-
-    compileOnly(project(":extensions:shared:stub"))
+    implementation(project(":extensions:shared:library"))
 }

extensions/shared/library/build.gradle.kts

@@ -0,0 +1,21 @@
+plugins {
+    id("com.android.library")
+}
+
+android {
+    namespace = "app.revanced.extension"
+    compileSdk = 34
+
+    defaultConfig {
+        minSdk = 23
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+}
+
+dependencies {
+    compileOnly(libs.annotation)
+}

extensions/shared/src/main/java/app/revanced/extension/shared/checks/Check.java → extensions/shared/library/src/main/java/app/revanced/extension/shared/checks/Check.java

@@ -19,7 +19,7 @@
 
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
-import app.revanced.extension.youtube.settings.Settings;
+import app.revanced.extension.shared.settings.BaseSettings;
 
 abstract class Check {
     private static final int NUMBER_OF_TIMES_TO_IGNORE_WARNING_BEFORE_DISABLING = 2;
@@ -46,11 +46,11 @@ abstract class Check {
     /**
      * For debugging and development only.
      * Forces all checks to be performed and the check failed dialog to be shown.
-     * Can be enabled by importing settings text with {@link Settings#CHECK_ENVIRONMENT_WARNINGS_ISSUED}
+     * Can be enabled by importing settings text with {@link BaseSettings#CHECK_ENVIRONMENT_WARNINGS_ISSUED}
      * set to -1.
      */
     static boolean debugAlwaysShowWarning() {
-        final boolean alwaysShowWarning = Settings.CHECK_ENVIRONMENT_WARNINGS_ISSUED.get() < 0;
+        final boolean alwaysShowWarning = BaseSettings.CHECK_ENVIRONMENT_WARNINGS_ISSUED.get() < 0;
         if (alwaysShowWarning) {
             Logger.printInfo(() -> "Debug forcing environment check warning to show");
         }
@@ -59,14 +59,14 @@ static boolean debugAlwaysShowWarning() {
     }
 
     static boolean shouldRun() {
-        return Settings.CHECK_ENVIRONMENT_WARNINGS_ISSUED.get()
+        return BaseSettings.CHECK_ENVIRONMENT_WARNINGS_ISSUED.get()
                 < NUMBER_OF_TIMES_TO_IGNORE_WARNING_BEFORE_DISABLING;
     }
 
     static void disableForever() {
         Logger.printInfo(() -> "Environment checks disabled forever");
 
-        Settings.CHECK_ENVIRONMENT_WARNINGS_ISSUED.save(Integer.MAX_VALUE);
+        BaseSettings.CHECK_ENVIRONMENT_WARNINGS_ISSUED.save(Integer.MAX_VALUE);
     }
 
     @SuppressLint("NewApi")
@@ -107,8 +107,8 @@ static void issueWarning(Activity activity, Collection<Check> failedChecks) {
                             " ",
                             (dialog, which) -> {
                                 // Cleanup data if the user incorrectly imported a huge negative number.
-                                final int current = Math.max(0, Settings.CHECK_ENVIRONMENT_WARNINGS_ISSUED.get());
-                                Settings.CHECK_ENVIRONMENT_WARNINGS_ISSUED.save(current + 1);
+                                final int current = Math.max(0, BaseSettings.CHECK_ENVIRONMENT_WARNINGS_ISSUED.get());
+                                BaseSettings.CHECK_ENVIRONMENT_WARNINGS_ISSUED.save(current + 1);
 
                                 dialog.dismiss();
                             }

extensions/shared/src/main/java/app/revanced/extension/youtube/requests/Requester.java → extensions/shared/library/src/main/java/app/revanced/extension/shared/requests/Requester.java

@@ -1,4 +1,4 @@
-package app.revanced.extension.youtube.requests;
+package app.revanced.extension.shared.requests;
 
 import app.revanced.extension.shared.Utils;
 import org.json.JSONArray;

extensions/shared/src/main/java/app/revanced/extension/youtube/requests/Route.java → extensions/shared/library/src/main/java/app/revanced/extension/shared/requests/Route.java

@@ -1,4 +1,4 @@
-package app.revanced.extension.youtube.requests;
+package app.revanced.extension.shared.requests;
 
 public class Route {
     private final String route;

extensions/shared/src/main/java/app/revanced/extension/shared/settings/BaseSettings.java → extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/BaseSettings.java

@@ -14,4 +14,6 @@ public class BaseSettings {
     public static final BooleanSetting DEBUG = new BooleanSetting("revanced_debug", FALSE);
     public static final BooleanSetting DEBUG_STACKTRACE = new BooleanSetting("revanced_debug_stacktrace", FALSE, parent(DEBUG));
     public static final BooleanSetting DEBUG_TOAST_ON_ERROR = new BooleanSetting("revanced_debug_toast_on_error", TRUE, "revanced_debug_toast_on_error_user_dialog_message");
+
+    public static final IntegerSetting CHECK_ENVIRONMENT_WARNINGS_ISSUED = new IntegerSetting("revanced_check_environment_warnings_issued", 0, true, false);
 }

extensions/shared/src/main/java/app/revanced/extension/shared/settings/Setting.java → extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/Setting.java

@@ -7,7 +7,6 @@
 import app.revanced.extension.shared.StringRef;
 import app.revanced.extension.shared.Utils;
 import app.revanced.extension.shared.settings.preference.SharedPrefCategory;
-import app.revanced.extension.youtube.sponsorblock.SponsorBlockSettings;
 import org.jetbrains.annotations.NotNull;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -62,6 +61,30 @@ public static Availability parentsAny(@NonNull BooleanSetting... parents) {
         };
     }
 
+    /**
+     * Callback for importing/exporting settings.
+     */
+    public interface ImportExportCallback {
+        /**
+         * Called after all settings have been imported.
+         */
+        void settingsImported(@Nullable Context context);
+
+        /**
+         * Called after all settings have been exported.
+         */
+        void settingsExported(@Nullable Context context);
+    }
+
+    private static final List<ImportExportCallback> importExportCallbacks = new ArrayList<>();
+
+    /**
+     * Adds a callback for {@link #importFromJSON(Context, String)} and {@link #exportToJson(Context)}.
+     */
+    public static void addImportExportCallback(@NonNull ImportExportCallback callback) {
+        importExportCallbacks.add(Objects.requireNonNull(callback));
+    }
+
     /**
      * All settings that were instantiated.
      * When a new setting is created, it is automatically added to this list.
@@ -365,7 +388,10 @@ public static String exportToJson(@Nullable Context alertDialogContext) {
                     setting.writeToJSON(json, importExportKey);
                 }
             }
-            SponsorBlockSettings.showExportWarningIfNeeded(alertDialogContext);
+
+            for (ImportExportCallback callback : importExportCallbacks) {
+                callback.settingsExported(alertDialogContext);
+            }
 
             if (json.length() == 0) {
                 return "";
@@ -385,7 +411,7 @@ public static String exportToJson(@Nullable Context alertDialogContext) {
     /**
      * @return if any settings that require a reboot were changed.
      */
-    public static boolean importFromJSON(@NonNull String settingsJsonString) {
+    public static boolean importFromJSON(@NonNull Context alertDialogContext, @NonNull String settingsJsonString) {
         try {
             if (!settingsJsonString.matches("[\\s\\S]*\\{")) {
                 settingsJsonString = '{' + settingsJsonString + '}'; // Restore outer JSON braces
@@ -411,12 +437,9 @@ public static boolean importFromJSON(@NonNull String settingsJsonString) {
                 }
             }
 
-            // SB Enum categories are saved using StringSettings.
-            // Which means they need to reload again if changed by other code (such as here).
-            // This call could be removed by creating a custom Setting class that manages the
-            // "String <-> Enum" logic or by adding an event hook of when settings are imported.
-            // But for now this is simple and works.
-            SponsorBlockSettings.updateFromImportedSettings();
+            for (ImportExportCallback callback : importExportCallbacks) {
+                callback.settingsImported(alertDialogContext);
+            }
 
             Utils.showToastLong(numberOfSettingsImported == 0
                     ? str("revanced_settings_import_reset")

extensions/shared/src/main/java/app/revanced/extension/shared/settings/preference/ImportExportPreference.java → extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ImportExportPreference.java

@@ -72,20 +72,21 @@ protected void onPrepareDialogBuilder(AlertDialog.Builder builder) {
             builder.setNeutralButton(str("revanced_settings_import_copy"), (dialog, which) -> {
                 Utils.setClipboard(getEditText().getText().toString());
             }).setPositiveButton(str("revanced_settings_import"), (dialog, which) -> {
-                importSettings(getEditText().getText().toString());
+                importSettings(builder.getContext(), getEditText().getText().toString());
             });
         } catch (Exception ex) {
             Logger.printException(() -> "onPrepareDialogBuilder failure", ex);
         }
     }
 
-    private void importSettings(String replacementSettings) {
+    private void importSettings(Context context, String replacementSettings) {
         try {
             if (replacementSettings.equals(existingSettings)) {
                 return;
             }
             AbstractPreferenceFragment.settingImportInProgress = true;
-            final boolean rebootNeeded = Setting.importFromJSON(replacementSettings);
+
+            final boolean rebootNeeded = Setting.importFromJSON(context, replacementSettings);
             if (rebootNeeded) {
                 AbstractPreferenceFragment.showRestartDialog(getContext());
             }

extensions/shared/src/main/java/app/revanced/extension/shared/settings/preference/ReVancedAboutPreference.java → extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ReVancedAboutPreference.java

@@ -1,7 +1,7 @@
 package app.revanced.extension.shared.settings.preference;
 
 import static app.revanced.extension.shared.StringRef.str;
-import static app.revanced.extension.youtube.requests.Route.Method.GET;
+import static app.revanced.extension.shared.requests.Route.Method.GET;
 
 import android.annotation.SuppressLint;
 import android.app.Dialog;
@@ -34,8 +34,8 @@
 
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
-import app.revanced.extension.youtube.requests.Requester;
-import app.revanced.extension.youtube.requests.Route;
+import app.revanced.extension.shared.requests.Requester;
+import app.revanced.extension.shared.requests.Route;
 
 /**
  * Opens a dialog showing official links.

extensions/shared/src/main/AndroidManifest.xml

@@ -1,4 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
-</manifest>
+<manifest/>

extensions/syncforreddit/build.gradle.kts

@@ -0,0 +1,5 @@
+dependencies {
+    compileOnly(project(":extensions:shared:library"))
+    compileOnly(project(":extensions:syncforreddit:stub"))
+    compileOnly(libs.annotation)
+}

extensions/syncforreddit/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest/>

extensions/syncforreddit/stub/build.gradle.kts

@@ -0,0 +1,17 @@
+plugins {
+    id(libs.plugins.android.library.get().pluginId)
+}
+
+android {
+    namespace = "app.revanced.extension"
+    compileSdk = 33
+
+    defaultConfig {
+        minSdk = 24
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+}

extensions/syncforreddit/stub/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest/>

extensions/tiktok/build.gradle.kts

@@ -0,0 +1,5 @@
+dependencies {
+    compileOnly(project(":extensions:shared:library"))
+    compileOnly(project(":extensions:tiktok:stub"))
+    compileOnly(libs.annotation)
+}