Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
Magisk
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Magisk
Commits
82f303e1
Commit
82f303e1
authored
Sep 08, 2021
by
vvb2060
Committed by
John Wu
Sep 17, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow save app log when not activated
may be useful for patch boot.
parent
c038683b
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
3 deletions
+7
-3
LogRepository.kt
...ava/com/topjohnwu/magisk/data/repository/LogRepository.kt
+6
-1
MainActivity.kt
app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt
+0
-1
LogViewModel.kt
...src/main/java/com/topjohnwu/magisk/ui/log/LogViewModel.kt
+1
-1
No files found.
app/src/main/java/com/topjohnwu/magisk/data/repository/LogRepository.kt
View file @
82f303e1
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(
...
@@ -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
()
}
}
...
...
app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt
View file @
82f303e1
...
@@ -99,7 +99,6 @@ open class MainActivity : BaseUIActivity<MainViewModel, ActivityMainMd2Binding>(
...
@@ -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
}
}
}
}
...
...
app/src/main/java/com/topjohnwu/magisk/ui/log/LogViewModel.kt
View file @
82f303e1
...
@@ -66,7 +66,7 @@ class LogViewModel(
...
@@ -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"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment