From 75051662839a147c277a5bdcb198f4eef85a921e Mon Sep 17 00:00:00 2001 From: tzugen Date: Tue, 4 Oct 2022 11:20:59 +0200 Subject: [PATCH 1/2] Revert a buggy change from 2b7a3b0488d203b417aee08a44415c046b89c594. --- .../main/kotlin/org/moire/ultrasonic/util/StorageFile.kt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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 d97a538c..714c6df9 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/StorageFile.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/StorageFile.kt @@ -1,6 +1,6 @@ /* * StorageFile.kt - * Copyright (C) 2009-2022 Ultrasonic developers + * Copyright (C) 2009-2021 Ultrasonic developers * * Distributed under terms of the GNU GPLv3 license. */ @@ -91,10 +91,8 @@ class StorageFile( uri, mode ) - val stream = descriptor?.createOutputStream() + return descriptor?.createOutputStream() ?: throw IOException("Couldn't retrieve OutputStream") - descriptor.close() - return stream } override fun getFileInputStream(): InputStream { From ec49fae666efb519e5ca4383a57a358a3045639e Mon Sep 17 00:00:00 2001 From: tzugen Date: Tue, 4 Oct 2022 11:21:25 +0200 Subject: [PATCH 2/2] Fix it properly --- .../main/kotlin/org/moire/ultrasonic/util/StorageFile.kt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) 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 714c6df9..aa598d7e 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/StorageFile.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/StorageFile.kt @@ -1,6 +1,6 @@ /* * StorageFile.kt - * Copyright (C) 2009-2021 Ultrasonic developers + * Copyright (C) 2009-2022 Ultrasonic developers * * Distributed under terms of the GNU GPLv3 license. */ @@ -87,12 +87,10 @@ class StorageFile( override fun getFileOutputStream(append: Boolean): OutputStream { val mode = if (append) "wa" else "w" - val descriptor = UApp.applicationContext().contentResolver.openAssetFileDescriptor( + return UApp.applicationContext().contentResolver.openOutputStream( uri, mode - ) - return descriptor?.createOutputStream() - ?: throw IOException("Couldn't retrieve OutputStream") + ) ?: throw IOException("Couldn't retrieve OutputStream") } override fun getFileInputStream(): InputStream {