Close streams after use (#444)

BspbOrg · Jul 15, 2024 · e90f0b9 · e90f0b9
1 parent fd7a016
commit e90f0b9
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/app/src/main/kotlin/org/bspb/smartbirds/pro/service/ExportService.kt b/app/src/main/kotlin/org/bspb/smartbirds/pro/service/ExportService.kt
@@ -112,7 +112,7 @@ class ExportService : IntentService("Export Service") {
                     continue
                 }
                 val outWriter = BufferedWriter(FileWriter(entriesFile))
-                outWriter.apply {
+                outWriter.use { writer ->
                     var firstLine = true
                     val entries: MutableList<MonitoringEntry> = ArrayList()
                     for (formEntry in formEntries) {
@@ -134,16 +134,16 @@ class ExportService : IntentService("Export Service") {
                         entry.data.keys.retainAll(normalizedKeys)
                         val lines = convertToCsvLines(entry.data)
                         if (firstLine) {
-                            write(commonLines[0])
-                            write(CSVStrategy.DEFAULT.delimiter.code)
-                            write(lines[0])
-                            newLine()
+                            writer.write(commonLines[0])
+                            writer.write(CSVStrategy.DEFAULT.delimiter.code)
+                            writer.write(lines[0])
+                            writer.newLine()
                             firstLine = false
                         }
-                        write(commonLines[1])
-                        write(CSVStrategy.DEFAULT.delimiter.code)
-                        write(lines[1])
-                        newLine()
+                        writer.write(commonLines[1])
+                        writer.write(CSVStrategy.DEFAULT.delimiter.code)
+                        writer.write(lines[1])
+                        writer.newLine()
                     }
                 }
             }
@@ -156,12 +156,12 @@ class ExportService : IntentService("Export Service") {
     private fun convertToCsvLines(data: HashMap<String, String>): Array<String> {
         val prepared = CsvPreparer.prepareCsvLine(data)
         val memory = StringWriter()
-        memory.apply {
-            val csvWriter = CSVWriterBuilder<Array<String>>(this).strategy(CSVStrategy.DEFAULT)
+        memory.use {
+            val csvWriter = CSVWriterBuilder<Array<String>>(it).strategy(CSVStrategy.DEFAULT)
                 .entryConverter(SmartBirdsCSVEntryConverter()).build()
             csvWriter.write(prepared.keys)
             csvWriter.write(prepared.values)
-            flush()
+            it.flush()
         }
         val commonData = memory.buffer.toString()
         return commonData.split(System.lineSeparator()).toTypedArray()

diff --git a/app/src/main/kotlin/org/bspb/smartbirds/pro/utils/KmlUtils.kt b/app/src/main/kotlin/org/bspb/smartbirds/pro/utils/KmlUtils.kt
@@ -33,7 +33,7 @@ object KmlUtils {
             val cursor: Cursor? =
                 context.contentResolver
                     .query(uri, arrayOf(OpenableColumns.DISPLAY_NAME), null, null, null)
-            cursor.let {
+            cursor.use {
                 if (it != null && it.moveToFirst()) {
                     result = it.getString(0)
                 }

diff --git a/app/src/main/kotlin/org/bspb/smartbirds/pro/utils/MonitoringUtils.kt b/app/src/main/kotlin/org/bspb/smartbirds/pro/utils/MonitoringUtils.kt
@@ -43,7 +43,9 @@ class MonitoringUtils {
             val file = File(createMonitoringDir(context, monitoring), "track.gpx")
             try {
                 val osw: Writer = BufferedWriter(FileWriter(file, true))
-                GpxWriter(osw).writeFooter()
+                osw.use {
+                    GpxWriter(it).writeFooter()
+                }
             } catch (e: IOException) {
                 Reporting.logException(e)
                 Toast.makeText(context, "Could not write to track.gpx!", Toast.LENGTH_SHORT).show()
@@ -55,7 +57,7 @@ class MonitoringUtils {
             val file = File(createMonitoringDir(context, monitoring), "track.gpx")
             try {
                 val osw = OutputStreamWriter(BufferedOutputStream(FileOutputStream(file, false)))
-                osw.let {
+                osw.use {
                     val writer = GpxWriter(it)
                     writer.writeHeader()
                 }