fix(YouTube - Spoof video streams): Use system language as default iO…

…S audio stream (ReVanced#4042)
Chr0matic1 · Dec 5, 2024 · 4017185 · 4017185
1 parent cc40246
commit 4017185
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 14 deletions.
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/Setting.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/Setting.java
@@ -438,7 +438,7 @@ public static boolean importFromJSON(@NonNull Context alertDialogContext, @NonNu
             }
 
             for (ImportExportCallback callback : importExportCallbacks) {
-                callback.settingsExported(alertDialogContext);
+                callback.settingsImported(alertDialogContext);
             }
 
             Utils.showToastLong(numberOfSettingsImported == 0

diff --git a/...c/main/java/app/revanced/extension/shared/settings/preference/ImportExportPreference.java b/...c/main/java/app/revanced/extension/shared/settings/preference/ImportExportPreference.java
@@ -72,21 +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(Utils.getContext(), replacementSettings);
+            final boolean rebootNeeded = Setting.importFromJSON(context, replacementSettings);
             if (rebootNeeded) {
                 AbstractPreferenceFragment.showRestartDialog(getContext());
             }

diff --git a/...ube/src/main/java/app/revanced/extension/youtube/patches/spoof/requests/PlayerRoutes.java b/...ube/src/main/java/app/revanced/extension/youtube/patches/spoof/requests/PlayerRoutes.java
@@ -7,6 +7,7 @@
 import java.net.HttpURLConnection;
 
 import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.Utils;
 import app.revanced.extension.shared.requests.Requester;
 import app.revanced.extension.shared.requests.Route;
 import app.revanced.extension.youtube.patches.spoof.ClientType;
@@ -24,6 +25,9 @@ final class PlayerRoutes {
      */
     private static final int CONNECTION_TIMEOUT_MILLISECONDS = 10 * 1000; // 10 Seconds.
 
+    private static final String LOCALE_LANGUAGE = Utils.getContext().getResources()
+            .getConfiguration().locale.getLanguage();
+
     private PlayerRoutes() {
     }
 
@@ -34,14 +38,15 @@ static String createInnertubeBody(ClientType clientType) {
             JSONObject context = new JSONObject();
 
             JSONObject client = new JSONObject();
+            // Required to use correct default audio channel with iOS.
+            client.put("hl", LOCALE_LANGUAGE);
             client.put("clientName", clientType.name());
             client.put("clientVersion", clientType.clientVersion);
             client.put("deviceModel", clientType.deviceModel);
             client.put("osVersion", clientType.osVersion);
             if (clientType.androidSdkVersion != null) {
                 client.put("androidSdkVersion", clientType.androidSdkVersion);
             }
-
             context.put("client", client);
 
             innerTubeBody.put("context", context);

diff --git a/...utube/src/main/java/app/revanced/extension/youtube/sponsorblock/SponsorBlockSettings.java b/...utube/src/main/java/app/revanced/extension/youtube/sponsorblock/SponsorBlockSettings.java
@@ -30,7 +30,7 @@ public class SponsorBlockSettings {
     public static final Setting.ImportExportCallback SB_IMPORT_EXPORT_CALLBACK = new Setting.ImportExportCallback() {
         @Override
         public void settingsImported(@Nullable Context context) {
-            updateFromImportedSettings();
+            SegmentCategory.loadAllCategoriesFromSettings();
         }
         @Override
         public void settingsExported(@Nullable Context context) {
@@ -172,7 +172,7 @@ public static String exportDesktopSettings() {
     /**
      * Export the categories using flatten json (no embedded dictionaries or arrays).
      */
-    public static void showExportWarningIfNeeded(@Nullable Context dialogContext) {
+    private static void showExportWarningIfNeeded(@Nullable Context dialogContext) {
         Utils.verifyOnMainThread();
         initialize();
 
@@ -245,11 +245,4 @@ public static void initialize() {
 
         SegmentCategory.updateEnabledCategories();
     }
-
-    /**
-     * Updates internal data based on {@link Setting} values.
-     */
-    public static void updateFromImportedSettings() {
-        SegmentCategory.loadAllCategoriesFromSettings();
-    }
 }