fix(YouTube - SponsorBlock): Show correct segment behavior in setting…

…s UI after importing
ReVanced · Nov 6, 2024 · deb1d41 · deb1d41
1 parent 906fce6
commit deb1d41
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/...ed/src/main/java/app/revanced/extension/youtube/sponsorblock/objects/SegmentCategory.java b/...ed/src/main/java/app/revanced/extension/youtube/sponsorblock/objects/SegmentCategory.java
@@ -136,7 +136,7 @@ public static void loadAllCategoriesFromSettings() {
     @NonNull
     public final String keyValue;
     @NonNull
-    private final StringSetting behaviorSetting;
+    public final StringSetting behaviorSetting;
     @NonNull
     private final StringSetting colorSetting;
 

diff --git a/...va/app/revanced/extension/youtube/sponsorblock/objects/SegmentCategoryListPreference.java b/...va/app/revanced/extension/youtube/sponsorblock/objects/SegmentCategoryListPreference.java
@@ -31,14 +31,18 @@ public SegmentCategoryListPreference(Context context, SegmentCategory category)
         super(context);
         final boolean isHighlightCategory = category == SegmentCategory.HIGHLIGHT;
         this.category = Objects.requireNonNull(category);
-        setKey(category.keyValue);
-        setDefaultValue(category.behaviour.reVancedKeyValue);
+
+        // Edit: Using preferences to sync together multiple pieces
+        // of code together is messy and should be rethought.
+        setKey(category.behaviorSetting.key);
+        setDefaultValue(category.behaviorSetting.defaultValue);
         setEntries(isHighlightCategory
                 ? CategoryBehaviour.getBehaviorDescriptionsWithoutSkipOnce()
                 : CategoryBehaviour.getBehaviorDescriptions());
         setEntryValues(isHighlightCategory
                 ? CategoryBehaviour.getBehaviorKeyValuesWithoutSkipOnce()
                 : CategoryBehaviour.getBehaviorKeyValues());
+
         setSummary(category.description.toString());
         updateTitle();
     }