Prepare release 1.11.0

app/build.gradle

@@ -6,8 +6,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 29
-        versionCode 19
-        versionName "1.10.0"
+        versionCode 20
+        versionName "1.11.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {

app/src/main/java/app/fedilab/nitterizeme/helpers/Utils.java

@@ -385,9 +385,9 @@ public class Utils {
             newUrl = newUrl.replaceAll("&?hl=\\w{2}(-\\w{2})?", "");
         } else if (language.compareTo("0") != 0) { //Change value
             if (newUrl.contains("hl=")) {
-                newUrl = newUrl.replaceAll("hl=\\w{2}(-\\w{2})?", language);
+                newUrl = newUrl.replaceAll("hl=\\w{2}(-\\w{2})?", "hl=" + language);
             } else {
-                newUrl += "&" + language;
+                newUrl += "&hl=" + language;
             }
         }
 
@@ -439,7 +439,7 @@ public class Utils {
             }
         }
 
-        //Listen
+        //Local
         String local = sharedpreferences.getString(context.getString(R.string.invidious_local_mode), "0");
         if (local.compareTo("-1") == 0) { //Remove value
             newUrl = newUrl.replaceAll("&?local=(true|false)", "");
@@ -457,9 +457,9 @@ public class Utils {
             newUrl = newUrl.replaceAll("&?subtitles=\\w+", "");
         } else if (subtitles.compareTo("0") != 0) { //Change value
             if (newUrl.contains("subtitles=")) {
-                newUrl = newUrl.replaceAll("subtitles=\\w+", subtitles);
+                newUrl = newUrl.replaceAll("subtitles=\\w+", "subtitles=" + subtitles);
             } else {
-                newUrl += "&" + subtitles;
+                newUrl += "&subtitles=" + subtitles;
             }
         }
 

app/src/main/res/values/array.xml

@@ -17,22 +17,22 @@
     <string-array name="invidious_language_values">
         <item>0</item>
         <item>-1</item>
-        <item>hl=ar</item>
-        <item>hl=de</item>
-        <item>hl=el</item>
-        <item>hl=en-US</item>
-        <item>hl=eo</item>
-        <item>hl=es</item>
-        <item>hl=eu</item>
-        <item>hl=fr</item>
-        <item>hl=is</item>
-        <item>hl=it</item>
-        <item>hl=nb_NO</item>
-        <item>hl=nl</item>
-        <item>hl=pl</item>
-        <item>hl=ru</item>
-        <item>hl=uk</item>
-        <item>hl=zh-CN</item>
+        <item>ar</item>
+        <item>de</item>
+        <item>el</item>
+        <item>en-US</item>
+        <item>eo</item>
+        <item>es</item>
+        <item>eu</item>
+        <item>fr</item>
+        <item>is</item>
+        <item>it</item>
+        <item>nb_NO</item>
+        <item>nl</item>
+        <item>pl</item>
+        <item>ru</item>
+        <item>uk</item>
+        <item>zh-CN</item>
     </string-array>
 
 
@@ -74,12 +74,6 @@
     </string-array>
 
 
-    <string-array name="invidious_subtitles_values">
-        <item>0</item>
-        <item>-1</item>
-        <item>subtitles=en</item>
-    </string-array>
-
     <string-array name="invidious_quality_values">
         <item>0</item>
         <item>-1</item>

app/src/main/res/values/strings.xml

@@ -173,12 +173,6 @@
     </string-array>
 
 
-    <string-array name="invidious_subtitles">
-        <item>Ignore</item>
-        <item>Remove</item>
-        <item>English</item>
-    </string-array>
-
     <string-array name="invidious_quality">
         <item>Ignore</item>
         <item>Remove</item>

app/src/main/res/xml/preferences_invidious.xml

@@ -87,8 +87,8 @@
 
         <ListPreference
             android:defaultValue="0"
-            android:entries="@array/invidious_subtitles"
-            android:entryValues="@array/invidious_subtitles_values"
+            android:entries="@array/invidious_language"
+            android:entryValues="@array/invidious_language_values"
             app:iconSpaceReserved="false"
             app:key="@string/invidious_subtitles_mode"
             app:summary="@string/invidious_subtitles_mode_indication"