Adapt upstream changes

zjns · Jul 15, 2023 · 5548a6d · 5548a6d
1 parent 971256c
commit 5548a6d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/app/src/main/java/me/iacn/biliroaming/SettingDialog.kt b/app/src/main/java/me/iacn/biliroaming/SettingDialog.kt
@@ -102,6 +102,8 @@ class SettingDialog(context: Context) : AlertDialog.Builder(context) {
             findPreference("group")?.let { aboutGroup?.removePreference(it) }
             val hiddenGroup = findPreference("hidden_group") as? PreferenceCategory
             findPreference("force_th_comment")?.let { hiddenGroup?.removePreference(it) }
+            val miscGroup = findPreference("misc") as? PreferenceCategory
+            findPreference("default_speed")?.let { miscGroup?.removePreference(it) }
             findPreference("custom_splash")?.onPreferenceChangeListener = this
             findPreference("custom_splash_logo")?.onPreferenceChangeListener = this
             findPreference("save_log")?.summary =
@@ -115,7 +117,7 @@ class SettingDialog(context: Context) : AlertDialog.Builder(context) {
             findPreference("home_filter")?.onPreferenceClickListener = this
             findPreference("custom_subtitle")?.onPreferenceChangeListener = this
             findPreference("danmaku_filter")?.onPreferenceClickListener = this
-            findPreference("default_speed").onPreferenceClickListener = this
+            //findPreference("default_speed").onPreferenceClickListener = this
             findPreference("customize_accessKey")?.onPreferenceClickListener = this
             findPreference("share_log")?.onPreferenceClickListener = this
             findPreference("customize_drawer")?.onPreferenceClickListener = this

diff --git a/app/src/main/java/me/iacn/biliroaming/XposedInit.kt b/app/src/main/java/me/iacn/biliroaming/XposedInit.kt
@@ -142,7 +142,7 @@ class XposedInit : IXposedHookLoadPackage, IXposedHookZygoteInit {
                     startHook(VideoQualityHook(lpparam.classLoader))
                     startHook(PublishToFollowingHook(lpparam.classLoader))
                     startHook(UposReplaceHook(lpparam.classLoader))
-                    startHook(SpeedHook(lpparam.classLoader))
+                    //startHook(SpeedHook(lpparam.classLoader))
                 }
 
                 lpparam.processName.endsWith(":web") -> {

diff --git a/app/src/main/proto/me/iacn/biliroaming/configs.proto b/app/src/main/proto/me/iacn/biliroaming/configs.proto
@@ -118,7 +118,7 @@ message PlayerCoreService {
   optional Method on_seek_complete = 4;
   optional Method update_speed = 6;
   optional Class seek_complete_listener = 5;
-  optional Method set_default_speed = 6;
+  optional Method set_default_speed = 7;
 }
 
 message PegasusFeed {

diff --git a/app/src/main/res/xml/prefs_setting.xml b/app/src/main/res/xml/prefs_setting.xml
@@ -113,7 +113,9 @@
             android:title="@string/dialog_blur_background_title" />
     </PreferenceCategory>
 
-    <PreferenceCategory android:title="@string/miscellaneous_category">
+    <PreferenceCategory
+        android:key="misc"
+        android:title="@string/miscellaneous_category">
         <SwitchPreference
             android:key="teenagers_mode_dialog"
             android:summary="@string/teenagers_mode_dialog_summary"