From 8ed2dd6687d8dd79e73b66de006c85c1dcccdd95 Mon Sep 17 00:00:00 2001
From: vvb2060 <vvb2060@gmail.com>
Date: Wed, 9 Dec 2020 21:03:49 +0800
Subject: [PATCH] Skip query for log files and patched boot file

---
 .../java/com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt   | 4 ++--
 .../main/java/com/topjohnwu/magisk/ui/flash/FlashViewModel.kt | 2 +-
 app/src/main/java/com/topjohnwu/magisk/ui/log/LogViewModel.kt | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt b/app/src/main/java/com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt
index 93ef6e95d..45fde3579 100644
--- a/app/src/main/java/com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt
@@ -254,14 +254,14 @@ abstract class MagiskInstallImpl : KoinComponent {
 
                 val filename = "magisk_patched_$suffix"
                 outStream = if (magic.contentEquals("ustar".toByteArray())) {
-                    outFile = MediaStoreUtils.getFile("$filename.tar")
+                    outFile = MediaStoreUtils.getFile("$filename.tar", true)
                     handleTar(src, outFile!!.uri.outputStream())
                 } else {
                     // Raw image
                     srcBoot = File(installDir, "boot.img").path
                     console.add("- Copying image to cache")
                     FileOutputStream(srcBoot).use { src.copyTo(it) }
-                    outFile = MediaStoreUtils.getFile("$filename.img")
+                    outFile = MediaStoreUtils.getFile("$filename.img", true)
                     outFile!!.uri.outputStream()
                 }
             }
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashViewModel.kt
index 7fbd7c230..92d89997d 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashViewModel.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashViewModel.kt
@@ -107,7 +107,7 @@ class FlashViewModel(
     private fun savePressed() = withExternalRW {
         viewModelScope.launch(Dispatchers.IO) {
             val name = "magisk_install_log_%s.log".format(now.toTime(timeFormatStandard))
-            val file = MediaStoreUtils.getFile(name)
+            val file = MediaStoreUtils.getFile(name, true)
             file.uri.outputStream().bufferedWriter().use { writer ->
                 logItems.forEach {
                     writer.write(it)
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/log/LogViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/ui/log/LogViewModel.kt
index 553a9d196..3124fdf34 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/log/LogViewModel.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/log/LogViewModel.kt
@@ -62,7 +62,7 @@ class LogViewModel(
     fun saveMagiskLog() = withExternalRW {
         viewModelScope.launch(Dispatchers.IO) {
             val filename = "magisk_log_%s.log".format(now.toTime(timeFormatStandard))
-            val logFile = MediaStoreUtils.getFile(filename)
+            val logFile = MediaStoreUtils.getFile(filename, true)
             logFile.uri.outputStream().bufferedWriter().use { file ->
                 file.write("---System Properties---\n\n")