v055o

app/src/full/java/com/celzero/bravedns/scheduler/BugReportZipper.kt

@@ -228,8 +228,15 @@ object BugReportZipper {
     }
 
     private fun copy(input: InputStream, output: OutputStream) {
-        while (input.read() != -1) {
-            output.write(input.readBytes())
+        try {
+            val buffer = ByteArray(DEFAULT_BUFFER_SIZE)
+            var bytesRead: Int
+            while (input.read(buffer).also { bytesRead = it } != -1) {
+                output.write(buffer, 0, bytesRead)
+            }
+            output.close()
+        } catch (e: Exception) {
+            Logger.w(LOG_TAG_BUG_REPORT, "Exception while copying the file", e)
         }
     }
 }

app/src/full/java/com/celzero/bravedns/scheduler/LogExportWorker.kt

@@ -46,7 +46,7 @@ class LogExportWorker(context: Context, workerParams: WorkerParameters) :
             }
 
             ZipOutputStream(BufferedOutputStream(FileOutputStream(filePath))).use { zos ->
-                val zipEntry = ZipEntry("log.txt")
+                val zipEntry = ZipEntry("log_${System.currentTimeMillis()}.txt")
                 zos.putNextEntry(zipEntry)
                 if (cursor.moveToFirst()) {
                     do {
@@ -60,7 +60,6 @@ class LogExportWorker(context: Context, workerParams: WorkerParameters) :
                 }
                 zos.closeEntry()
             }
-            cursor.close()
 
             Logger.i(LOG_TAG_BUG_REPORT, "Logs exported to ${file.absolutePath}")
             return true