From 5a2b04740b0123e42670defb85535a5843630b7e Mon Sep 17 00:00:00 2001
From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Fri, 16 Sep 2022 14:48:23 +0200
Subject: [PATCH] move streams to utilize "use"

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
---
 .../talk/controllers/ChatController.kt          | 17 +++++++----------
 .../talk/upload/normal/FileUploader.kt          |  9 +++++----
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
index 1626462de..66c337aaa 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
@@ -1543,19 +1543,16 @@ class ChatController(args: Bundle) :
         val uri = Uri.withAppendedPath(ContactsContract.Contacts.CONTENT_VCARD_URI, lookupKey)
 
         val fd: AssetFileDescriptor = activity?.contentResolver!!.openAssetFileDescriptor(uri, "r")!!
-        val fis = fd.createInputStream()
+        fd.use {
+            val fis = fd.createInputStream()
 
-        file.createNewFile()
-        fis.use { input ->
-            file.outputStream().use { output ->
-                input.copyTo(output)
+            file.createNewFile()
+            fis.use { input ->
+                file.outputStream().use { output ->
+                    input.copyTo(output)
+                }
             }
         }
-        try {
-            fd.close()
-        } catch (e: IOException) {
-            Log.w(TAG, "Failed to close AssetFileDescriptor", e)
-        }
     }
 
     override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
diff --git a/app/src/main/java/com/nextcloud/talk/upload/normal/FileUploader.kt b/app/src/main/java/com/nextcloud/talk/upload/normal/FileUploader.kt
index 435da2bd1..514aae0da 100644
--- a/app/src/main/java/com/nextcloud/talk/upload/normal/FileUploader.kt
+++ b/app/src/main/java/com/nextcloud/talk/upload/normal/FileUploader.kt
@@ -54,11 +54,12 @@ class FileUploader(
         var requestBody: RequestBody? = null
         try {
             val input: InputStream = context.contentResolver.openInputStream(sourceFileUri)!!
-            val buf = ByteArray(input.available())
-            while (input.read(buf) != -1) {
-                requestBody = RequestBody.create("application/octet-stream".toMediaTypeOrNull(), buf)
+            input.use {
+                val buf = ByteArray(input.available())
+                while (it.read(buf) != -1) {
+                    requestBody = RequestBody.create("application/octet-stream".toMediaTypeOrNull(), buf)
+                }
             }
-            input.close()
         } catch (e: Exception) {
             Log.e(TAG, "failed to create RequestBody for $sourceFileUri", e)
         }