TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-12-30 07:27:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update device state detection

Browse Source
This commit is contained in:
topjohnwu
2020-09-23 04:40:44 -07:00
parent b59e05c63e
commit ca9f9fee9a
5 changed files with 70 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/topjohnwu/magisk/core/Info.kt
View File

@@ -29,9 +29,10 @@ object Info {
// Device state
@JvmStatic var isSAR = false
@JvmStatic var isAB = false
@JvmStatic var isFBE = false
@JvmStatic val isFBE get() = crypto == "file"
@JvmStatic var ramdisk = false
@JvmStatic var hasGMS = true
@JvmStatic var crypto = ""
val isConnected by lazy {
ObservableBoolean(false).also { field ->

9
app/src/main/java/com/topjohnwu/magisk/core/utils/RootInit.kt
View File

@@ -10,7 +10,6 @@ import com.topjohnwu.magisk.core.wrap
import com.topjohnwu.magisk.ktx.rawResource
import com.topjohnwu.superuser.Shell
import com.topjohnwu.superuser.ShellUtils
import com.topjohnwu.superuser.io.SuFile
class RootInit : Shell.Initializer() {
@@ -20,8 +19,9 @@ class RootInit : Shell.Initializer() {
fun init(context: Context, shell: Shell): Boolean {
shell.newJob().apply {
add("export SDK_INT=${Build.VERSION.SDK_INT}")
if (Const.Version.atLeast_20_4()) {
add("export MAGISKTMP=$(magisk --path)/.magisk")
add("export MAGISKTMP=\$(magisk --path)/.magisk")
} else {
add("export MAGISKTMP=/sbin/.magisk")
}
@@ -45,10 +45,7 @@ class RootInit : Shell.Initializer() {
Info.isSAR = getBool("SYSTEM_ROOT")
Info.ramdisk = getBool("RAMDISKEXIST")
Info.isAB = getBool("ISAB")
// FBE does not exist pre 7.0
if (Build.VERSION.SDK_INT >= 24)
Info.isFBE = SuFile("/data/unencrypted").exists()
Info.crypto = getvar("CRYPTOTYPE")
// Default presets
Config.recovery = getBool("RECOVERYMODE")