From 34e232a43a12e9c9b32e13635a03162aaf268189 Mon Sep 17 00:00:00 2001 From: Nite Date: Mon, 20 Dec 2021 19:39:44 +0100 Subject: [PATCH] Fixed default for cache directory selector --- .../kotlin/org/moire/ultrasonic/fragment/SettingsFragment.kt | 3 +-- .../src/main/kotlin/org/moire/ultrasonic/service/Downloader.kt | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/SettingsFragment.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/SettingsFragment.kt index ed65a05e..6cbc219a 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/SettingsFragment.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/SettingsFragment.kt @@ -38,7 +38,6 @@ import org.moire.ultrasonic.service.MediaPlayerController import org.moire.ultrasonic.service.RxBus import org.moire.ultrasonic.util.Constants import org.moire.ultrasonic.util.ErrorDialog -import org.moire.ultrasonic.util.FileUtil.defaultMusicDirectory import org.moire.ultrasonic.util.FileUtil.ultrasonicDirectory import org.moire.ultrasonic.util.InfoDialog import org.moire.ultrasonic.util.MediaSessionHandler @@ -287,7 +286,7 @@ class SettingsFragment : val intent = Intent(Intent.ACTION_OPEN_DOCUMENT_TREE) if (Settings.cacheLocationUri != "" && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - intent.putExtra(DocumentsContract.EXTRA_INITIAL_URI, defaultMusicDirectory.path) + intent.putExtra(DocumentsContract.EXTRA_INITIAL_URI, Settings.cacheLocationUri) } intent.addFlags(RW_FLAG) diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/Downloader.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/Downloader.kt index 7aa00bbb..601e5817 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/Downloader.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/Downloader.kt @@ -44,7 +44,7 @@ class Downloader( private val jukeboxMediaPlayer: JukeboxMediaPlayer by inject() - // TODO is this cache necessary? + // This cache helps us to avoid creating duplicate DownloadFile instances when showing Entries private val downloadFileCache = LRUCache(100) private var executorService: ScheduledExecutorService? = null