From ab7c3482923189e1c76efb47c3daca39573260bd Mon Sep 17 00:00:00 2001
From: Damontecres <damontecres@gmail.com>
Date: Tue, 14 Apr 2026 11:42:33 -0400
Subject: [PATCH] Fix strings & ass subtitle default setting

---
 .../damontecres/wholphin/preferences/AppPreference.kt     | 2 +-
 .../wholphin/preferences/AppPreferencesSerializer.kt      | 3 +--
 .../damontecres/wholphin/services/AppUpgradeHandler.kt    | 8 ++++++++
 app/src/main/res/values/strings.xml                       | 1 +
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/github/damontecres/wholphin/preferences/AppPreference.kt b/app/src/main/java/com/github/damontecres/wholphin/preferences/AppPreference.kt
index 0979442f..8e488a12 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/preferences/AppPreference.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/preferences/AppPreference.kt
@@ -433,7 +433,7 @@ sealed interface AppPreference<Pref, T> {
             )
         val AssSubtitleMode =
             AppChoicePreference<AppPreferences, AssPlaybackMode>(
-                title = R.string.app_theme,
+                title = R.string.ass_subtitle_playback,
                 defaultValue = AssPlaybackMode.ASS_LIBASS,
                 getter = { it.playbackPreferences.overrides.assPlaybackMode },
                 setter = { prefs, value ->
diff --git a/app/src/main/java/com/github/damontecres/wholphin/preferences/AppPreferencesSerializer.kt b/app/src/main/java/com/github/damontecres/wholphin/preferences/AppPreferencesSerializer.kt
index 68047896..9b46de83 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/preferences/AppPreferencesSerializer.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/preferences/AppPreferencesSerializer.kt
@@ -65,8 +65,7 @@ class AppPreferencesSerializer
                                             directPlayPgs = AppPreference.DirectPlayPgs.defaultValue
                                             mediaExtensionsEnabled =
                                                 AppPreference.FfmpegPreference.defaultValue
-                                            assPlaybackMode =
-                                                AppPreference.AssSubtitleMode.defaultValue
+                                            assPlaybackMode = AppPreference.AssSubtitleMode.defaultValue
                                         }.build()
 
                                 mpvOptions =
diff --git a/app/src/main/java/com/github/damontecres/wholphin/services/AppUpgradeHandler.kt b/app/src/main/java/com/github/damontecres/wholphin/services/AppUpgradeHandler.kt
index a828b27e..8899fe8e 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/services/AppUpgradeHandler.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/services/AppUpgradeHandler.kt
@@ -319,5 +319,13 @@ class AppUpgradeHandler
                     }
                 }
             }
+
+            if (previous.isEqualOrBefore(Version.fromString("0.6.2-1-g0"))) {
+                appPreferences.updateData {
+                    it.updatePlaybackOverrides {
+                        assPlaybackMode = AppPreference.AssSubtitleMode.defaultValue
+                    }
+                }
+            }
         }
     }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 46501c70..68b2f5d3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -760,6 +760,7 @@
     <string name="ass_subtitle_mode_libass">Direct play with libass</string>
     <string name="ass_subtitle_mode_exoplayer">Direct play with ExoPlayer built-in</string>
     <string name="ass_subtitle_mode_transcode">Burn in/transcode on server</string>
+    <string name="ass_subtitle_playback">SSA/ASS subtitle playback</string>
     <array name="ass_subtitle_modes">
         <item>@string/ass_subtitle_mode_libass</item>
         <item>@string/ass_subtitle_mode_exoplayer</item>