From 8d43717a5ed3484ff484d34f36e8f533a8ddd7ab Mon Sep 17 00:00:00 2001 From: Nite Date: Fri, 13 Jan 2023 20:48:11 +0000 Subject: [PATCH] Fixed SAF file creation to ignore mime type --- .../kotlin/org/moire/ultrasonic/service/DownloadService.kt | 2 +- .../src/main/kotlin/org/moire/ultrasonic/util/StorageFile.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/DownloadService.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/DownloadService.kt index 725be386..955ae423 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/DownloadService.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/DownloadService.kt @@ -328,7 +328,7 @@ class DownloadService : Service(), KoinComponent { } filteredTracks = filteredTracks.filter { - !downloadQueue.contains(it.id) && !activeDownloads.contains(it.id) + !downloadQueue.any { i -> i.id == it.id } && !activeDownloads.containsKey(it.id) } // The remainder tracks should be added to the download queue diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/StorageFile.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/StorageFile.kt index 9641f98f..09b12f3c 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/StorageFile.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/StorageFile.kt @@ -265,8 +265,8 @@ class StorageFile( val createdUri = DocumentsContract.createDocument( UApp.applicationContext().contentResolver, parent.uri, - mimeTypeMap.getMimeTypeFromExtension(name.extension())!!, - name.withoutExtension() + "*/*", + name ) ?: throw IOException("Can't create file") return StorageFile(parent, createdUri, name, false)