Tweak download location preference handling

jellyfin · Apr 23, 2024 · a78cd97 · a78cd97
1 parent 7644358
commit a78cd97
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/app/src/main/java/org/jellyfin/mobile/app/AppPreferences.kt b/app/src/main/java/org/jellyfin/mobile/app/AppPreferences.kt
@@ -66,17 +66,21 @@ class AppPreferences(context: Context) {
 
     var downloadLocation: String
         get() {
-            @Suppress("DEPRECATION")
-            val defaultStorage = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).absolutePath
             val savedStorage = sharedPreferences.getString(Constants.PREF_DOWNLOAD_LOCATION, null)
-            return if (savedStorage != null && File(savedStorage).parentFile?.isDirectory == true) {
-                // Saved location is still valid
-                savedStorage
-            } else {
-                // Reset download option if corrupt
-                sharedPreferences.edit { putString(Constants.PREF_DOWNLOAD_LOCATION, null) }
-                defaultStorage
+            if (savedStorage != null) {
+                if (File(savedStorage).parentFile?.isDirectory == true) {
+                    // Saved location is still valid
+                    return savedStorage
+                } else {
+                    // Reset download option if corrupt
+                    sharedPreferences.edit {
+                        remove(Constants.PREF_DOWNLOAD_LOCATION)
+                    }
+                }
             }
+
+            // Return default storage location
+            return Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).absolutePath
         }
         set(value) {
             sharedPreferences.edit {

diff --git a/app/src/main/java/org/jellyfin/mobile/settings/SettingsFragment.kt b/app/src/main/java/org/jellyfin/mobile/settings/SettingsFragment.kt
@@ -2,6 +2,7 @@ package org.jellyfin.mobile.settings
 
 import android.content.Intent
 import android.os.Bundle
+import android.os.Environment
 import android.provider.Settings
 import android.view.LayoutInflater
 import android.view.View
@@ -220,7 +221,9 @@ class SettingsFragment : Fragment(), BackPressInterceptor {
         }
         singleChoice(Constants.PREF_DOWNLOAD_LOCATION, downloadsDirs) {
             titleRes = R.string.pref_download_location
-            initialSelection = appPreferences.downloadLocation
+            initialSelection = Environment
+                .getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)
+                .absolutePath
         }
     }