From 3f8f6575736f7c900f3c60553f6b2fa0f93b8f6d Mon Sep 17 00:00:00 2001
From: Jarne Demeulemeester <jarnedemeulemeester@gmail.com>
Date: Mon, 22 May 2023 00:14:33 +0200
Subject: [PATCH] feat: always show extended episode title

Remove the option to display extended title
---
 core/src/main/res/values-b+es+419/strings.xml               | 2 --
 core/src/main/res/values-de/strings.xml                     | 2 --
 core/src/main/res/values-es-rMX/strings.xml                 | 2 --
 core/src/main/res/values-es/strings.xml                     | 2 --
 core/src/main/res/values-fr/strings.xml                     | 2 --
 core/src/main/res/values-hu/strings.xml                     | 2 --
 core/src/main/res/values-it/strings.xml                     | 2 --
 core/src/main/res/values-iw/strings.xml                     | 2 --
 core/src/main/res/values-ko/strings.xml                     | 2 --
 core/src/main/res/values-nl/strings.xml                     | 2 --
 core/src/main/res/values-pl/strings.xml                     | 2 --
 core/src/main/res/values-pt-rBR/strings.xml                 | 2 --
 core/src/main/res/values-pt/strings.xml                     | 2 --
 core/src/main/res/values-ru/strings.xml                     | 2 --
 core/src/main/res/values-sk/strings.xml                     | 2 --
 core/src/main/res/values-sl/strings.xml                     | 2 --
 core/src/main/res/values-sv/strings.xml                     | 2 --
 core/src/main/res/values-vi/strings.xml                     | 2 --
 core/src/main/res/values-zh-rCN/strings.xml                 | 2 --
 core/src/main/res/values-zh-rTW/strings.xml                 | 2 --
 core/src/main/res/values/strings.xml                        | 2 --
 core/src/main/res/xml/fragment_settings_player.xml          | 6 ------
 .../src/main/java/dev/jdtech/jellyfin/models/PlayerItem.kt  | 2 +-
 .../jdtech/jellyfin/viewmodels/PlayerActivityViewModel.kt   | 4 ++--
 .../src/main/java/dev/jdtech/jellyfin/AppPreferences.kt     | 2 --
 preferences/src/main/java/dev/jdtech/jellyfin/Constants.kt  | 1 -
 26 files changed, 3 insertions(+), 54 deletions(-)

diff --git a/core/src/main/res/values-b+es+419/strings.xml b/core/src/main/res/values-b+es+419/strings.xml
index b984fd18..77d93deb 100644
--- a/core/src/main/res/values-b+es+419/strings.xml
+++ b/core/src/main/res/values-b+es+419/strings.xml
@@ -110,8 +110,6 @@
     <string name="settings_category_download">Descargas</string>
     <string name="download_mobile_data">Descargar usando datos móviles</string>
     <string name="download_roaming">Descargar en itinerancia</string>
-    <string name="display_extended_title_summary">Mostrar títulos extendidos de episodios incluyendo temporada y episodio (TXX-EXX - NombreEpisodio).</string>
-    <string name="display_extended_title">Mostrar título extendido</string>
     <string name="gestures">Gestos</string>
     <string name="player_brightness_remember">Recordar el nivel de brillo</string>
     <string name="player_gestures">Gestos del reproductor</string>
diff --git a/core/src/main/res/values-de/strings.xml b/core/src/main/res/values-de/strings.xml
index 23277e3b..66db832d 100644
--- a/core/src/main/res/values-de/strings.xml
+++ b/core/src/main/res/values-de/strings.xml
@@ -91,7 +91,6 @@
     <string name="gestures">Gesten</string>
     <string name="player_gestures">Player-Gesten</string>
     <string name="add_server_empty_error">Leere Serveradresse</string>
-    <string name="display_extended_title">Zeige erweiterten Titel</string>
     <string name="image_description_poster">%1$s Poster</string>
     <string name="image_description_backdrop">%1$s Hintergrundbild</string>
     <string name="player_brightness_remember">Helligkeitsniveau beibehalten</string>
@@ -111,7 +110,6 @@
     <string name="player_controls_pause">Pausieren</string>
     <string name="player_controls_skip">Überspringen</string>
     <string name="track_selection">[%1$s] %2$s (%3$s)</string>
-    <string name="display_extended_title_summary">Zeige erweiterten Episodentitel inklusive der Staffel und Episodeninformationen (SXX:EXX - Episodenname).</string>
     <string name="app_description">Native Drittanbieter Jellyfin App</string>
     <string name="remove_server_dialog_text">Sicher, dass du den Server %1$s entfernen willst</string>
     <string name="player_gestures_vb_summary">Wische auf der rechten Seite des Bildschirms hoch und runter, um die Lautstärke anzupassen, und auf der linken Seite, um die Helligkeit anzupassen</string>
diff --git a/core/src/main/res/values-es-rMX/strings.xml b/core/src/main/res/values-es-rMX/strings.xml
index abd2ba75..dedbcf28 100644
--- a/core/src/main/res/values-es-rMX/strings.xml
+++ b/core/src/main/res/values-es-rMX/strings.xml
@@ -110,8 +110,6 @@
     <string name="settings_category_download">Descargas</string>
     <string name="download_mobile_data">Descargar usando datos del celular</string>
     <string name="download_roaming">Descargar en itinerancia</string>
-    <string name="display_extended_title_summary">Mostrar títulos extendidos de episodios incluyendo temporada y episodio (TXX-EXX - NombreEpisodio).</string>
-    <string name="display_extended_title">Mostrar título extendido</string>
     <string name="player_gestures">Gestos del reproductor</string>
     <string name="player_brightness_remember">Recordar el nivel de brillo</string>
     <string name="gestures">Gestos</string>
diff --git a/core/src/main/res/values-es/strings.xml b/core/src/main/res/values-es/strings.xml
index 1625f760..ce4fd2b9 100644
--- a/core/src/main/res/values-es/strings.xml
+++ b/core/src/main/res/values-es/strings.xml
@@ -110,8 +110,6 @@
     <string name="settings_category_download">Descargas</string>
     <string name="download_mobile_data">Descargar usando datos móviles</string>
     <string name="download_roaming">Descargar en itinerancia</string>
-    <string name="display_extended_title">Mostrar título extendido</string>
-    <string name="display_extended_title_summary">Mostrar títulos extendidos de episodios incluyendo temporada y episodio (TXX-EXX - NombreEpisodio).</string>
     <string name="gestures">Gestos</string>
     <string name="player_gestures">Gestos del reproductor</string>
     <string name="player_brightness_remember">Recordar nivel de brillo</string>
diff --git a/core/src/main/res/values-fr/strings.xml b/core/src/main/res/values-fr/strings.xml
index 4182ead1..4cbd00dc 100644
--- a/core/src/main/res/values-fr/strings.xml
+++ b/core/src/main/res/values-fr/strings.xml
@@ -51,7 +51,6 @@
     <string name="player_controls_fast_forward">Avance rapide</string>
     <string name="player_controls_pause">Pause</string>
     <string name="track_selection">[%1$s] %2$s (%3$s)</string>
-    <string name="display_extended_title">Afficher le titre étendu</string>
     <string name="player_controls_skip">Suivant</string>
     <string name="next_up">À suivre</string>
     <string name="continue_watching">Reprendre la lecture</string>
@@ -102,7 +101,6 @@
     <string name="player_gestures">Gestes du lecteur</string>
     <string name="player_gestures_vb_summary">Glissez vers le haut ou vers le bas sur le côté droit de l\'écran pour modifier le volume et sur le côté gauche de l\'écran pour modifier la luminosité</string>
     <string name="select_video_version_title">Choisissez une version</string>
-    <string name="display_extended_title_summary">Afficher le titre étendu inclut la numérotation de la saison et de l\'épisode (SXX:EXX - NomEpisode).</string>
     <string name="add_server_empty_error">Adresse du serveur vide</string>
     <string name="episode_watched_indicator">Indicateur d\'épisode vu</string>
     <string name="series_poster">Affiche des séries</string>
diff --git a/core/src/main/res/values-hu/strings.xml b/core/src/main/res/values-hu/strings.xml
index 1b68c837..c2c1e77b 100644
--- a/core/src/main/res/values-hu/strings.xml
+++ b/core/src/main/res/values-hu/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="display_extended_title_summary">Bővített epizódcím megjelenítése, beleértve a szezon és epizódinformációt (SXX:EXX - EpizódCím).</string>
     <string name="jellyfin_banner">Jellyfin zászló</string>
     <string name="add_server">Szerver hozzáadása</string>
     <string name="add_server_error_outdated">Elavult szerver verzió: %1$s. Kérlek frissítsd a szervert</string>
@@ -65,7 +64,6 @@
     <string name="privacy_policy">Adatvédelmi nyilatkozat</string>
     <string name="app_info">Alkalmazás információ</string>
     <string name="unknown_error">Ismeretlen hiba</string>
-    <string name="display_extended_title">Bővített cím megjelenítése</string>
     <string name="app_description">Egy egyedi, natív Jellyfin alkalmazás</string>
     <string name="remove_server">Szerver törlése</string>
     <string name="mpv_player">mpv lejátszó</string>
diff --git a/core/src/main/res/values-it/strings.xml b/core/src/main/res/values-it/strings.xml
index 2a675de1..effc99aa 100644
--- a/core/src/main/res/values-it/strings.xml
+++ b/core/src/main/res/values-it/strings.xml
@@ -119,8 +119,6 @@
     <string name="player_controls_skip">Salta</string>
     <string name="track_selection">[%1$s] %2$s (%3$s)</string>
     <string name="add_server_empty_error">Indirizzo server vuoto</string>
-    <string name="display_extended_title">Mostra titolo esteso</string>
-    <string name="display_extended_title_summary">Mostra titoli degli episodi in modo esteso includendo informazioni su stagione ed episodio (SXX:EXX - Nome episodio).</string>
     <string name="subtitles">Sottotitoli</string>
     <string name="subtitles_summary">Personalizza lo stile dei sottotitoli</string>
     <string name="libraries">Librerie</string>
diff --git a/core/src/main/res/values-iw/strings.xml b/core/src/main/res/values-iw/strings.xml
index f15d9a64..4577edf9 100644
--- a/core/src/main/res/values-iw/strings.xml
+++ b/core/src/main/res/values-iw/strings.xml
@@ -102,7 +102,6 @@
     <string name="player_controls_skip_intro">דלג פתיח</string>
     <string name="track_selection">[%1$s] %2$s (%3$s)</string>
     <string name="add_server_empty_error">כתובת שרת ריקה</string>
-    <string name="display_extended_title">הצג כותרת מורחבת</string>
     <string name="dynamic_colors">צבעים דינמיים</string>
     <string name="subtitles">כתוביות</string>
     <string name="theme_light">בהיר</string>
@@ -159,7 +158,6 @@
     <string name="mpv_player_summary">השתמש בנגן mpv נסיוני כדי לנגן וידאו. ל-mpv יש תמיכה ביותר מפענחי וידאו, שמע וכתוביות.</string>
     <string name="player_gestures_vb_summary">החלק למעלה ולמטה בצידו הימני של המסך כדי לשנות את עוצמת השמע ובצידו השמאלי כדי לשנות את הבהירות</string>
     <string name="player_gestures_zoom_summary">צבוט כדי להציג את הוידאו במסך מלא</string>
-    <string name="display_extended_title_summary">הצג כותרת מורחבת לפרק הכוללת עונה ומידע על הפרק (עXX:פXX - שם הפרק).</string>
     <string name="seek_back_increment">גודל קפיצה אחורה (מילי שניות)</string>
     <string name="dynamic_colors_summary">השתמש בצבעים דינמיים של Material You (זמין רק בגרסת אנדרואיד 12 ומעלה)</string>
     <string name="pref_player_trick_play_summary">דורש תוסף Jellyscrub של nicknsy מותקן על השרת</string>
diff --git a/core/src/main/res/values-ko/strings.xml b/core/src/main/res/values-ko/strings.xml
index 05bb6277..838d6bca 100644
--- a/core/src/main/res/values-ko/strings.xml
+++ b/core/src/main/res/values-ko/strings.xml
@@ -48,8 +48,6 @@
     <string name="player_controls_pause">정지</string>
     <string name="player_controls_skip">스킵</string>
     <string name="add_server_empty_error">서버 주소가 비어 있음</string>
-    <string name="display_extended_title_summary">시즌 및 에피소드 정보를 포함한 확장 에피소드 제목(SXX:EXX - 에피소드 이름)을 표시합니다.</string>
-    <string name="display_extended_title">확장 제목 표시</string>
     <string name="seeking">탐색</string>
     <string name="seek_back_increment">되감기 시간 (ms)</string>
     <string name="track_selection">[%1$s] %2$s (%3$s)</string>
diff --git a/core/src/main/res/values-nl/strings.xml b/core/src/main/res/values-nl/strings.xml
index c7174c1a..309f7975 100644
--- a/core/src/main/res/values-nl/strings.xml
+++ b/core/src/main/res/values-nl/strings.xml
@@ -67,8 +67,6 @@
     <string name="player_controls_skip">Overslaan</string>
     <string name="track_selection">[%1$s] %2$s (%3$s)</string>
     <string name="add_server_empty_error">Leeg server adres</string>
-    <string name="display_extended_title_summary">Geef de uitgebreide titel van de aflevering weer, inclusief informatie over het seizoen en de aflevering (SXX:AXX - Afleveringnaam).</string>
-    <string name="display_extended_title">Geef de uitgebreide titel</string>
     <string name="settings_category_network">Netwerk</string>
     <string name="settings_request_timeout">Time-out verzoek (ms)</string>
     <string name="settings_connect_timeout">Verbinding time-out (ms)</string>
diff --git a/core/src/main/res/values-pl/strings.xml b/core/src/main/res/values-pl/strings.xml
index eff5b86b..4cff9ec5 100644
--- a/core/src/main/res/values-pl/strings.xml
+++ b/core/src/main/res/values-pl/strings.xml
@@ -7,7 +7,6 @@
     <string name="download_mobile_data">Pobieraj używając danych komórkowych</string>
     <string name="mpv_player_summary">Używaj eksperymentalnego odtwarzacza MPV do odtwarzania wideo. MPV wspiera więcej kodeków wideo, audio i napisów.</string>
     <string name="player_gestures_vb_summary">Przesuń w górę lub w dół po prawej stronie ekrany by zmienić głośność, po lewej stronie by zmienić jasność</string>
-    <string name="display_extended_title_summary">Wyświetlaj rozszerzoną nazwę odcinka, razem z informacją o sezonie i odcinku (SXX:EXX - NazwaOdcinka).</string>
     <string name="add_server_error_slow">Zbyt wolna odpowiedź serwera: %1$s</string>
     <string name="add_server_error_empty_address">Pusty adres serwera</string>
     <string name="add_server_error_not_found">Nie znaleziono serwera</string>
@@ -111,7 +110,6 @@
     <string name="player_controls_skip">Pomiń</string>
     <string name="track_selection">[%1$s] %2$s (%3$s)</string>
     <string name="add_server_empty_error">Pusty adres serwera</string>
-    <string name="display_extended_title">Wyświetlaj rozszerzony tytuł</string>
     <string name="remove_server">Usuń serwer</string>
     <string name="error_loading_data">Błąd ładowania danych</string>
     <string name="check_button_description">Oznacz jako obejrzane lub nieobejrzane</string>
diff --git a/core/src/main/res/values-pt-rBR/strings.xml b/core/src/main/res/values-pt-rBR/strings.xml
index a0bbbd9b..c24ec416 100644
--- a/core/src/main/res/values-pt-rBR/strings.xml
+++ b/core/src/main/res/values-pt-rBR/strings.xml
@@ -107,8 +107,6 @@
     <string name="episodes_label">Episódios</string>
     <string name="player_gestures">Gestos do reprodutor</string>
     <string name="player_brightness_remember">Lembrar nível de brilho</string>
-    <string name="display_extended_title_summary">Exibe o título estendido do episódio, incluindo informações sobre a temporada e o episódio (TXX:EXX - NomeEpisódio).</string>
-    <string name="display_extended_title">Exibir título estendido</string>
     <string name="add_server_empty_error">Endereço de servidor vazio</string>
     <string name="sort_by_options_0">Título</string>
     <string name="dynamic_colors_summary">Usar cores dinâmicas do Material You (disponível apenas no Android 12+)</string>
diff --git a/core/src/main/res/values-pt/strings.xml b/core/src/main/res/values-pt/strings.xml
index 3771684c..449382a2 100644
--- a/core/src/main/res/values-pt/strings.xml
+++ b/core/src/main/res/values-pt/strings.xml
@@ -98,7 +98,6 @@
     <string name="player_gestures_zoom_summary">Clique para preencher o ecrã com o vídeo</string>
     <string name="add_server_empty_error">Servidores de endereço vazios</string>
     <string name="theme_system">Seguir sistema</string>
-    <string name="display_extended_title">Mostrar título alargado</string>
     <string name="seeking">Procura</string>
     <string name="subtitles">Legendas</string>
     <string name="dynamic_colors">Cores dinâmicas</string>
@@ -119,7 +118,6 @@
     <string name="player_controls_pause">Pausa</string>
     <string name="settings_category_servers">Servidores</string>
     <string name="settings_category_download">Transferências</string>
-    <string name="display_extended_title_summary">Mostrar título de episódio alargado incluindo temporada e informação de episódio (SXX:EXX - EpisodeName).</string>
     <string name="episode_watched_indicator">Indicador de episódio visto</string>
     <string name="continue_watching">Continuar a ver</string>
     <string name="settings_category_language">Idioma</string>
diff --git a/core/src/main/res/values-ru/strings.xml b/core/src/main/res/values-ru/strings.xml
index cbbac75f..fa165b0c 100644
--- a/core/src/main/res/values-ru/strings.xml
+++ b/core/src/main/res/values-ru/strings.xml
@@ -107,8 +107,6 @@
     <string name="player_controls_skip">Пропустить</string>
     <string name="track_selection">[%1$s] %2$s (%3$s)</string>
     <string name="add_server_empty_error">Пустой адрес</string>
-    <string name="display_extended_title_summary">Показывать расширенное название, включающее сезон и эпизод (СXX:ЭXX - НазваниеЭпизода).</string>
-    <string name="display_extended_title">Показывать расширенное название</string>
     <string name="sort_by_options_1">Рейтингу IMDB</string>
     <string name="sort_by_options_5">Дате выпуска</string>
     <string name="runtime_minutes">%1$d минут</string>
diff --git a/core/src/main/res/values-sk/strings.xml b/core/src/main/res/values-sk/strings.xml
index 0ae2714a..6a2f45d4 100644
--- a/core/src/main/res/values-sk/strings.xml
+++ b/core/src/main/res/values-sk/strings.xml
@@ -148,8 +148,6 @@
     <string name="sort_by_options_5">Dátum vydania</string>
     <string name="player_controls_fast_forward">Pretočiť dopredu</string>
     <string name="player_controls_skip_intro">Preskočiť úvodnú zvučku</string>
-    <string name="display_extended_title_summary">Zobraziť rozšírený titul epizódy včetne série a čísla epizódy (SXX:EXX - NázovEpizódy).</string>
-    <string name="display_extended_title">Zobraziť rozšírený názov</string>
     <string name="dynamic_colors_summary">Použiť dynamické farby Dynamic You (iba pre Android 12+)</string>
     <string name="add_user">Pridať používateľa</string>
     <string name="video">Video</string>
diff --git a/core/src/main/res/values-sl/strings.xml b/core/src/main/res/values-sl/strings.xml
index fa45861c..de83d46a 100644
--- a/core/src/main/res/values-sl/strings.xml
+++ b/core/src/main/res/values-sl/strings.xml
@@ -95,7 +95,6 @@
     <string name="player_controls_skip">Preskoči</string>
     <string name="player_controls_skip_intro">Preskoči uvod</string>
     <string name="add_server_empty_error">Prazen naslov strežnika</string>
-    <string name="display_extended_title">Prikaži razširjeni naslov</string>
     <string name="seeking">iskanje</string>
     <string name="seek_back_increment">Iskanja nazaj (ms)</string>
     <string name="seek_forward_increment">Iskanja naprej (ms)</string>
@@ -150,6 +149,5 @@
     <string name="sort_by_options_3">Datum dodajanja</string>
     <string name="runtime_minutes">%1$d min</string>
     <string name="track_selection">[%1$s] %2$s (%3$s)</string>
-    <string name="display_extended_title_summary">Prikaži razširjene naslove epizod, vključno s podatki o sezoni in epizodi (SXX:EXX - EpizodaIme).</string>
     <string name="settings_connect_timeout">Časovna omejitev povezave (ms)</string>
 </resources>
\ No newline at end of file
diff --git a/core/src/main/res/values-sv/strings.xml b/core/src/main/res/values-sv/strings.xml
index 646af79f..826fdb32 100644
--- a/core/src/main/res/values-sv/strings.xml
+++ b/core/src/main/res/values-sv/strings.xml
@@ -86,8 +86,6 @@
     <string name="player_controls_skip">Hoppa över</string>
     <string name="track_selection">[%1$s] %2$s (%3$s)</string>
     <string name="add_server_empty_error">Tom serveradress</string>
-    <string name="display_extended_title_summary">Visa utökad avsnittstitel som inkluderar information om säsong och avsnitt (SXX:EXX - Avsnittsnamn).</string>
-    <string name="display_extended_title">Visa utökad titel</string>
     <string name="seeking">Spolar</string>
     <string name="seek_back_increment">Spola bakåt intervall (ms)</string>
     <string name="seek_forward_increment">Spola framåt intervall (ms)</string>
diff --git a/core/src/main/res/values-vi/strings.xml b/core/src/main/res/values-vi/strings.xml
index f2c9996a..67b79b1b 100644
--- a/core/src/main/res/values-vi/strings.xml
+++ b/core/src/main/res/values-vi/strings.xml
@@ -96,7 +96,6 @@
     <string name="player_controls_skip_intro">Bỏ qua đoạn mở đầu</string>
     <string name="track_selection">[%1$s] %2$s (%3$s)</string>
     <string name="add_server_empty_error">Địa chỉ máy chủ rỗng</string>
-    <string name="display_extended_title">Hiển thị tiêu đề được mở rộng</string>
     <string name="seeking">Tua</string>
     <string name="seek_back_increment">Gia số tua lùi (ms)</string>
     <string name="seek_forward_increment">Gia số tua tới (ms)</string>
@@ -149,7 +148,6 @@
     <string name="add_user">Thêm người dùng</string>
     <string name="pref_player_intro_skipper">Bỏ qua đoạn mở đầu</string>
     <string name="pref_player_intro_skipper_summary">Yêu cầu phần mở rộng \"Intro Skipper\" của ConfusedPolarBear đã được cài đặt trên máy chủ</string>
-    <string name="display_extended_title_summary">Hiển thị tiêu đề tập phim được mở rộng, bao gồm thông tin về mùa và tập phim (SXX:EXX - Tẻntậpphim).</string>
     <string name="player_gestures_seek_summary">Vuốt ngang để tua tới hoặc tua lui</string>
     <string name="player_gestures_seek">Cử chỉ tua</string>
 </resources>
\ No newline at end of file
diff --git a/core/src/main/res/values-zh-rCN/strings.xml b/core/src/main/res/values-zh-rCN/strings.xml
index 120391dc..7913d724 100644
--- a/core/src/main/res/values-zh-rCN/strings.xml
+++ b/core/src/main/res/values-zh-rCN/strings.xml
@@ -96,8 +96,6 @@
     <string name="mpv_player_summary">使用实验性的mpv播放器播放视频。mpv支持更多视频、音频和字幕格式。</string>
     <string name="track_selection">[%1$s] %2$s (%3$s)</string>
     <string name="add_server_empty_error">服务器地址为空</string>
-    <string name="display_extended_title_summary">显示额外的集标题，包括季和集信息 (SXX:EXX - 集标题)。</string>
-    <string name="display_extended_title">显示额外的标题</string>
     <string name="app_description">第三方原生Jellyfin app</string>
     <string name="login_error_wrong_username_password">用户名或密码错误</string>
     <string name="latest_library">最新%1$s</string>
diff --git a/core/src/main/res/values-zh-rTW/strings.xml b/core/src/main/res/values-zh-rTW/strings.xml
index 577ea8cb..a5ecd989 100644
--- a/core/src/main/res/values-zh-rTW/strings.xml
+++ b/core/src/main/res/values-zh-rTW/strings.xml
@@ -99,7 +99,6 @@
     <string name="player_controls_skip">跳過</string>
     <string name="track_selection">[%1$s] %2$s (%3$s)</string>
     <string name="add_server_empty_error">空的伺服器地址</string>
-    <string name="display_extended_title">顯示擴展標題</string>
     <string name="seeking">拖動條</string>
     <string name="seek_back_increment">尋回增量（毫秒）</string>
     <string name="dynamic_colors">動態色彩</string>
@@ -135,7 +134,6 @@
     <string name="sort_by">排序方式</string>
     <string name="player_gestures_vb">音量和亮度手勢</string>
     <string name="player_gestures_vb_summary">在螢幕右側上下滑動可以控制音量，在螢幕左側可以控制亮度</string>
-    <string name="display_extended_title_summary">顯示擴展影集標題，包括季和影集資訊 （第XX季：第XX集 - 影集名稱）。</string>
     <string name="seek_forward_increment">尋回向前增量（毫秒）</string>
     <string name="dynamic_colors_summary">使用 Material You Dynamic 顏色（僅適用於 Android 12+）</string>
     <string name="player_controls_skip_intro">跳過片頭</string>
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index e3185d90..ebc2f0eb 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -128,8 +128,6 @@
     <string name="player_controls_skip_intro">Skip Intro</string>
     <string name="track_selection">[%1$s] %2$s (%3$s)</string>
     <string name="add_server_empty_error">Empty server address</string>
-    <string name="display_extended_title_summary">Display extended episode title including season and episode information (SXX:EXX - EpisodeName).</string>
-    <string name="display_extended_title">Display extended title</string>
     <string name="seeking">Seeking</string>
     <string name="seek_back_increment">Seek back increment (ms)</string>
     <string name="seek_forward_increment">Seek forward increment (ms)</string>
diff --git a/core/src/main/res/xml/fragment_settings_player.xml b/core/src/main/res/xml/fragment_settings_player.xml
index fb6c245c..4248e188 100644
--- a/core/src/main/res/xml/fragment_settings_player.xml
+++ b/core/src/main/res/xml/fragment_settings_player.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
-    <SwitchPreferenceCompat
-        app:key="pref_player_display_extended_title"
-        app:summary="@string/display_extended_title_summary"
-        app:title="@string/display_extended_title"
-        app:widgetLayout="@layout/preference_material3_switch" />
-
     <Preference
         app:key="pref_player_subtitles"
         app:summary="@string/subtitles_summary"
diff --git a/player/core/src/main/java/dev/jdtech/jellyfin/models/PlayerItem.kt b/player/core/src/main/java/dev/jdtech/jellyfin/models/PlayerItem.kt
index 15551338..1ec663dd 100644
--- a/player/core/src/main/java/dev/jdtech/jellyfin/models/PlayerItem.kt
+++ b/player/core/src/main/java/dev/jdtech/jellyfin/models/PlayerItem.kt
@@ -6,7 +6,7 @@ import kotlinx.parcelize.Parcelize
 
 @Parcelize
 data class PlayerItem(
-    val name: String?,
+    val name: String,
     val itemId: UUID,
     val mediaSourceId: String,
     val playbackPosition: Long,
diff --git a/player/video/src/main/java/dev/jdtech/jellyfin/viewmodels/PlayerActivityViewModel.kt b/player/video/src/main/java/dev/jdtech/jellyfin/viewmodels/PlayerActivityViewModel.kt
index dae670a1..92743dbc 100644
--- a/player/video/src/main/java/dev/jdtech/jellyfin/viewmodels/PlayerActivityViewModel.kt
+++ b/player/video/src/main/java/dev/jdtech/jellyfin/viewmodels/PlayerActivityViewModel.kt
@@ -243,7 +243,7 @@ constructor(
             try {
                 items.first { it.itemId.toString() == player.currentMediaItem?.mediaId }
                     .let { item ->
-                        if (appPreferences.displayExtendedTitle && item.parentIndexNumber != null && item.indexNumber != null && item.name != null
+                        if (item.parentIndexNumber != null && item.indexNumber != null
                         )
                             _currentItemTitle.value = if (item.indexNumberEnd == null) {
                                 "S${item.parentIndexNumber}:E${item.indexNumber} - ${item.name}"
@@ -252,7 +252,7 @@ constructor(
                             }
 
                         else
-                            _currentItemTitle.value = item.name.orEmpty()
+                            _currentItemTitle.value = item.name
 
                         jellyfinRepository.postPlaybackStart(item.itemId)
 
diff --git a/preferences/src/main/java/dev/jdtech/jellyfin/AppPreferences.kt b/preferences/src/main/java/dev/jdtech/jellyfin/AppPreferences.kt
index 00511b6e..a9ec7627 100644
--- a/preferences/src/main/java/dev/jdtech/jellyfin/AppPreferences.kt
+++ b/preferences/src/main/java/dev/jdtech/jellyfin/AppPreferences.kt
@@ -43,8 +43,6 @@ constructor(
         }
 
     // Player
-    val displayExtendedTitle get() = sharedPreferences.getBoolean(Constants.PREF_DISPLAY_EXTENDED_TITLE, false)
-
     val playerGestures get() = sharedPreferences.getBoolean(Constants.PREF_PLAYER_GESTURES, true)
     val playerGesturesVB get() = sharedPreferences.getBoolean(Constants.PREF_PLAYER_GESTURES_VB, true)
     val playerGesturesZoom get() = sharedPreferences.getBoolean(Constants.PREF_PLAYER_GESTURES_ZOOM, true)
diff --git a/preferences/src/main/java/dev/jdtech/jellyfin/Constants.kt b/preferences/src/main/java/dev/jdtech/jellyfin/Constants.kt
index fa09ce1b..89f67edd 100644
--- a/preferences/src/main/java/dev/jdtech/jellyfin/Constants.kt
+++ b/preferences/src/main/java/dev/jdtech/jellyfin/Constants.kt
@@ -11,7 +11,6 @@ object Constants {
     // pref
     const val PREF_CURRENT_SERVER = "pref_current_server"
     const val PREF_OFFLINE_MODE = "pref_offline_mode"
-    const val PREF_DISPLAY_EXTENDED_TITLE = "pref_player_display_extended_title"
     const val PREF_PLAYER_GESTURES = "pref_player_gestures"
     const val PREF_PLAYER_GESTURES_VB = "pref_player_gestures_vb"
     const val PREF_PLAYER_GESTURES_ZOOM = "pref_player_gestures_zoom"