From 13be4720ba80e4aa9a17ae0dd4724b6134648165 Mon Sep 17 00:00:00 2001
From: bemusementpark <bemusementpark>
Date: Sun, 6 Oct 2024 13:26:03 +1030
Subject: [PATCH] Close streams on failure

---
 .../thoughtcrime/securesms/util/IP2Country.kt    | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/IP2Country.kt b/app/src/main/java/org/thoughtcrime/securesms/util/IP2Country.kt
index ca2ae5aa18..d3fedd86d7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/IP2Country.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/IP2Country.kt
@@ -97,14 +97,16 @@ class IP2Country private constructor(private val context: Context) {
         if (directory.list()?.contains(fileName) == true) { return file }
         val inputStream = context.assets.open("csv/$fileName")
         val outputStream = FileOutputStream(file)
-        val buffer = ByteArray(1024)
-        while (true) {
-            val count = inputStream.read(buffer)
-            if (count < 0) { break }
-            outputStream.write(buffer, 0, count)
+        inputStream.use {
+            outputStream.use {
+                val buffer = ByteArray(1024)
+                while (true) {
+                    val count = inputStream.read(buffer)
+                    if (count < 0) { break }
+                    outputStream.write(buffer, 0, count)
+                }
+            }
         }
-        inputStream.close()
-        outputStream.close()
         return file
     }