From cce2513c7e0a2a4ad2580986b92f507954729ba7 Mon Sep 17 00:00:00 2001
From: Jarne Demeulemeester <jarnedemeulemeester@gmail.com>
Date: Tue, 29 Mar 2022 13:01:47 +0200
Subject: [PATCH] Enable image caching by default and set size to 20MB

---
 app/src/main/java/dev/jdtech/jellyfin/di/GlideModule.kt  | 8 +++-----
 app/src/main/java/dev/jdtech/jellyfin/utils/Constants.kt | 5 +++++
 app/src/main/res/xml/fragment_settings_cache.xml         | 9 +++++----
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/dev/jdtech/jellyfin/di/GlideModule.kt b/app/src/main/java/dev/jdtech/jellyfin/di/GlideModule.kt
index 05dc9ad0..c63712e7 100644
--- a/app/src/main/java/dev/jdtech/jellyfin/di/GlideModule.kt
+++ b/app/src/main/java/dev/jdtech/jellyfin/di/GlideModule.kt
@@ -9,21 +9,19 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy.RESOURCE
 import com.bumptech.glide.load.engine.cache.InternalCacheDiskCacheFactory
 import com.bumptech.glide.module.AppGlideModule
 import com.bumptech.glide.request.RequestOptions
+import dev.jdtech.jellyfin.utils.Constants
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.launch
 import timber.log.Timber
 
-private const val cacheDefaultSize = 250
-
 @GlideModule
 class GlideModule : AppGlideModule() {
-
     override fun applyOptions(context: Context, builder: GlideBuilder) {
         val preferences = PreferenceManager.getDefaultSharedPreferences(context)
-        val use = preferences.getBoolean("use_image_cache", false)
+        val use = preferences.getBoolean(Constants.PREF_IMAGE_CACHE, true)
 
         if (use) {
-            val sizeMb = preferences.getString("image_cache_size", "$cacheDefaultSize")?.toInt()!!
+            val sizeMb = preferences.getString(Constants.PREF_IMAGE_CACHE_SIZE, "${Constants.DEFAULT_CACHE_SIZE}")?.toInt()!!
             val sizeB = 1024L * 1024 * sizeMb
             Timber.d("Setting image cache to use $sizeMb MB of disk space")
 
diff --git a/app/src/main/java/dev/jdtech/jellyfin/utils/Constants.kt b/app/src/main/java/dev/jdtech/jellyfin/utils/Constants.kt
index 2f51b3b5..3ecb4a7b 100644
--- a/app/src/main/java/dev/jdtech/jellyfin/utils/Constants.kt
+++ b/app/src/main/java/dev/jdtech/jellyfin/utils/Constants.kt
@@ -11,4 +11,9 @@ object Constants {
     const val PREF_PLAYER_GESTURES = "pref_player_gestures"
     const val PREF_PLAYER_BRIGHTNESS_REMEMBER = "pref_player_brightness_remember"
     const val PREF_PLAYER_BRIGHTNESS = "pref_player_brightness"
+    const val PREF_IMAGE_CACHE = "pref_image_cache"
+    const val PREF_IMAGE_CACHE_SIZE = "pref_image_cache_size"
+
+    // caching
+    const val DEFAULT_CACHE_SIZE = 20
 }
\ No newline at end of file
diff --git a/app/src/main/res/xml/fragment_settings_cache.xml b/app/src/main/res/xml/fragment_settings_cache.xml
index 104cac8c..d54321fc 100644
--- a/app/src/main/res/xml/fragment_settings_cache.xml
+++ b/app/src/main/res/xml/fragment_settings_cache.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
     <SwitchPreference
-        app:key="use_image_cache"
+        app:defaultValue="true"
+        app:key="pref_image_cache"
         app:summary="@string/settings_use_cache_summary"
         app:title="@string/settings_use_cache_title" />
     <EditTextPreference
-        app:defaultValue="250"
-        app:dependency="use_image_cache"
+        app:defaultValue="20"
+        app:dependency="pref_image_cache"
         app:dialogMessage="@string/settings_cache_size_message"
-        app:key="image_cache_size"
+        app:key="pref_image_cache_size"
         app:title="@string/settings_cache_size"
         app:useSimpleSummaryProvider="true" />
 </PreferenceScreen>
\ No newline at end of file