TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-01-12 11:53:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow save app log when not activated

Browse Source 
may be useful for patch boot.
This commit is contained in:
vvb2060 2021-09-08 12:05:49 +08:00 committed by John Wu
parent c038683b54
commit 82f303e1c6
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/com/topjohnwu/magisk/data/repository/LogRepository.kt
View File

@ -1,6 +1,7 @@
package com.topjohnwu.magisk.data.repository package com.topjohnwu.magisk.data.repository
import com.topjohnwu.magisk.core.Const import com.topjohnwu.magisk.core.Const
import com.topjohnwu.magisk.core.Info
import com.topjohnwu.magisk.core.model.su.SuLog import com.topjohnwu.magisk.core.model.su.SuLog
import com.topjohnwu.magisk.data.database.SuLogDao import com.topjohnwu.magisk.data.database.SuLogDao
import com.topjohnwu.magisk.ktx.await import com.topjohnwu.magisk.ktx.await
@ -27,7 +28,11 @@ class LogRepository(
} }
} }
} }
Shell.su("cat ${Const.MAGISK_LOG}").to(list).await() if (Info.env.isActive) {
Shell.su("cat ${Const.MAGISK_LOG} || logcat -d -s Magisk").to(list).await()
} else {
Shell.sh("logcat -d").to(list).await()
}
return list.buf.toString() return list.buf.toString()
} }

1
app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt
View File

@ -99,7 +99,6 @@ open class MainActivity : BaseUIActivity<MainViewModel, ActivityMainMd2Binding>(
super.onResume() super.onResume()
binding.mainNavigation.menu.apply { binding.mainNavigation.menu.apply {
findItem(R.id.superuserFragment)?.isEnabled = Utils.showSuperUser() findItem(R.id.superuserFragment)?.isEnabled = Utils.showSuperUser()
findItem(R.id.logFragment)?.isEnabled = Info.env.isActive
} }
} }

2
app/src/main/java/com/topjohnwu/magisk/ui/log/LogViewModel.kt
View File

@ -66,7 +66,7 @@ class LogViewModel(
ProcessBuilder("getprop").start() ProcessBuilder("getprop").start()
.inputStream.reader().use { it.copyTo(file) } .inputStream.reader().use { it.copyTo(file) }
file.write("---System MountInfo---\n\n") file.write("\n\n---System MountInfo---\n\n")
FileInputStream("/proc/self/mountinfo").reader().use { it.copyTo(file) } FileInputStream("/proc/self/mountinfo").reader().use { it.copyTo(file) }
file.write("\n---Magisk Logs---\n") file.write("\n---Magisk Logs---\n")