Add RAW download mode preference UI

Radiokot · Radiokot · commit 9e817e6ec56e · 2025-08-10T16:12:29.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Resetting photo zoom in the media viewer when setting or unsetting the photo favorite or private
 
+### Added
+
+- Ability to change the download behavior for RAWs in the preferences:
+  you can choose between downloading the original file or a compatible JPEG, if available
+
 ### Removed
 
 - Redundant encryption of the stored credentials and library connection parameters.
diff --git a/app/src/main/java/ua/com/radiokot/photoprism/features/gallery/data/model/RawDownloadMode.kt b/app/src/main/java/ua/com/radiokot/photoprism/features/gallery/data/model/RawDownloadMode.kt
@@ -1,7 +1,7 @@
 package ua.com.radiokot.photoprism.features.gallery.data.model
 
 enum class RawDownloadMode {
-    COMPATIBLE_JPEG,
     ORIGINAL,
+    COMPATIBLE_JPEG,
     ;
 }
diff --git a/app/src/main/java/ua/com/radiokot/photoprism/features/gallery/data/model/RawSharingMode.kt b/app/src/main/java/ua/com/radiokot/photoprism/features/gallery/data/model/RawSharingMode.kt
@@ -1,7 +1,7 @@
 package ua.com.radiokot.photoprism.features.gallery.data.model
 
 enum class RawSharingMode {
-    COMPATIBLE_JPEG,
     ORIGINAL,
+    COMPATIBLE_JPEG,
     ;
 }
diff --git a/app/src/main/java/ua/com/radiokot/photoprism/features/prefs/view/PreferencesFragment.kt b/app/src/main/java/ua/com/radiokot/photoprism/features/prefs/view/PreferencesFragment.kt
@@ -50,6 +50,7 @@ import ua.com.radiokot.photoprism.features.ext.key.activation.view.KeyActivation
 import ua.com.radiokot.photoprism.features.ext.prefs.view.GalleryExtensionPreferencesFragment
 import ua.com.radiokot.photoprism.features.ext.store.view.GalleryExtensionStoreActivity
 import ua.com.radiokot.photoprism.features.gallery.ImportSearchBookmarksUseCaseParams
+import ua.com.radiokot.photoprism.features.gallery.data.model.RawDownloadMode
 import ua.com.radiokot.photoprism.features.gallery.view.model.GalleryItemScale
 import ua.com.radiokot.photoprism.features.gallery.data.model.RawSharingMode
 import ua.com.radiokot.photoprism.features.gallery.data.storage.DownloadPreferences
@@ -268,6 +269,17 @@ class PreferencesFragment :
             }
         }
 
+        with(requirePreference(R.string.pk_download_raw_mode)) {
+            this as ListPreference
+            entries = resources.getStringArray(R.array.raw_download_mode_array)
+            entryValues = RawDownloadMode.values().map(RawDownloadMode::name).toTypedArray()
+            value = downloadPreferences.rawDownloadMode.value!!.name
+            setOnPreferenceChangeListener { _, newValue ->
+                downloadPreferences.rawDownloadMode.onNext(RawDownloadMode.valueOf(newValue as String))
+                true
+            }
+        }
+
         with(requirePreference(R.string.pk_import_bookmarks)) {
             setOnPreferenceClickListener {
                 importBookmarks()
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
@@ -265,11 +265,18 @@
     <string name="calendar">Kalendář</string>
     <string name="failed_to_load_calendar">Nepodařilo se načíst kalendář</string>
     <string name="nothing_found">Nic nenalezeno</string>
+    <string name="raw_original">Původní</string>
+    <string name="raw_compatible_jpeg_if_present">Kompatibilní JPEG, pokud je přítomen</string>
     <string name="raw_sharing_preference">Sdílet RAW jako</string>
     <string-array name="raw_sharing_mode_array">
         <!-- Must be aligned with RawSharingMode enum -->
-        <item>Kompatibilní JPEG, pokud je přítomen</item>
-        <item>Původní</item>
+        <item>@string/raw_original</item>
+        <item>@string/raw_compatible_jpeg_if_present</item>
+    </string-array>
+    <string-array name="raw_download_mode_array">
+        <!-- Must be aligned with RawDownloadMode enum -->
+        <item>@string/raw_original</item>
+        <item>@string/raw_compatible_jpeg_if_present</item>
     </string-array>
     <string name="remove_from_album">Odstranit z alba</string>
     <string name="download_preferences">Stažené soubory</string>
@@ -287,5 +294,6 @@
     <string name="extension_memories_people_to_forget_preference">@string/people</string>
     <string name="extension_memories_people_to_forget_preference_summary">Koho zobrazovat ve vzpomínkách a koho ne</string>
     <string name="extension_catalog">Katalog rozšíření</string>
+    <string name="raw_download_preference">Stahovat RAW jako</string>
 
 </resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -263,10 +263,17 @@
     <string name="failed_to_load_calendar">Kalender konnte nicht geladen werden</string>
     <string name="nothing_found">Nichts gefunden</string>
     <string name="raw_sharing_preference">RAW teilen als</string>
+    <string name="raw_original">Original</string>
+    <string name="raw_compatible_jpeg_if_present">Kompatibles JPEG, wenn vorhanden</string>
     <string-array name="raw_sharing_mode_array">
         <!-- Must be aligned with RawSharingMode enum -->
-        <item>Kompatibles JPEG, wenn vorhanden</item>
-        <item>Original</item>
+        <item>@string/raw_original</item>
+        <item>@string/raw_compatible_jpeg_if_present</item>
+    </string-array>
+    <string-array name="raw_download_mode_array">
+        <!-- Must be aligned with RawDownloadMode enum -->
+        <item>@string/raw_original</item>
+        <item>@string/raw_compatible_jpeg_if_present</item>
     </string-array>
     <string name="remove_from_album">Aus dem Album entfernen</string>
     <string name="download_preferences">Downloads</string>
@@ -284,5 +291,6 @@
     <string name="extension_memories_people_to_forget_preference">@string/people</string>
     <string name="extension_memories_people_to_forget_preference_summary">Wen man in den Erinnerungen anzeigen sollte und wen nicht</string>
     <string name="extension_catalog">Erweiterungskatalog</string>
+    <string name="raw_download_preference">RAW herunterladen als</string>
 
 </resources>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
@@ -265,10 +265,17 @@
     <string name="failed_to_load_calendar">Αποτυχία φόρτωσης ημερολογίου</string>
     <string name="nothing_found">Δεν βρέθηκε τίποτα</string>
     <string name="raw_sharing_preference">Μοιράζεστε RAW ως</string>
+    <string name="raw_original">Πρωτότυπο</string>
+    <string name="raw_compatible_jpeg_if_present">Συμβατό JPEG, εάν υπάρχει</string>
     <string-array name="raw_sharing_mode_array">
         <!-- Must be aligned with RawSharingMode enum -->
-        <item>Συμβατό JPEG, εάν υπάρχει</item>
-        <item>Πρωτότυπο</item>
+        <item>@string/raw_original</item>
+        <item>@string/raw_compatible_jpeg_if_present</item>
+    </string-array>
+    <string-array name="raw_download_mode_array">
+        <!-- Must be aligned with RawDownloadMode enum -->
+        <item>@string/raw_original</item>
+        <item>@string/raw_compatible_jpeg_if_present</item>
     </string-array>
     <string name="remove_from_album">Αφαίρεση από το άλμπουμ</string>
     <string name="download_preferences">Λήψεις</string>
@@ -286,5 +293,6 @@
     <string name="extension_memories_people_to_forget_preference">@string/people</string>
     <string name="extension_memories_people_to_forget_preference_summary">Ποιον να εμφανίζετε στις αναμνήσεις και ποιον – όχι</string>
     <string name="extension_catalog">Κατάλογος επεκτάσεων</string>
+    <string name="raw_download_preference">Λήψη RAW ως</string>
 
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -266,10 +266,17 @@
     <string name="failed_to_load_calendar">Error al cargar el calendario</string>
     <string name="nothing_found">No se encontró nada</string>
     <string name="raw_sharing_preference">Compartir RAW como</string>
+    <string name="raw_original">Original</string>
+    <string name="raw_compatible_jpeg_if_present">JPEG compatible, si está presente</string>
     <string-array name="raw_sharing_mode_array">
         <!-- Must be aligned with RawSharingMode enum -->
-        <item>JPEG compatible, si está presente</item>
-        <item>Original</item>
+        <item>@string/raw_original</item>
+        <item>@string/raw_compatible_jpeg_if_present</item>
+    </string-array>
+    <string-array name="raw_download_mode_array">
+        <!-- Must be aligned with RawDownloadMode enum -->
+        <item>@string/raw_original</item>
+        <item>@string/raw_compatible_jpeg_if_present</item>
     </string-array>
     <string name="remove_from_album">Eliminar del álbum</string>
     <string name="download_preferences">Descargas</string>
@@ -287,5 +294,6 @@
     <string name="extension_memories_people_to_forget_preference">@string/people</string>
     <string name="extension_memories_people_to_forget_preference_summary">A quién mostrar en los recuerdos y a quién – no</string>
     <string name="extension_catalog">Catálogo de extensiones</string>
+    <string name="raw_download_preference">Descargar RAW como</string>
 
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
@@ -266,10 +266,17 @@
     <string name="failed_to_load_calendar">Échec du chargement du calendrier</string>
     <string name="nothing_found">Rien trouvé</string>
     <string name="raw_sharing_preference">Partager RAW en tant que</string>
+    <string name="raw_original">Original</string>
+    <string name="raw_compatible_jpeg_if_present">JPEG compatible, si présent</string>
     <string-array name="raw_sharing_mode_array">
         <!-- Must be aligned with RawSharingMode enum -->
-        <item>JPEG compatible, si présent</item>
-        <item>Original</item>
+        <item>@string/raw_original</item>
+        <item>@string/raw_compatible_jpeg_if_present</item>
+    </string-array>
+    <string-array name="raw_download_mode_array">
+        <!-- Must be aligned with RawDownloadMode enum -->
+        <item>@string/raw_original</item>
+        <item>@string/raw_compatible_jpeg_if_present</item>
     </string-array>
     <string name="remove_from_album">Supprimer de l\'album</string>
     <string name="download_preferences">Téléchargements</string>
@@ -287,5 +294,6 @@
     <string name="extension_memories_people_to_forget_preference">@string/people</string>
     <string name="extension_memories_people_to_forget_preference_summary">Qui afficher dans les souvenirs et qui – non</string>
     <string name="extension_catalog">Catalogue d\'extensions</string>
+    <string name="raw_download_preference">Téléchargement du RAW en tant que</string>
 
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
@@ -265,10 +265,17 @@
     <string name="failed_to_load_calendar">Caricamento del calendario non riuscito</string>
     <string name="nothing_found">Nessun risultato</string>
     <string name="raw_sharing_preference">Condividere RAW come</string>
+    <string name="raw_original">Originale</string>
+    <string name="raw_compatible_jpeg_if_present">JPEG compatibile, se presente</string>
     <string-array name="raw_sharing_mode_array">
         <!-- Must be aligned with RawSharingMode enum -->
-        <item>JPEG compatibile, se presente</item>
-        <item>Originale</item>
+        <item>@string/raw_original</item>
+        <item>@string/raw_compatible_jpeg_if_present</item>
+    </string-array>
+    <string-array name="raw_download_mode_array">
+        <!-- Must be aligned with RawDownloadMode enum -->
+        <item>@string/raw_original</item>
+        <item>@string/raw_compatible_jpeg_if_present</item>
     </string-array>
     <string name="remove_from_album">Rimuovi dall\'album</string>    <string name="download_preferences">Download</string>
     <string name="download_use_separate_folder_preference">Utilizzare una cartella separata</string>
@@ -285,5 +292,6 @@
     <string name="extension_memories_people_to_forget_preference">@string/people</string>
     <string name="extension_memories_people_to_forget_preference_summary">Chi mostrare nei ricordi e chi – no</string>
     <string name="extension_catalog">Catalogo delle estensioni</string>
+    <string name="raw_download_preference">Scaricare RAW come</string>
 
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
@@ -265,10 +265,17 @@
     <string name="failed_to_load_calendar">Не удалось загрузить календарь</string>
     <string name="nothing_found">Ничего не найдено</string>
     <string name="raw_sharing_preference">Отправлять RAW как</string>
+    <string name="raw_original">Оригинал</string>
+    <string name="raw_compatible_jpeg_if_present">Совместимый JPEG, если есть</string>
     <string-array name="raw_sharing_mode_array">
         <!-- Must be aligned with RawSharingMode enum -->
-        <item>Совместимый JPEG, если есть</item>
-        <item>Оригинал</item>
+        <item>@string/raw_original</item>
+        <item>@string/raw_compatible_jpeg_if_present</item>
+    </string-array>
+    <string-array name="raw_download_mode_array">
+        <!-- Must be aligned with RawDownloadMode enum -->
+        <item>@string/raw_original</item>
+        <item>@string/raw_compatible_jpeg_if_present</item>
     </string-array>
     <string name="remove_from_album">Удалить из альбома</string>
     <string name="download_preferences">Загрузки</string>
@@ -286,5 +293,6 @@
     <string name="extension_memories_people_to_forget_preference">@string/people</string>
     <string name="extension_memories_people_to_forget_preference_summary">Кого показывать в воспоминаниях, а кого – нет</string>
     <string name="extension_catalog">Каталог расширений</string>
+    <string name="raw_download_preference">Скачивать RAW как</string>
 
 </resources>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
@@ -265,10 +265,17 @@
     <string name="failed_to_load_calendar">Takvim yüklenemedi</string>
     <string name="nothing_found">Hiçbir şey bulunamadı</string>
     <string name="raw_sharing_preference">RAW olarak paylaşmak</string>
+    <string name="raw_original">Orijinal</string>
+    <string name="raw_compatible_jpeg_if_present">Mevcutsa uyumlu JPEG</string>
     <string-array name="raw_sharing_mode_array">
         <!-- Must be aligned with RawSharingMode enum -->
-        <item>Mevcutsa uyumlu JPEG</item>
-        <item>Orijinal</item>
+        <item>@string/raw_original</item>
+        <item>@string/raw_compatible_jpeg_if_present</item>
+    </string-array>
+    <string-array name="raw_download_mode_array">
+        <!-- Must be aligned with RawDownloadMode enum -->
+        <item>@string/raw_original</item>
+        <item>@string/raw_compatible_jpeg_if_present</item>
     </string-array>
     <string name="remove_from_album">Albümden kaldır</string>
     <string name="download_preferences">İndirilenler</string>
@@ -286,5 +293,6 @@
     <string name="extension_memories_people_to_forget_preference">@string/people</string>
     <string name="extension_memories_people_to_forget_preference_summary">Anıları kim göstermeli ve kim – göstermemeli</string>
     <string name="extension_catalog">Eklentiler kataloğu</string>
+    <string name="raw_download_preference">RAW olarak indirmek</string>
 
 </resources>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
@@ -265,10 +265,17 @@
     <string name="failed_to_load_calendar">Не вдалося завантажити календар</string>
     <string name="nothing_found">Нічого не знайдено</string>
     <string name="raw_sharing_preference">Відправляти RAW як</string>
+    <string name="raw_original">Оригінал</string>
+    <string name="raw_compatible_jpeg_if_present">Сумісний JPEG, якщо є</string>
     <string-array name="raw_sharing_mode_array">
         <!-- Must be aligned with RawSharingMode enum -->
-        <item>Сумісний JPEG, якщо є</item>
-        <item>Оригінал</item>
+        <item>@string/raw_original</item>
+        <item>@string/raw_compatible_jpeg_if_present</item>
+    </string-array>
+    <string-array name="raw_download_mode_array">
+        <!-- Must be aligned with RawDownloadMode enum -->
+        <item>@string/raw_original</item>
+        <item>@string/raw_compatible_jpeg_if_present</item>
     </string-array>
     <string name="remove_from_album">Видалити з альбому</string>
     <string name="download_preferences">Завантаження</string>
@@ -286,5 +293,6 @@
     <string name="extension_memories_people_to_forget_preference">@string/people</string>
     <string name="extension_memories_people_to_forget_preference_summary">Кого показувати у спогадах, а кого – ні</string>
     <string name="extension_catalog">Каталог розширень</string>
+    <string name="raw_download_preference">Завантажувати RAW як</string>
 
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
@@ -265,10 +265,17 @@
     <string name="failed_to_load_calendar">日曆加載失敗</string>
     <string name="nothing_found">找不到任何內容</string>
     <string name="raw_sharing_preference">分享 RAW 作為</string>
+    <string name="raw_original">原始</string>
+    <string name="raw_compatible_jpeg_if_present">兼容 JPEG（如有）</string>
     <string-array name="raw_sharing_mode_array">
         <!-- Must be aligned with RawSharingMode enum -->
-        <item>兼容 JPEG（如有）</item>
-        <item>原始</item>
+        <item>@string/raw_original</item>
+        <item>@string/raw_compatible_jpeg_if_present</item>
+    </string-array>
+    <string-array name="raw_download_mode_array">
+        <!-- Must be aligned with RawDownloadMode enum -->
+        <item>@string/raw_original</item>
+        <item>@string/raw_compatible_jpeg_if_present</item>
     </string-array>
     <string name="remove_from_album">從相簿中移除</string>
     <string name="download_preferences">下載</string>
@@ -286,5 +293,6 @@
     <string name="extension_memories_people_to_forget_preference">@string/people</string>
     <string name="extension_memories_people_to_forget_preference_summary">記憶中該顯示誰，不該顯示誰</string>
     <string name="extension_catalog">擴展目錄</string>
+    <string name="raw_download_preference">下載 RAW 為</string>
 
 </resources>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
@@ -265,10 +265,17 @@
     <string name="failed_to_load_calendar">日历加载失败</string>
     <string name="nothing_found">未找到任何内容</string>
     <string name="raw_sharing_preference">分享 RAW 作为</string>
+    <string name="raw_original">原始</string>
+    <string name="raw_compatible_jpeg_if_present">兼容 JPEG（如有）</string>
     <string-array name="raw_sharing_mode_array">
         <!-- Must be aligned with RawSharingMode enum -->
-        <item>兼容 JPEG（如有）</item>
-        <item>原始</item>
+        <item>@string/raw_original</item>
+        <item>@string/raw_compatible_jpeg_if_present</item>
+    </string-array>
+    <string-array name="raw_download_mode_array">
+        <!-- Must be aligned with RawDownloadMode enum -->
+        <item>@string/raw_original</item>
+        <item>@string/raw_compatible_jpeg_if_present</item>
     </string-array>
     <string name="remove_from_album">从相册中移除</string>
     <string name="download_preferences">下载</string>
@@ -286,5 +293,6 @@
     <string name="extension_memories_people_to_forget_preference">@string/people</string>
     <string name="extension_memories_people_to_forget_preference_summary">记忆中该显示谁，不该显示谁</string>
     <string name="extension_catalog">扩展目录</string>
+    <string name="raw_download_preference">下载 RAW 为</string>
 
 </resources>
diff --git a/app/src/main/res/values/preference_keys.xml b/app/src/main/res/values/preference_keys.xml
@@ -3,6 +3,7 @@
     <string name="pk_library" translatable="false">library</string>
     <string name="pk_download_use_separate_folder" translatable="false">download_use_separate_folder</string>
     <string name="pk_download_separate_folder_name" translatable="false">download_separate_folder_name</string>
+    <string name="pk_download_raw_mode" translatable="false">download_raw_mode</string>
     <string name="pk_report_issue" translatable="false">report_issue</string>
     <string name="pk_app_version" translatable="false">app_version</string>
     <string name="pk_export_bookmarks" translatable="false">export_bookmarks</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package ua.com.radiokot.photoprism.features.gallery.data.model`
`2`	`2`
`3`	`3`	`enum class RawDownloadMode {`
`4`		`- COMPATIBLE_JPEG,`
`5`	`4`	`ORIGINAL,`
	`5`	`+ COMPATIBLE_JPEG,`
`6`	`6`	`;`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package ua.com.radiokot.photoprism.features.gallery.data.model`
`2`	`2`
`3`	`3`	`enum class RawSharingMode {`
`4`		`- COMPATIBLE_JPEG,`
`5`	`4`	`ORIGINAL,`
	`5`	`+ COMPATIBLE_JPEG,`
`6`	`6`	`;`
`7`	`7`	`}`