From 90883bff930ea74ee7f20631f05695cf4c819d49 Mon Sep 17 00:00:00 2001 From: androidacy-user Date: Tue, 3 Oct 2023 21:34:37 -0400 Subject: [PATCH] remove some magisk related code Signed-off-by: androidacy-user --- .../fox2code/mmm/installer/InstallerInitializer.kt | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/app/src/main/kotlin/com/fox2code/mmm/installer/InstallerInitializer.kt b/app/src/main/kotlin/com/fox2code/mmm/installer/InstallerInitializer.kt index 25eac01..022127a 100644 --- a/app/src/main/kotlin/com/fox2code/mmm/installer/InstallerInitializer.kt +++ b/app/src/main/kotlin/com/fox2code/mmm/installer/InstallerInitializer.kt @@ -23,11 +23,8 @@ class InstallerInitializer { companion object { var isKsu: Boolean = false - private val MAGISK_SBIN = File("/sbin/magisk") - private val MAGISK_SYSTEM = File("/system/bin/magisk") - private val MAGISK_SYSTEM_EX = File("/system/xbin/magisk") private var mgskPth: String? = null - private var mgskVerCode = 0 + private var verCode = 0 private var hsRmdsk = false const val ERROR_NO_PATH = 1 const val ERROR_NO_SU = 2 @@ -67,7 +64,7 @@ class InstallerInitializer { } fun peekMagiskVersion(): Int { - return mgskVerCode + return verCode } fun peekHasRamdisk(): Boolean { @@ -94,7 +91,7 @@ class InstallerInitializer { } if (forceCheck) { if (mgskPth == null) { - mgskVerCode = 0 + verCode = 0 } } if (mgskPth != null) { @@ -174,6 +171,7 @@ class InstallerInitializer { if (MainApplication.forceDebugLogging) { Timber.i("Kernelsu detected") } + verCode = output[1].toInt() mgskPth = "/data/adb" isKsu = true // if analytics enabled, set breadcrumb for countly @@ -212,7 +210,7 @@ class InstallerInitializer { if (mgskPth == null && Shell.isAppGrantedRoot() == true) { Timber.e("[ANOMALY] Failed to get Magisk path but granted root") } - Companion.mgskVerCode = mgskVerCode + verCode = mgskVerCode return mgskPth } catch (ignored: Exception) { // work around edge case