Skip to content
Snippets Groups Projects
Unverified Commit c3771ba1 authored by Tobias Preuss's avatar Tobias Preuss Committed by GitHub
Browse files

Use File extension functions to make code more concise. (#1042)

parent 7ab8fb85
No related branches found
No related tags found
No related merge requests found
...@@ -12,10 +12,7 @@ import kotlinx.coroutines.async ...@@ -12,10 +12,7 @@ import kotlinx.coroutines.async
import kotlinx.coroutines.awaitAll import kotlinx.coroutines.awaitAll
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import timber.log.Timber import timber.log.Timber
import java.io.BufferedWriter
import java.io.File import java.io.File
import java.io.FileOutputStream
import java.io.OutputStreamWriter
import java.nio.charset.Charset import java.nio.charset.Charset
import java.util.Date import java.util.Date
import java.util.UUID import java.util.UUID
...@@ -126,7 +123,7 @@ object KeyFileHelper { ...@@ -126,7 +123,7 @@ object KeyFileHelper {
private fun TEKSignatureList.writeToFile( private fun TEKSignatureList.writeToFile(
file: File file: File
) = FileOutputStream(file).use { stream -> ) = file.outputStream().use { stream ->
this.writeTo(stream) this.writeTo(stream)
} }
...@@ -144,9 +141,9 @@ object KeyFileHelper { ...@@ -144,9 +141,9 @@ object KeyFileHelper {
private fun getExportBinaryFileName(): String = "key-export-binary-${UUID.randomUUID()}.bin" private fun getExportBinaryFileName(): String = "key-export-binary-${UUID.randomUUID()}.bin"
private fun File.appendBinaryHeader() = FileOutputStream(this).use { fos -> private fun File.appendBinaryHeader() = outputStream().use { fos ->
OutputStreamWriter(fos, Charset.forName(EXPORT_FILE_HEADER_CHARSET)).use { osw -> fos.writer(Charset.forName(EXPORT_FILE_HEADER_CHARSET)).use { osw ->
BufferedWriter(osw).use { bw -> osw.buffered().use { bw ->
bw.write(EXPORT_FILE_HEADER) bw.write(EXPORT_FILE_HEADER)
} }
} }
......
...@@ -22,7 +22,6 @@ package de.rki.coronawarnapp.util ...@@ -22,7 +22,6 @@ package de.rki.coronawarnapp.util
import timber.log.Timber import timber.log.Timber
import java.io.File import java.io.File
import java.io.FileInputStream import java.io.FileInputStream
import java.io.FileOutputStream
import java.io.InputStream import java.io.InputStream
import java.util.zip.ZipEntry import java.util.zip.ZipEntry
import java.util.zip.ZipInputStream import java.util.zip.ZipInputStream
...@@ -44,7 +43,7 @@ object ZipHelper { ...@@ -44,7 +43,7 @@ object ZipHelper {
} }
outputFile.createNewFile() outputFile.createNewFile()
FileOutputStream(outputFile).use { fileOutputStream -> outputFile.outputStream().use { fileOutputStream ->
ZipOutputStream(fileOutputStream).use { zipOutputStream -> ZipOutputStream(fileOutputStream).use { zipOutputStream ->
writeToZip( writeToZip(
nameOfOutputFile, nameOfOutputFile,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment