TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-02-25 16:37:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor changes

Browse Source
This commit is contained in:
topjohnwu 2021-04-17 19:57:47 -07:00
parent 8b28baabd7
commit 7e01f9c95e
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/shared/src/main/java/com/topjohnwu/magisk/utils/DynamicClassLoader.java
View File

@ -9,7 +9,11 @@ import dalvik.system.DexClassLoader;
public class DynamicClassLoader extends DexClassLoader { public class DynamicClassLoader extends DexClassLoader {
private ClassLoader base = Object.class.getClassLoader(); private static final ClassLoader base = Object.class.getClassLoader();
public DynamicClassLoader(File apk) {
super(apk.getPath(), apk.getParent(), null, base);
}
public DynamicClassLoader(File apk, ClassLoader parent) { public DynamicClassLoader(File apk, ClassLoader parent) {
super(apk.getPath(), apk.getParent(), null, parent); super(apk.getPath(), apk.getParent(), null, parent);
@ -18,7 +22,7 @@ public class DynamicClassLoader extends DexClassLoader {
@Override @Override
protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException { protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
// First check if already loaded // First check if already loaded
Class cls = findLoadedClass(name); Class<?> cls = findLoadedClass(name);
if (cls != null) if (cls != null)
return cls; return cls;

3
app/src/main/java/com/topjohnwu/magisk/ktx/XAndroid.kt
View File

@ -264,8 +264,7 @@ fun Context.startEndToLeftRight(start: Int, end: Int): Pair<Int, Int> {
fun Context.openUrl(url: String) = Utils.openLink(this, url.toUri()) fun Context.openUrl(url: String) = Utils.openLink(this, url.toUri())
@Suppress("FunctionName") inline fun <reified T> T.createClassLoader(apk: File) =
inline fun <reified T> T.DynamicClassLoader(apk: File) =
DynamicClassLoader(apk, T::class.java.classLoader) DynamicClassLoader(apk, T::class.java.classLoader)
fun Context.unwrap(): Context { fun Context.unwrap(): Context {

4
app/src/main/java/com/topjohnwu/magisk/ui/safetynet/CheckSafetyNetEvent.kt
View File

@ -12,7 +12,7 @@ import com.topjohnwu.magisk.arch.ContextExecutor
import com.topjohnwu.magisk.arch.ViewEventWithScope import com.topjohnwu.magisk.arch.ViewEventWithScope
import com.topjohnwu.magisk.core.Const import com.topjohnwu.magisk.core.Const
import com.topjohnwu.magisk.data.repository.NetworkService import com.topjohnwu.magisk.data.repository.NetworkService
import com.topjohnwu.magisk.ktx.DynamicClassLoader import com.topjohnwu.magisk.ktx.createClassLoader
import com.topjohnwu.magisk.ktx.writeTo import com.topjohnwu.magisk.ktx.writeTo
import com.topjohnwu.magisk.view.MagiskDialog import com.topjohnwu.magisk.view.MagiskDialog
import com.topjohnwu.signing.CryptoUtils import com.topjohnwu.signing.CryptoUtils
@ -67,7 +67,7 @@ class CheckSafetyNetEvent(
private suspend fun attest(context: Context, onError: suspend (Exception) -> Unit) { private suspend fun attest(context: Context, onError: suspend (Exception) -> Unit) {
val helper: SafetyNetHelper val helper: SafetyNetHelper
try { try {
val loader = DynamicClassLoader(apk) val loader = createClassLoader(apk)
// Scan through the dex and find our helper class // Scan through the dex and find our helper class
var clazz: Class<*>? = null var clazz: Class<*>? = null

5
stub/src/main/java/com/topjohnwu/magisk/ClassLoaders.java
View File

@ -7,10 +7,7 @@ import java.io.File;
class InjectedClassLoader extends DynamicClassLoader { class InjectedClassLoader extends DynamicClassLoader {
InjectedClassLoader(File apk) { InjectedClassLoader(File apk) {
super(apk, super(apk);
/* Use the base classloader as we do not want stub
* APK classes accessible from the main app */
Object.class.getClassLoader());
} }
@Override @Override