From d089698475bc4875174a7320029aaa7e60191494 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Sat, 19 Dec 2020 23:09:13 -0800
Subject: [PATCH] Don't use root for logging getprop

Might contain sensitive info that shouldn't be shared
---
 .../java/com/topjohnwu/magisk/ui/log/LogViewModel.kt | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

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 3124fdf34..8639d2cbe 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
@@ -18,12 +18,9 @@ import com.topjohnwu.magisk.ktx.timeFormatStandard
 import com.topjohnwu.magisk.ktx.toTime
 import com.topjohnwu.magisk.utils.set
 import com.topjohnwu.magisk.view.TextItem
-import com.topjohnwu.superuser.CallbackList
-import com.topjohnwu.superuser.Shell
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import java.util.concurrent.Executor
 
 class LogViewModel(
     private val repo: LogRepository
@@ -66,13 +63,8 @@ class LogViewModel(
             logFile.uri.outputStream().bufferedWriter().use { file ->
                 file.write("---System Properties---\n\n")
 
-                val fileList = object : CallbackList<String>(Executor { it.run() }) {
-                    override fun onAddElement(e: String) {
-                        file.write(e)
-                        file.newLine()
-                    }
-                }
-                Shell.su("getprop").to(fileList).exec()
+                ProcessBuilder("getprop").start()
+                    .inputStream.reader().use { it.copyTo(file) }
 
                 file.write("\n---Magisk Logs---\n")
                 file.write("${Info.env.magiskVersionString} (${Info.env.magiskVersionCode})\n\n")