chore(release): 1.10.0-dev.4 [skip ci]

# [1.10.0-dev.4](https://github.com/ReVanced/revanced-integrations/compare/v1.10.0-dev.3...v1.10.0-dev.4) (2024-06-02)

### Bug Fixes

* **YouTube - Spoof client:** Restore playback speed menu when spoofing to an iOS client ([2b2a70e](2b2a70e6ea))

.editorconfig

@@ -0,0 +1,3 @@
+[*.{kt,kts}]
+ktlint_code_style = intellij_idea
+ktlint_standard_no-wildcard-imports = disabled

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -70,7 +70,7 @@ body:
 
         Before creating a new bug report, please keep the following in mind:
 
-        - **Do not submit a duplicate bug report**: You can review existing bug reports [here](https://github.com/ReVanced/revanced-integrations/labels/Bug%20report).
+        - **Do not submit a duplicate bug report**: Search for existing bug reports [here](https://github.com/ReVanced/revanced-integrations/issues?q=label%3A%22Bug+report%22).
         - **Do not use the issue page for support**: If you need help or have questions, check out other platforms on [revanced.app](https://revanced.app).
   - type: textarea
     attributes:
@@ -101,7 +101,7 @@ body:
       label: Acknowledgements
       description: Your bug report will be closed if you don't follow the checklist below.
       options:
-        - label: This issue is not a duplicate of an existing bug report.
+        - label: I have checked all open and closed bug reports and this is not a duplicate.
           required: true
         - label: I have chosen an appropriate title.
           required: true

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -70,7 +70,7 @@ body:
 
         Before creating a new feature request, please keep the following in mind:
 
-        - **Do not submit a duplicate feature request**: You can review existing feature requests [here](https://github.com/ReVanced/revanced-integrations/labels/Feature%20request).
+        - **Do not submit a duplicate feature request**: Search for existing feature requests [here](https://github.com/ReVanced/revanced-integrations/issues?q=label%3A%22Feature+request%22).
         - **Do not use the issue page for support**: If you need help or have questions, check out other platforms on [revanced.app](https://revanced.app).
   - type: textarea
     attributes:
@@ -97,7 +97,7 @@ body:
       label: Acknowledgements
       description: Your feature request will be closed if you don't follow the checklist below.
       options:
-        - label: This issue is not a duplicate of an existing feature request.
+        - label: I have checked all open and closed feature requests and this is not a duplicate.
           required: true
         - label: I have chosen an appropriate title.
           required: true

.github/workflows/build_pull_request.yml

@@ -0,0 +1,28 @@
+name: Build pull request
+
+on:
+  workflow_dispatch:
+  pull_request:
+    branches:
+      - dev
+
+jobs:
+  release:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Cache Gradle
+        uses: burrunan/gradle-cache-action@v1
+
+      - name: Setup Java
+        run: echo "JAVA_HOME=$JAVA_HOME_17_X64" >> $GITHUB_ENV
+
+      - name: Build
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: ./gradlew build --no-daemon

.github/workflows/release.yml

@@ -6,10 +6,6 @@ on:
     branches:
       - main
       - dev
-  pull_request:
-    branches:
-      - main
-      - dev
 
 jobs:
   release:
@@ -44,6 +40,13 @@ jobs:
       - name: Install dependencies
         run: npm install
 
+      - name: Import GPG key
+        uses: crazy-max/ghaction-import-gpg@v6
+        with:
+          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+          passphrase: ${{ secrets.GPG_PASSPHRASE }}
+          fingerprint: ${{ env.GPG_FINGERPRINT }}
+
       - name: Release
         env:
           GITHUB_TOKEN: ${{ secrets.REPOSITORY_PUSH_ACCESS }}

.gitignore

@@ -1,17 +1,12 @@
 *.iml
 .gradle
 /local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
+/.idea
+/.vscode
+.DS_Store
 /build
 /captures
 .externalNativeBuild
 .cxx
-/.idea
-/.vscode
-/*.log
-node_modules
+local.properties
+node_modules

.releaserc

@@ -25,7 +25,7 @@
       {
         "assets": [
           {
-            "path": "app/build/outputs/apk/release/*.apk"
+            "path": "app/build/outputs/apk/release/revanced-integrations*"
           }
         ],
         successComment: false

app/.gitignore

@@ -1 +1 @@
-/build
+/build

app/build.gradle.kts

@@ -1,18 +1,27 @@
 plugins {
-    id("com.android.application")
-    id("org.jetbrains.kotlin.android")
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.kotlin)
+    publishing
 }
 
 android {
-    compileSdk = 33
     namespace = "app.revanced.integrations"
+    compileSdk = 33
+
+    applicationVariants.all {
+        outputs.all {
+            this as com.android.build.gradle.internal.api.ApkVariantOutputImpl
+
+            outputFileName = "${rootProject.name}-$versionName.apk"
+        }
+    }
 
     defaultConfig {
         applicationId = "app.revanced.integrations"
         minSdk = 23
         targetSdk = 33
         multiDexEnabled = false
-        versionName = project.version as String
+        versionName = version as String
     }
 
     buildTypes {
@@ -20,32 +29,52 @@ android {
             isMinifyEnabled = true
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
+                "proguard-rules.pro",
             )
         }
-        applicationVariants.all {
-            outputs.all {
-                this as com.android.build.gradle.internal.api.ApkVariantOutputImpl
+    }
 
-                outputFileName = "${rootProject.name}-$versionName.apk"
-            }
-        }
-    }
     compileOptions {
-        sourceCompatibility(JavaVersion.VERSION_11)
-        targetCompatibility(JavaVersion.VERSION_11)
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
+
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_11.toString()
     }
 }
 
 dependencies {
-    compileOnly(project(mapOf("path" to ":dummy")))
-    compileOnly("androidx.annotation:annotation:1.7.0")
-    compileOnly("androidx.appcompat:appcompat:1.7.0-alpha03")
-    compileOnly("com.squareup.okhttp3:okhttp:5.0.0-alpha.11")
-    compileOnly("com.squareup.retrofit2:retrofit:2.9.0")
+    compileOnly(libs.appcompat)
+    compileOnly(libs.annotation)
+    compileOnly(libs.okhttp)
+    compileOnly(libs.retrofit)
+
+    compileOnly(project(":stub"))
 }
 
-tasks.register("publish") { dependsOn("build") }
+tasks {
+    // Because the signing plugin doesn't support signing APKs, do it manually.
+    register("sign") {
+        group = "signing"
+
+        dependsOn(build)
+
+        doLast {
+            val outputDirectory = layout.buildDirectory.dir("outputs/apk/release").get().asFile
+            val integrationsApk = outputDirectory.resolve("${rootProject.name}-$version.apk")
+
+            org.gradle.security.internal.gnupg.GnupgSignatoryFactory().createSignatory(project).sign(
+                integrationsApk.inputStream(),
+                outputDirectory.resolve("${integrationsApk.name}.asc").outputStream(),
+            )
+        }
+    }
+
+    // Needed by gradle-semantic-release-plugin.
+    // Tracking: https://github.com/KengoTODA/gradle-semantic-release-plugin/issues/435
+    publish {
+        dependsOn(build)
+        dependsOn("sign")
+    }
+}

app/proguard-rules.pro

@@ -1,27 +1,6 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
 -dontobfuscate
 -dontoptimize
--keepattributes *  # https://www.guardsquare.com/manual/configuration/attributes
+-keepattributes *
 -keep class app.revanced.** {
   *;
 }

app/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
+<?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.SCHEDULE_EXACT_ALARM" />
 </manifest>

app/src/main/java/app/revanced/integrations/shared/GmsCoreSupport.java

@@ -0,0 +1,145 @@
+package app.revanced.integrations.shared;
+
+import static app.revanced.integrations.shared.StringRef.str;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.SearchManager;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.net.Uri;
+import android.os.Build;
+import android.os.PowerManager;
+import android.provider.Settings;
+
+import androidx.annotation.RequiresApi;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+/**
+ * @noinspection unused
+ */
+public class GmsCoreSupport {
+    private static final String GMS_CORE_PACKAGE_NAME
+            = getGmsCoreVendorGroupId() + ".android.gms";
+    private static final Uri GMS_CORE_PROVIDER
+            = Uri.parse("content://" + getGmsCoreVendorGroupId() + ".android.gsf.gservices/prefix");
+    private static final String DONT_KILL_MY_APP_LINK
+            = "https://dontkillmyapp.com";
+
+    private static void open(String queryOrLink) {
+        Intent intent;
+        try {
+            // Check if queryOrLink is a valid URL.
+            new URL(queryOrLink);
+
+            intent = new Intent(Intent.ACTION_VIEW, Uri.parse(queryOrLink));
+        } catch (MalformedURLException e) {
+            intent = new Intent(Intent.ACTION_WEB_SEARCH);
+            intent.putExtra(SearchManager.QUERY, queryOrLink);
+        }
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        Utils.getContext().startActivity(intent);
+
+        // Gracefully exit, otherwise the broken app will continue to run.
+        System.exit(0);
+    }
+
+    private static void showBatteryOptimizationDialog(Activity context,
+                                                      String dialogMessageRef,
+                                                      String positiveButtonStringRef,
+                                                      DialogInterface.OnClickListener onPositiveClickListener) {
+        // Use a delay to allow the activity to finish initializing.
+        // Otherwise, if device is in dark mode the dialog is shown with wrong color scheme.
+        Utils.runOnMainThreadDelayed(() -> {
+            new AlertDialog.Builder(context)
+                    .setIconAttribute(android.R.attr.alertDialogIcon)
+                    .setTitle(str("gms_core_dialog_title"))
+                    .setMessage(str(dialogMessageRef))
+                    .setPositiveButton(str(positiveButtonStringRef), onPositiveClickListener)
+                    // Allow using back button to skip the action, just in case the check can never be satisfied.
+                    .setCancelable(true)
+                    .show();
+        }, 100);
+    }
+
+    /**
+     * Injection point.
+     */
+    @RequiresApi(api = Build.VERSION_CODES.N)
+    public static void checkGmsCore(Activity context) {
+        try {
+            // Verify GmsCore is installed.
+            try {
+                PackageManager manager = context.getPackageManager();
+                manager.getPackageInfo(GMS_CORE_PACKAGE_NAME, PackageManager.GET_ACTIVITIES);
+            } catch (PackageManager.NameNotFoundException exception) {
+                Logger.printInfo(() -> "GmsCore was not found");
+                // Cannot show a dialog and must show a toast,
+                // because on some installations the app crashes before a dialog can be displayed.
+                Utils.showToastLong(str("gms_core_toast_not_installed_message"));
+                open(getGmsCoreDownload());
+                return;
+            }
+
+            // Check if GmsCore is running in the background.
+            try (var client = context.getContentResolver().acquireContentProviderClient(GMS_CORE_PROVIDER)) {
+                if (client == null) {
+                    Logger.printInfo(() -> "GmsCore is not running in the background");
+
+                    showBatteryOptimizationDialog(context,
+                            "gms_core_dialog_not_whitelisted_not_allowed_in_background_message",
+                            "gms_core_dialog_open_website_text",
+                            (dialog, id) -> open(DONT_KILL_MY_APP_LINK));
+                    return;
+                }
+            }
+
+            // Check if GmsCore is whitelisted from battery optimizations.
+            if (batteryOptimizationsEnabled(context)) {
+                Logger.printInfo(() -> "GmsCore is not whitelisted from battery optimizations");
+                showBatteryOptimizationDialog(context,
+                        "gms_core_dialog_not_whitelisted_using_battery_optimizations_message",
+                        "gms_core_dialog_continue_text",
+                        (dialog, id) -> openGmsCoreDisableBatteryOptimizationsIntent(context));
+            }
+        } catch (Exception ex) {
+            Logger.printException(() -> "checkGmsCore failure", ex);
+        }
+    }
+
+    @SuppressLint("BatteryLife") // Permission is part of GmsCore
+    private static void openGmsCoreDisableBatteryOptimizationsIntent(Activity activity) {
+        Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
+        intent.setData(Uri.fromParts("package", GMS_CORE_PACKAGE_NAME, null));
+        activity.startActivityForResult(intent, 0);
+    }
+
+    /**
+     * @return If GmsCore is not whitelisted from battery optimizations.
+     */
+    private static boolean batteryOptimizationsEnabled(Context context) {
+        var powerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
+        return !powerManager.isIgnoringBatteryOptimizations(GMS_CORE_PACKAGE_NAME);
+    }
+
+    private static String getGmsCoreDownload() {
+        final var vendorGroupId = getGmsCoreVendorGroupId();
+        //noinspection SwitchStatementWithTooFewBranches
+        switch (vendorGroupId) {
+            case "app.revanced":
+                return "https://github.com/revanced/gmscore/releases/latest";
+            default:
+                return vendorGroupId + ".android.gms";
+        }
+    }
+
+    // Modified by a patch. Do not touch.
+    private static String getGmsCoreVendorGroupId() {
+        return "app.revanced";
+    }
+}

app/src/main/java/app/revanced/integrations/shared/Logger.java

@@ -5,14 +5,15 @@ import static app.revanced.integrations.shared.settings.BaseSettings.DEBUG_STACK
 import static app.revanced.integrations.shared.settings.BaseSettings.DEBUG_TOAST_ON_ERROR;
 
 import android.util.Log;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import app.revanced.integrations.shared.settings.BaseSettings;
-
 import java.io.PrintWriter;
 import java.io.StringWriter;
 
+import app.revanced.integrations.shared.settings.BaseSettings;
+
 public class Logger {
 
     /**
@@ -24,7 +25,7 @@ public class Logger {
 
         /**
          * @return For outer classes, this returns {@link Class#getSimpleName()}.
-         * For inner, static, or anonymous classes, this returns the simple name of the enclosing class.<br>
+         * For static, inner, or anonymous classes, this returns the simple name of the enclosing class.
          * <br>
          * For example, each of these classes return 'SomethingView':
          * <code>
@@ -38,13 +39,13 @@ public class Logger {
 
             String fullClassName = selfClass.getName();
             final int dollarSignIndex = fullClassName.indexOf('$');
-            if (dollarSignIndex == -1) {
-                return selfClass.getSimpleName(); // already an outer class
+            if (dollarSignIndex < 0) {
+                return selfClass.getSimpleName(); // Already an outer class.
             }
 
-            // class is inner, static, or anonymous
-            // parse the simple name full name
-            // a class with no package returns index of -1, but incrementing gives index zero which is correct
+            // Class is inner, static, or anonymous.
+            // Parse the simple name full name.
+            // A class with no package returns index of -1, but incrementing gives index zero which is correct.
             final int simpleClassNameStartIndex = fullClassName.lastIndexOf('.') + 1;
             return fullClassName.substring(simpleClassNameStartIndex, dollarSignIndex);
         }
@@ -137,11 +138,19 @@ public class Logger {
     }
 
     /**
-     * Logging to use if {@link BaseSettings#DEBUG} or {@link Utils#context} may not be initialized.
-     * Always logs even if Debugging is not enabled.
+     * Logging to use if {@link BaseSettings#DEBUG} or {@link Utils#getContext()} may not be initialized.
      * Normally this method should not be used.
      */
-    public static void initializationError(@NonNull Class<?> callingClass, @NonNull String message, @Nullable Exception ex) {
+    public static void initializationInfo(@NonNull Class<?> callingClass, @NonNull String message) {
+        Log.i(REVANCED_LOG_PREFIX + callingClass.getSimpleName(), message);
+    }
+
+    /**
+     * Logging to use if {@link BaseSettings#DEBUG} or {@link Utils#getContext()} may not be initialized.
+     * Normally this method should not be used.
+     */
+    public static void initializationException(@NonNull Class<?> callingClass, @NonNull String message,
+                                               @Nullable Exception ex) {
         Log.e(REVANCED_LOG_PREFIX + callingClass.getSimpleName(), message, ex);
     }
 

app/src/main/java/app/revanced/integrations/shared/settings/EnumSetting.java

@@ -0,0 +1,101 @@
+package app.revanced.integrations.shared.settings;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import app.revanced.integrations.shared.Logger;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.Locale;
+import java.util.Objects;
+
+/**
+ * If an Enum value is removed or changed, any saved or imported data using the
+ * non-existent value will be reverted to the default value
+ * (the event is logged, but no user error is displayed).
+ *
+ * All saved JSON text is converted to lowercase to keep the output less obnoxious.
+ */
+@SuppressWarnings("unused")
+public class EnumSetting<T extends Enum<?>> extends Setting<T> {
+    public EnumSetting(String key, T defaultValue) {
+        super(key, defaultValue);
+    }
+    public EnumSetting(String key, T defaultValue, boolean rebootApp) {
+        super(key, defaultValue, rebootApp);
+    }
+    public EnumSetting(String key, T defaultValue, boolean rebootApp, boolean includeWithImportExport) {
+        super(key, defaultValue, rebootApp, includeWithImportExport);
+    }
+    public EnumSetting(String key, T defaultValue, String userDialogMessage) {
+        super(key, defaultValue, userDialogMessage);
+    }
+    public EnumSetting(String key, T defaultValue, Availability availability) {
+        super(key, defaultValue, availability);
+    }
+    public EnumSetting(String key, T defaultValue, boolean rebootApp, String userDialogMessage) {
+        super(key, defaultValue, rebootApp, userDialogMessage);
+    }
+    public EnumSetting(String key, T defaultValue, boolean rebootApp, Availability availability) {
+        super(key, defaultValue, rebootApp, availability);
+    }
+    public EnumSetting(String key, T defaultValue, boolean rebootApp, String userDialogMessage, Availability availability) {
+        super(key, defaultValue, rebootApp, userDialogMessage, availability);
+    }
+    public EnumSetting(@NonNull String key, @NonNull T defaultValue, boolean rebootApp, boolean includeWithImportExport, @Nullable String userDialogMessage, @Nullable Availability availability) {
+        super(key, defaultValue, rebootApp, includeWithImportExport, userDialogMessage, availability);
+    }
+
+    @Override
+    protected void load() {
+        value = preferences.getEnum(key, defaultValue);
+    }
+
+    @Override
+    protected T readFromJSON(JSONObject json, String importExportKey) throws JSONException {
+        String enumName = json.getString(importExportKey);
+        try {
+            return getEnumFromString(enumName);
+        } catch (IllegalArgumentException ex) {
+            // Info level to allow removing enum values in the future without showing any user errors.
+            Logger.printInfo(() -> "Using default, and ignoring unknown enum value: "  + enumName, ex);
+            return defaultValue;
+        }
+    }
+
+    @Override
+    protected void writeToJSON(JSONObject json, String importExportKey) throws JSONException {
+        // Use lowercase to keep the output less ugly.
+        json.put(importExportKey, value.name().toLowerCase(Locale.ENGLISH));
+    }
+
+    @NonNull
+    private T getEnumFromString(String enumName) {
+        //noinspection ConstantConditions
+        for (Enum<?> value : defaultValue.getClass().getEnumConstants()) {
+            if (value.name().equalsIgnoreCase(enumName)) {
+                // noinspection unchecked
+                return (T) value;
+            }
+        }
+        throw new IllegalArgumentException("Unknown enum value: " + enumName);
+    }
+
+    @Override
+    protected void setValueFromString(@NonNull String newValue) {
+        value = getEnumFromString(Objects.requireNonNull(newValue));
+    }
+
+    @Override
+    public void save(@NonNull T newValue) {
+        // Must set before saving to preferences (otherwise importing fails to update UI correctly).
+        value = Objects.requireNonNull(newValue);
+        preferences.saveEnumAsString(key, newValue);
+    }
+
+    @NonNull
+    @Override
+    public T get() {
+        return value;
+    }
+}

app/src/main/java/app/revanced/integrations/shared/settings/Setting.java

@@ -97,7 +97,7 @@ public abstract class Setting<T> {
     @NonNull
     private static List<Setting<?>> allLoadedSettingsSorted() {
         Collections.sort(SETTINGS, (Setting<?> o1, Setting<?> o2) -> o1.key.compareTo(o2.key));
-        return Collections.unmodifiableList(SETTINGS);
+        return allLoadedSettings();
     }
 
     /**
@@ -131,6 +131,7 @@ public abstract class Setting<T> {
 
     /**
      * Confirmation message to display, if the user tries to change the setting from the default value.
+     * Currently this works only for Boolean setting types.
      */
     @Nullable
     public final StringRef userDialogMessage;
@@ -206,10 +207,9 @@ public abstract class Setting<T> {
     /**
      * Migrate a setting value if the path is renamed but otherwise the old and new settings are identical.
      */
-    public static void migrateOldSettingToNew(@NonNull Setting<?> oldSetting, @NonNull Setting newSetting) {
+    public static <T> void migrateOldSettingToNew(@NonNull Setting<T> oldSetting, @NonNull Setting<T> newSetting) {
         if (!oldSetting.isSetToDefault()) {
             Logger.printInfo(() -> "Migrating old setting value: " + oldSetting + " into replacement setting: " + newSetting);
-            //noinspection unchecked
             newSetting.save(oldSetting.value);
             oldSetting.resetToDefault();
         }
@@ -224,6 +224,7 @@ public abstract class Setting<T> {
         if (!oldPrefs.preferences.contains(settingKey)) {
             return; // Nothing to do.
         }
+
         Object newValue = setting.get();
         final Object migratedValue;
         if (setting instanceof BooleanSetting) {
@@ -238,13 +239,17 @@ public abstract class Setting<T> {
             migratedValue = oldPrefs.getString(settingKey, (String) newValue);
         } else {
             Logger.printException(() -> "Unknown setting: " + setting);
+            // Remove otherwise it'll show a toast on every launch
+            oldPrefs.preferences.edit().remove(settingKey).apply();
             return;
         }
+
         oldPrefs.preferences.edit().remove(settingKey).apply(); // Remove the old setting.
         if (migratedValue.equals(newValue)) {
             Logger.printDebug(() -> "Value does not need migrating: " + settingKey);
             return; // Old value is already equal to the new setting value.
         }
+
         Logger.printDebug(() -> "Migrating old preference value into current preference: " + settingKey);
         //noinspection unchecked
         setting.save(migratedValue);
@@ -324,6 +329,7 @@ public abstract class Setting<T> {
     }
 
     /**
+     * @param importExportKey The JSON key. The JSONObject parameter will contain data for this key.
      * @return the value stored using the import/export key.  Do not set any values in this method.
      */
     protected abstract T readFromJSON(JSONObject json, String importExportKey) throws JSONException;

app/src/main/java/app/revanced/integrations/shared/settings/preference/AbstractPreferenceFragment.java

@@ -7,6 +7,8 @@ import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.*;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import app.revanced.integrations.shared.Logger;
 import app.revanced.integrations.shared.Utils;
 import app.revanced.integrations.shared.settings.BooleanSetting;
@@ -14,10 +16,7 @@ import app.revanced.integrations.shared.settings.Setting;
 
 import static app.revanced.integrations.shared.StringRef.str;
 
-/**
- *
- *
- * @noinspection deprecation, DataFlowIssue , unused */
+@SuppressWarnings({"unused", "deprecation"})
 public abstract class AbstractPreferenceFragment extends PreferenceFragment {
     /**
      * Indicates that if a preference changes,
@@ -25,6 +24,13 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment {
      */
     public static boolean settingImportInProgress;
 
+    /**
+     * Confirm and restart dialog button text and title.
+     * Set by subclasses if Strings cannot be added as a resource.
+     */
+    @Nullable
+    protected static String restartDialogButtonText, restartDialogTitle, confirmDialogTitle;
+
     /**
      * Used to prevent showing reboot dialog, if user cancels a setting user dialog.
      */
@@ -76,15 +82,19 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment {
 
         if (identifier == 0) return;
         addPreferencesFromResource(identifier);
-        Utils.sortPreferenceGroupByTitle(getPreferenceScreen(), 2);
+        Utils.sortPreferenceGroups(getPreferenceScreen());
     }
 
     private void showSettingUserDialogConfirmation(SwitchPreference switchPref, BooleanSetting setting) {
-        final var context = getContext();
+        Utils.verifyOnMainThread();
 
+        final var context = getContext();
+        if (confirmDialogTitle == null) {
+            confirmDialogTitle = str("revanced_settings_confirm_user_dialog_title");
+        }
         showingUserDialogMessage = true;
         new AlertDialog.Builder(context)
-                .setTitle(str("revanced_settings_confirm_user_dialog_title"))
+                .setTitle(confirmDialogTitle)
                 .setMessage(setting.userDialogMessage.toString())
                 .setPositiveButton(android.R.string.ok, (dialog, id) -> {
                     if (setting.rebootApp) {
@@ -139,47 +149,60 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment {
     }
 
     /**
-     * Updates a UI Preference with the {@link Setting} that backs it.
+     * Handles syncing a UI Preference with the {@link Setting} that backs it.
      * If needed, subclasses can override this to handle additional UI Preference types.
      *
+     * @param applySettingToPreference If true, then apply {@link Setting} -> Preference.
+     *                                 If false, then apply {@link Setting} <- Preference.
+     */
+    protected void syncSettingWithPreference(@NonNull Preference pref,
+                                             @NonNull Setting<?> setting,
+                                             boolean applySettingToPreference) {
+        if (pref instanceof SwitchPreference) {
+            SwitchPreference switchPref = (SwitchPreference) pref;
+            BooleanSetting boolSetting = (BooleanSetting) setting;
+            if (applySettingToPreference) {
+                switchPref.setChecked(boolSetting.get());
+            } else {
+                BooleanSetting.privateSetValue(boolSetting, switchPref.isChecked());
+            }
+        } else if (pref instanceof EditTextPreference) {
+            EditTextPreference editPreference = (EditTextPreference) pref;
+            if (applySettingToPreference) {
+                editPreference.setText(setting.get().toString());
+            } else {
+                Setting.privateSetValueFromString(setting, editPreference.getText());
+            }
+        } else if (pref instanceof ListPreference) {
+            ListPreference listPref = (ListPreference) pref;
+            if (applySettingToPreference) {
+                listPref.setValue(setting.get().toString());
+            } else {
+                Setting.privateSetValueFromString(setting, listPref.getValue());
+            }
+            updateListPreferenceSummary(listPref, setting);
+        } else {
+            Logger.printException(() -> "Setting cannot be handled: " + pref.getClass() + ": " + pref);
+        }
+    }
+
+    /**
+     * Updates a UI Preference with the {@link Setting} that backs it.
+     *
      * @param syncSetting If the UI should be synced {@link Setting} <-> Preference
      * @param applySettingToPreference If true, then apply {@link Setting} -> Preference.
      *                                 If false, then apply {@link Setting} <- Preference.
      */
-    protected void updatePreference(@NonNull Preference pref, @NonNull Setting<?> setting,
-                                    boolean syncSetting, boolean applySettingToPreference) {
+    private void updatePreference(@NonNull Preference pref, @NonNull Setting<?> setting,
+                                  boolean syncSetting, boolean applySettingToPreference) {
         if (!syncSetting && applySettingToPreference) {
             throw new IllegalArgumentException();
         }
+
         if (syncSetting) {
-            if (pref instanceof SwitchPreference) {
-                SwitchPreference switchPref = (SwitchPreference) pref;
-                BooleanSetting boolSetting = (BooleanSetting) setting;
-                if (applySettingToPreference) {
-                    switchPref.setChecked(boolSetting.get());
-                } else {
-                    BooleanSetting.privateSetValue(boolSetting, switchPref.isChecked());
-                }
-            } else if (pref instanceof EditTextPreference) {
-                EditTextPreference editPreference = (EditTextPreference) pref;
-                if (applySettingToPreference) {
-                    editPreference.setText(setting.get().toString());
-                } else {
-                    Setting.privateSetValueFromString(setting, editPreference.getText());
-                }
-            } else if (pref instanceof ListPreference) {
-                ListPreference listPref = (ListPreference) pref;
-                if (applySettingToPreference) {
-                    listPref.setValue(setting.get().toString());
-                } else {
-                    Setting.privateSetValueFromString(setting, listPref.getValue());
-                }
-                updateListPreferenceSummary(listPref, setting);
-            } else {
-                Logger.printException(() -> "Setting cannot be handled: " + pref.getClass() + ": " + pref);
-                return;
-            }
+            syncSettingWithPreference(pref, setting, applySettingToPreference);
         }
+
         updatePreferenceAvailability(pref, setting);
     }
 
@@ -201,12 +224,17 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment {
     }
 
     public static void showRestartDialog(@NonNull final Context context) {
-        String positiveButton = str("revanced_settings_restart");
-
-        new AlertDialog.Builder(context).setMessage(str("revanced_settings_restart_title"))
-                .setPositiveButton(positiveButton, (dialog, id) -> {
-                    Utils.restartApp(context);
-                })
+        Utils.verifyOnMainThread();
+        if (restartDialogTitle == null) {
+            restartDialogTitle = str("revanced_settings_restart_title");
+        }
+        if (restartDialogButtonText == null) {
+            restartDialogButtonText = str("revanced_settings_restart");
+        }
+        new AlertDialog.Builder(context)
+                .setMessage(restartDialogTitle)
+                .setPositiveButton(restartDialogButtonText, (dialog, id)
+                        -> Utils.restartApp(context))
                 .setNegativeButton(android.R.string.cancel, null)
                 .setCancelable(false)
                 .show();

app/src/main/java/app/revanced/integrations/shared/settings/preference/ImportExportPreference.java

@@ -15,7 +15,7 @@ import app.revanced.integrations.shared.Utils;
 
 import static app.revanced.integrations.shared.StringRef.str;
 
-/** @noinspection deprecation, unused */
+@SuppressWarnings({"unused", "deprecation"})
 public class ImportExportPreference extends EditTextPreference implements Preference.OnPreferenceClickListener {
 
     private String existingSettings;

app/src/main/java/app/revanced/integrations/shared/settings/preference/ResettableEditTextPreference.java

@@ -14,7 +14,7 @@ import java.util.Objects;
 
 import static app.revanced.integrations.shared.StringRef.str;
 
-@SuppressWarnings("unused")
+@SuppressWarnings({"unused", "deprecation"})
 public class ResettableEditTextPreference extends EditTextPreference {
 
     public ResettableEditTextPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
@@ -33,7 +33,7 @@ public class ResettableEditTextPreference extends EditTextPreference {
     @Override
     protected void onPrepareDialogBuilder(AlertDialog.Builder builder) {
         super.onPrepareDialogBuilder(builder);
-        Setting setting = Setting.getSettingFromPath(getKey());
+        Setting<?> setting = Setting.getSettingFromPath(getKey());
         if (setting != null) {
             builder.setNeutralButton(str("revanced_settings_reset"), null);
         }
@@ -50,7 +50,7 @@ public class ResettableEditTextPreference extends EditTextPreference {
         }
         button.setOnClickListener(v -> {
             try {
-                Setting setting = Objects.requireNonNull(Setting.getSettingFromPath(getKey()));
+                Setting<?> setting = Objects.requireNonNull(Setting.getSettingFromPath(getKey()));
                 String defaultStringValue = setting.defaultValue.toString();
                 EditText editText = getEditText();
                 editText.setText(defaultStringValue);

app/src/main/java/app/revanced/integrations/shared/settings/preference/SharedPrefCategory.java

@@ -32,17 +32,31 @@ public class SharedPrefCategory {
 
     private void removeConflictingPreferenceKeyValue(@NonNull String key) {
         Logger.printException(() -> "Found conflicting preference: " + key);
-        preferences.edit().remove(key).apply();
+        removeKey(key);
     }
 
     private void saveObjectAsString(@NonNull String key, @Nullable Object value) {
         preferences.edit().putString(key, (value == null ? null : value.toString())).apply();
     }
 
+    /**
+     * Removes any preference data type that has the specified key.
+     */
+    public void removeKey(@NonNull String key) {
+        preferences.edit().remove(Objects.requireNonNull(key)).apply();
+    }
+
     public void saveBoolean(@NonNull String key, boolean value) {
         preferences.edit().putBoolean(key, value).apply();
     }
 
+    /**
+     * @param value a NULL parameter removes the value from the preferences
+     */
+    public void saveEnumAsString(@NonNull String key, @Nullable Enum<?> value) {
+        saveObjectAsString(key, value);
+    }
+
     /**
      * @param value a NULL parameter removes the value from the preferences
      */
@@ -83,6 +97,28 @@ public class SharedPrefCategory {
         }
     }
 
+    @NonNull
+    public <T extends Enum<?>> T getEnum(@NonNull String key, @NonNull T _default) {
+        Objects.requireNonNull(_default);
+        try {
+            String enumName = preferences.getString(key, null);
+            if (enumName != null) {
+                try {
+                    // noinspection unchecked
+                    return (T) Enum.valueOf(_default.getClass(), enumName);
+                } catch (IllegalArgumentException ex) {
+                    // Info level to allow removing enum values in the future without showing any user errors.
+                    Logger.printInfo(() -> "Using default, and ignoring unknown enum value: "  + enumName);
+                    removeKey(key);
+                }
+            }
+        } catch (ClassCastException ex) {
+            // Value stored is a completely different type (should never happen).
+            removeConflictingPreferenceKeyValue(key);
+        }
+        return _default;
+    }
+
     public boolean getBoolean(@NonNull String key, boolean _default) {
         try {
             return preferences.getBoolean(key, _default);
@@ -100,17 +136,16 @@ public class SharedPrefCategory {
             if (value != null) {
                 return Integer.valueOf(value);
             }
-            return _default;
-        } catch (ClassCastException ex) {
+        } catch (ClassCastException | NumberFormatException ex) {
             try {
                 // Old data previously stored as primitive.
                 return preferences.getInt(key, _default);
             } catch (ClassCastException ex2) {
                 // Value stored is a completely different type (should never happen).
                 removeConflictingPreferenceKeyValue(key);
-                return _default;
             }
         }
+        return _default;
     }
 
     @NonNull
@@ -120,15 +155,14 @@ public class SharedPrefCategory {
             if (value != null) {
                 return Long.valueOf(value);
             }
-            return _default;
-        } catch (ClassCastException ex) {
+        } catch (ClassCastException | NumberFormatException ex) {
             try {
                 return preferences.getLong(key, _default);
             } catch (ClassCastException ex2) {
                 removeConflictingPreferenceKeyValue(key);
-                return _default;
             }
         }
+        return _default;
     }
 
     @NonNull
@@ -138,15 +172,14 @@ public class SharedPrefCategory {
             if (value != null) {
                 return Float.valueOf(value);
             }
-            return _default;
-        } catch (ClassCastException ex) {
+        } catch (ClassCastException | NumberFormatException ex) {
             try {
                 return preferences.getFloat(key, _default);
             } catch (ClassCastException ex2) {
                 removeConflictingPreferenceKeyValue(key);
-                return _default;
             }
         }
+        return _default;
     }
 
     @NonNull

app/src/main/java/app/revanced/integrations/syncforreddit/FixSLinksPatch.java

@@ -0,0 +1,42 @@
+package app.revanced.integrations.syncforreddit;
+
+import android.os.StrictMode;
+import app.revanced.integrations.shared.Logger;
+
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+public final class FixSLinksPatch {
+    public static String resolveSLink(String link) {
+        if (link.matches(".*reddit\\.com/r/[^/]+/s/[^/]+")) {
+            Logger.printInfo(() -> "Resolving " + link);
+            try {
+                URL url = new URL(link);
+                HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+                connection.setInstanceFollowRedirects(false);
+                connection.setRequestMethod("HEAD");
+
+                // Disable strict mode in order to allow network access on the main thread.
+                // This is not ideal, but it's the easiest solution for now.
+                final var currentPolicy = StrictMode.getThreadPolicy();
+                StrictMode.ThreadPolicy policy = new StrictMode.ThreadPolicy.Builder().permitAll().build();
+                StrictMode.setThreadPolicy(policy);
+
+                connection.connect();
+                String location = connection.getHeaderField("location");
+                connection.disconnect();
+
+                // Restore the original strict mode policy.
+                StrictMode.setThreadPolicy(currentPolicy);
+
+                Logger.printInfo(() -> "Resolved " + link + " -> " + location);
+
+                return location;
+            } catch (Exception e) {
+                Logger.printException(() -> "Failed to resolve " + link, e);
+            }
+        }
+
+        return link;
+    }
+}

app/src/main/java/app/revanced/integrations/tiktok/settings/preference/ReVancedPreferenceFragment.java

@@ -1,11 +1,15 @@
 package app.revanced.integrations.tiktok.settings.preference;
 
+import android.preference.Preference;
 import android.preference.PreferenceScreen;
+import androidx.annotation.NonNull;
+import app.revanced.integrations.shared.settings.Setting;
 import app.revanced.integrations.shared.settings.preference.AbstractPreferenceFragment;
 import app.revanced.integrations.tiktok.settings.preference.categories.DownloadsPreferenceCategory;
 import app.revanced.integrations.tiktok.settings.preference.categories.FeedFilterPreferenceCategory;
 import app.revanced.integrations.tiktok.settings.preference.categories.IntegrationsPreferenceCategory;
 import app.revanced.integrations.tiktok.settings.preference.categories.SimSpoofPreferenceCategory;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Preference fragment for ReVanced settings
@@ -13,10 +17,31 @@ import app.revanced.integrations.tiktok.settings.preference.categories.SimSpoofP
 @SuppressWarnings("deprecation")
 public class ReVancedPreferenceFragment extends AbstractPreferenceFragment {
 
+    @Override
+    protected void syncSettingWithPreference(@NonNull @NotNull Preference pref,
+                                             @NonNull @NotNull Setting<?> setting,
+                                             boolean applySettingToPreference) {
+        if (pref instanceof RangeValuePreference) {
+            RangeValuePreference rangeValuePref = (RangeValuePreference) pref;
+            Setting.privateSetValueFromString(setting, rangeValuePref.getValue());
+        } else if (pref instanceof DownloadPathPreference) {
+            DownloadPathPreference downloadPathPref = (DownloadPathPreference) pref;
+            Setting.privateSetValueFromString(setting, downloadPathPref.getValue());
+        } else {
+            super.syncSettingWithPreference(pref, setting, applySettingToPreference);
+        }
+    }
+
     @Override
     protected void initialize() {
         final var context = getContext();
 
+        // Currently no resources can be compiled for TikTok (fails with aapt error).
+        // So all TikTok Strings are hard coded in integrations.
+        restartDialogTitle = "Refresh and restart";
+        restartDialogButtonText = "Restart";
+        confirmDialogTitle = "Do you wish to proceed?";
+
         PreferenceScreen preferenceScreen = getPreferenceManager().createPreferenceScreen(context);
         setPreferenceScreen(preferenceScreen);
 

app/src/main/java/app/revanced/integrations/tiktok/spoof/sim/SpoofSimPatch.java

@@ -1,32 +1,37 @@
 package app.revanced.integrations.tiktok.spoof.sim;
 
+import app.revanced.integrations.shared.Logger;
 import app.revanced.integrations.tiktok.settings.Settings;
 
 @SuppressWarnings("unused")
 public class SpoofSimPatch {
-    public static boolean isEnable() {
-        return Settings.SIM_SPOOF.get();
-    }
-    public static String getCountryIso(String value) {
-        if (isEnable()) {
-            return Settings.SIM_SPOOF_ISO.get();
-        } else {
-            return value;
-        }
 
+    private static final Boolean ENABLED = Settings.SIM_SPOOF.get();
+
+    public static String getCountryIso(String value) {
+        if (ENABLED) {
+            String iso = Settings.SIM_SPOOF_ISO.get();
+            Logger.printDebug(() -> "Spoofing sim ISO from: " + value + " to: " + iso);
+            return iso;
+        }
+        return value;
     }
+
     public static String getOperator(String value) {
-        if (isEnable()) {
-            return Settings.SIMSPOOF_MCCMNC.get();
-        } else {
-            return value;
+        if (ENABLED) {
+            String mcc_mnc = Settings.SIMSPOOF_MCCMNC.get();
+            Logger.printDebug(() -> "Spoofing sim MCC-MNC from: " + value + " to: " + mcc_mnc);
+            return mcc_mnc;
         }
+        return value;
     }
+
     public static String getOperatorName(String value) {
-        if (isEnable()) {
-            return Settings.SIMSPOOF_OP_NAME.get();
-        } else {
-            return value;
+        if (ENABLED) {
+            String operator = Settings.SIMSPOOF_OP_NAME.get();
+            Logger.printDebug(() -> "Spoofing sim operator from: " + value + " to: " + operator);
+            return operator;
         }
+        return value;
     }
 }

app/src/main/java/app/revanced/integrations/twitch/settings/AppCompatActivityHook.java

@@ -28,7 +28,7 @@ public class AppCompatActivityHook {
     public static void startSettingsActivity() {
         Logger.printDebug(() -> "Launching ReVanced settings");
 
-        final var context = app.revanced.integrations.shared.Utils.getContext();
+        final var context = Utils.getContext();
 
         if (context != null) {
             Intent intent = new Intent(context, SettingsActivity.class);

app/src/main/java/app/revanced/integrations/twitter/patches/hook/json/BaseJsonHook.kt

@@ -6,4 +6,4 @@ abstract class BaseJsonHook : JsonHook {
     abstract fun apply(json: JSONObject)
 
     override fun transform(json: JSONObject) = json.apply { apply(json) }
-}
+}

app/src/main/java/app/revanced/integrations/twitter/patches/hook/json/JsonHook.kt

@@ -12,4 +12,4 @@ interface JsonHook : Hook<JSONObject> {
     fun transform(json: JSONObject): JSONObject
 
     override fun hook(type: JSONObject) = transform(type)
-}
+}

app/src/main/java/app/revanced/integrations/twitter/patches/hook/json/JsonHookPatch.kt

@@ -27,4 +27,4 @@ object JsonHookPatch {
 
         return StreamUtils.fromString(jsonObject.toString())
     }
-}
+}

app/src/main/java/app/revanced/integrations/twitter/patches/hook/patch/Hook.kt

@@ -6,4 +6,4 @@ interface Hook<T> {
      * @param type The type to hook
      */
     fun hook(type: T): T
-}
+}

app/src/main/java/app/revanced/integrations/twitter/patches/hook/patch/ads/AdsHook.kt

@@ -4,7 +4,6 @@ import app.revanced.integrations.twitter.patches.hook.json.BaseJsonHook
 import app.revanced.integrations.twitter.patches.hook.twifucker.TwiFucker
 import org.json.JSONObject
 
-
 object AdsHook : BaseJsonHook() {
     /**
      * Strips JSONObject from promoted ads.
@@ -12,4 +11,4 @@ object AdsHook : BaseJsonHook() {
      * @param json The JSONObject.
      */
     override fun apply(json: JSONObject) = TwiFucker.hidePromotedAds(json)
-}
+}