From 385f097beb2b71de627a9dab860f4cd4d768a121 Mon Sep 17 00:00:00 2001 From: Jarne Demeulemeester Date: Thu, 8 Sep 2022 13:29:26 +0200 Subject: [PATCH] Fix crash when setting empty image cache size or seek increments --- app/src/main/java/dev/jdtech/jellyfin/di/GlideModule.kt | 2 +- app/src/main/java/dev/jdtech/jellyfin/utils/AppPreferences.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 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 c63712e7..fc7a61ba 100644 --- a/app/src/main/java/dev/jdtech/jellyfin/di/GlideModule.kt +++ b/app/src/main/java/dev/jdtech/jellyfin/di/GlideModule.kt @@ -21,7 +21,7 @@ class GlideModule : AppGlideModule() { val use = preferences.getBoolean(Constants.PREF_IMAGE_CACHE, true) if (use) { - val sizeMb = preferences.getString(Constants.PREF_IMAGE_CACHE_SIZE, "${Constants.DEFAULT_CACHE_SIZE}")?.toInt()!! + val sizeMb = preferences.getString(Constants.PREF_IMAGE_CACHE_SIZE, Constants.DEFAULT_CACHE_SIZE.toString())!!.toIntOrNull() ?: Constants.DEFAULT_CACHE_SIZE 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/AppPreferences.kt b/app/src/main/java/dev/jdtech/jellyfin/utils/AppPreferences.kt index 8806bd6b..c328d29f 100644 --- a/app/src/main/java/dev/jdtech/jellyfin/utils/AppPreferences.kt +++ b/app/src/main/java/dev/jdtech/jellyfin/utils/AppPreferences.kt @@ -37,10 +37,10 @@ constructor( val playerSeekBackIncrement = sharedPreferences.getString( Constants.PREF_PLAYER_SEEK_BACK_INC, DEFAULT_SEEK_BACK_INCREMENT_MS.toString() - )!!.toLong() + )!!.toLongOrNull() ?: DEFAULT_SEEK_BACK_INCREMENT_MS val playerSeekForwardIncrement = sharedPreferences.getString( Constants.PREF_PLAYER_SEEK_FORWARD_INC, DEFAULT_SEEK_FORWARD_INCREMENT_MS.toString() - )!!.toLong() + )!!.toLongOrNull() ?: DEFAULT_SEEK_FORWARD_INCREMENT_MS val mpvDisableHwDec = sharedPreferences.getBoolean("mpv_disable_hwdec", false) }