Skip to content
This repository was archived by the owner on Oct 26, 2024. It is now read-only.

Commit 8a0029c

Browse files
TheJeterLPTheJeterLP
authored
feat: force-vp9-codec integrations (#76)
1 parent 636fae6 commit 8a0029c

5 files changed

Lines changed: 42 additions & 59 deletions

File tree

‎app/src/main/java/app/revanced/integrations/patches/ForceCodecPatch.java‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package app.revanced.integrations.patches;
2+
3+
import android.os.Build;
4+
5+
import app.revanced.integrations.settings.SettingsEnum;
6+
7+
public class ForceCodecPatch {
8+
9+
public static String getManufacturer() {
10+
return SettingsEnum.CODEC_OVERRIDE_BOOLEAN.getBoolean() ? "samsung" : Build.MANUFACTURER;
11+
}
12+
13+
public static String getModel() {
14+
return SettingsEnum.CODEC_OVERRIDE_BOOLEAN.getBoolean() ? "SM-G920F" : Build.MODEL;
15+
}
16+
17+
public static boolean shouldForceVP9() {
18+
return SettingsEnum.CODEC_OVERRIDE_BOOLEAN.getBoolean();
19+
}
20+
21+
22+
}

‎app/src/main/java/app/revanced/integrations/settings/Settings.java‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,5 +71,22 @@ public static void setOldLayout(SharedPreferences sharedPreferences, String conf
7171
}
7272
LogHelper.debug("Settings", "setOldLayout: false");
7373
}
74+
75+
public static boolean autoCaptions(boolean original) {
76+
ReadSettings();
77+
if (!settingsInitialized.booleanValue()) {
78+
Log.e("XGlobals", "Context is null, returning " + original + "!");
79+
return original;
80+
}
81+
Boolean captions = Boolean.valueOf(original);
82+
if (prefAutoCaptions.booleanValue()) {
83+
captions = true;
84+
}
85+
if (debug.booleanValue()) {
86+
Log.d("XGlobals", "autoCaptions: " + captions);
87+
}
88+
return captions.booleanValue();
89+
}
90+
7491
*/
7592
}

‎app/src/main/java/app/revanced/integrations/settings/SettingsEnum.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ public enum SettingsEnum {
1313

1414
//Codec Override
1515
CODEC_OVERRIDE_BOOLEAN("revanced_override_codec_enabled", true),
16-
MANUFACTURER_OVERRIDE_STRING("revanced_override_codec_manufacturer", null),
17-
MODEL_OVERRIDE_STRING("revanced_override_codec_model", null),
1816

1917
//Video Settings
2018
OLD_STYLE_QUALITY_SETTINGS_BOOLEAN("revanced_use_old_style_quality_settings", true),

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

Lines changed: 3 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import android.content.Context;
99
import android.content.Intent;
1010
import android.content.SharedPreferences;
11-
import android.os.Build;
1211
import android.os.Bundle;
1312
import android.os.Process;
1413
import android.preference.EditTextPreference;
@@ -23,8 +22,8 @@
2322
import app.revanced.integrations.settings.SettingsEnum;
2423
import app.revanced.integrations.utils.LogHelper;
2524
import app.revanced.integrations.utils.ReVancedUtils;
26-
import app.revanced.integrations.videoplayer.autorepeat.AutoRepeat;
2725
import app.revanced.integrations.utils.ScreenSizeHelper;
26+
import app.revanced.integrations.videoplayer.autorepeat.AutoRepeat;
2827
import app.revanced.integrations.videoplayer.videourl.Copy;
2928
import app.revanced.integrations.videoplayer.videourl.CopyWithTimeStamp;
3029

@@ -40,9 +39,7 @@ public class ReVancedSettingsFragment extends PreferenceFragment {
4039
private PreferenceScreen codecPreferenceScreen;
4140
private Preference codecVP9;
4241
private PreferenceScreen layoutSettingsPreferenceScreen;
43-
private EditTextPreference manufacturerOverride;
4442
private PreferenceScreen miscsPreferenceScreen;
45-
private EditTextPreference modelOverride;
4643
private SwitchPreference tabletMiniplayer;
4744
private PreferenceScreen videoAdSettingsPreferenceScreen;
4845
private PreferenceScreen videoSettingsPreferenceScreen;
@@ -61,26 +58,6 @@ public class ReVancedSettingsFragment extends PreferenceFragment {
6158
SharedPreferences.OnSharedPreferenceChangeListener listener = (sharedPreferences, str) -> {
6259
if (str.equals(SettingsEnum.DEBUG_BOOLEAN.getPath())) {
6360
SettingsEnum.DEBUG_BOOLEAN.setValue(((SwitchPreference) findPreference(str)).isChecked());
64-
} else if (str.equals(SettingsEnum.CODEC_OVERRIDE_BOOLEAN.getPath())) {
65-
if (((SwitchPreference) codecPreferenceScreen.findPreference(str)).isChecked()) {
66-
SettingsEnum.MANUFACTURER_OVERRIDE_STRING.saveValue("samsung");
67-
SettingsEnum.MODEL_OVERRIDE_STRING.saveValue("SM-G920F");
68-
} else {
69-
SettingsEnum.MANUFACTURER_OVERRIDE_STRING.saveValue(null);
70-
SettingsEnum.MODEL_OVERRIDE_STRING.saveValue(null);
71-
}
72-
} else if (str.equals(SettingsEnum.MANUFACTURER_OVERRIDE_STRING.getPath())) {
73-
EditTextPreference editTextPreference = (EditTextPreference) codecPreferenceScreen.findPreference(str);
74-
if (editTextPreference != null) {
75-
editTextPreference.setSummary(editTextPreference.getText());
76-
SettingsEnum.MANUFACTURER_OVERRIDE_STRING.setValue(editTextPreference.getText());
77-
}
78-
} else if (str.equals(SettingsEnum.MODEL_OVERRIDE_STRING.getPath())) {
79-
EditTextPreference editTextPreference2 = (EditTextPreference) codecPreferenceScreen.findPreference(str);
80-
if (editTextPreference2 != null) {
81-
editTextPreference2.setSummary(editTextPreference2.getText());
82-
SettingsEnum.MODEL_OVERRIDE_STRING.setValue(editTextPreference2.getText());
83-
}
8461
} else if (str.equals(SettingsEnum.HOME_ADS_SHOWN_BOOLEAN.getPath())) {
8562
SettingsEnum.HOME_ADS_SHOWN_BOOLEAN.setValue(((SwitchPreference) adsSettingsPreferenceScreen.findPreference(str)).isChecked());
8663
if (ReVancedUtils.getContext() != null && settingsInitialized) {
@@ -210,16 +187,10 @@ public void onCreate(Bundle bundle) {
210187
this.miscsPreferenceScreen = (PreferenceScreen) getPreferenceScreen().findPreference("misc_screen");
211188
this.xSwipeControlPreferenceScreen = (PreferenceScreen) getPreferenceScreen().findPreference("xfenster_screen");
212189
this.vp9Override = (SwitchPreference) this.codecPreferenceScreen.findPreference("revanced_vp9_enabled");
213-
this.manufacturerOverride = (EditTextPreference) this.codecPreferenceScreen.findPreference("override_manufacturer");
214-
this.modelOverride = (EditTextPreference) this.codecPreferenceScreen.findPreference("override_model");
215190
this.codecDefault = this.codecPreferenceScreen.findPreference("pref_default_override");
216191
this.codecVP9 = this.codecPreferenceScreen.findPreference("pref_vp9_override");
217192
this.tabletMiniplayer = (SwitchPreference) this.layoutSettingsPreferenceScreen.findPreference("tablet_miniplayer");
218193
AutoRepeatLinks();
219-
EditTextPreference editTextPreference = this.manufacturerOverride;
220-
editTextPreference.setSummary(editTextPreference.getText());
221-
EditTextPreference editTextPreference2 = this.modelOverride;
222-
editTextPreference2.setSummary(editTextPreference2.getText());
223194
final ListPreference listPreference = (ListPreference) this.videoSettingsPreferenceScreen.findPreference("pref_preferred_video_quality_wifi");
224195
final ListPreference listPreference2 = (ListPreference) this.videoSettingsPreferenceScreen.findPreference("pref_preferred_video_quality_mobile");
225196
setListPreferenceData(listPreference, true);
@@ -244,12 +215,12 @@ public void onCreate(Bundle bundle) {
244215
Preference findPreference = findPreference("pref_about_field");
245216

246217
this.codecDefault.setOnPreferenceClickListener(preference -> {
247-
ReVancedSettingsFragment.this.changeCodec();
218+
SettingsEnum.CODEC_OVERRIDE_BOOLEAN.saveValue(false);
248219
return false;
249220
});
250221

251222
this.codecVP9.setOnPreferenceClickListener(preference -> {
252-
ReVancedSettingsFragment.this.changeCodec();
223+
SettingsEnum.CODEC_OVERRIDE_BOOLEAN.saveValue(true);
253224
return false;
254225
});
255226

@@ -318,29 +289,6 @@ private String getPackageName() {
318289
return PACKAGE_NAME;
319290
}
320291

321-
private void changeCodec() {
322-
String manufacturer = null;
323-
String model = null;
324-
325-
if (SettingsEnum.CODEC_OVERRIDE_BOOLEAN.getBoolean()) {
326-
manufacturer = "samsung";
327-
model = "SM-G920F";
328-
} else {
329-
manufacturer = Build.MANUFACTURER;
330-
model = Build.MODEL;
331-
}
332-
333-
SettingsEnum.MANUFACTURER_OVERRIDE_STRING.saveValue(manufacturer);
334-
SettingsEnum.MODEL_OVERRIDE_STRING.saveValue(model);
335-
336-
manufacturerOverride.setText(manufacturer);
337-
modelOverride.setText(model);
338-
EditTextPreference editTextPreference = this.manufacturerOverride;
339-
editTextPreference.setSummary(editTextPreference.getText());
340-
EditTextPreference editTextPreference2 = this.modelOverride;
341-
editTextPreference2.setSummary(editTextPreference2.getText());
342-
}
343-
344292
private void AutoRepeatLinks() {
345293
boolean z = this.sharedPreferences.getBoolean("pref_auto_repeat_button", false);
346294
SwitchPreference switchPreference = (SwitchPreference) this.miscsPreferenceScreen.findPreference("pref_auto_repeat");

‎app/src/main/res/xml/revanced_prefs.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
<PreferenceScreen android:title="@string/revanced_codec_override_title" android:key="revanced_override_codec">
1111
<SwitchPreference android:title="@string/revanced_vp9_title" android:key="revanced_override_codec_enabled" android:defaultValue="true" android:summaryOn="@string/revanced_vp9_summary_on" android:summaryOff="@string/revanced_vp9_summary_off" />
1212
<Preference android:persistent="false" android:title="@string/revanced_default_codec_title" android:selectable="true" android:key="revanced_override_codec_default" android:summary="@string/revanced_default_codec_summary" />
13-
<EditTextPreference android:singleLine="true" android:title="@string/revanced_current_override_manufacturer" android:key="revanced_override_codec_manufacturer" />
14-
<EditTextPreference android:singleLine="true" android:title="@string/revanced_current_override_model" android:key="revanced_override_codec_model" />
1513
</PreferenceScreen>
1614
<PreferenceScreen android:title="@string/revanced_video_settings_title" android:key="video_settings">
1715
<SwitchPreference android:title="@string/revanced_old_style_quality_settings_title" android:key="revanced_use_old_style_quality_settings" android:defaultValue="true" android:summaryOn="@string/revanced_old_style_quality_settings_summary_on" android:summaryOff="@string/revanced_old_style_quality_settings_summary_off" />

0 commit comments

Comments
 (0)
⚡