MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update stub implementation

Browse Source 
Prevent some potential issues
This commit is contained in:
topjohnwu 2021-04-17 22:14:54 -07:00
parent 7e01f9c95e
commit 4c1ea0e421
4 changed files with 35 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,10 +4,12 @@ import com.topjohnwu.magisk.utils.DynamicClassLoader;
import java.io.File;
class InjectedClassLoader extends DynamicClassLoader {
// Wrap the actual classloader as we only want to resolve classname
// mapping when loading from platform (via LoadedApk.mClassLoader)
class InjectedClassLoader extends ClassLoader {
InjectedClassLoader(File apk) {
super(apk);
super(new DynamicClassLoader(apk));
}
@Override

4
stub/src/main/java/com/topjohnwu/magisk/DelegateComponentFactory.java
View File

@ -12,12 +12,11 @@ import android.content.Intent;
@SuppressLint("NewApi")
public class DelegateComponentFactory extends AppComponentFactory {
static DelegateComponentFactory INSTANCE;
ClassLoader loader;
AppComponentFactory receiver;
public DelegateComponentFactory() {
INSTANCE = this;
InjectAPK.componentFactory = this;
}
@Override
@ -53,7 +52,6 @@ public class DelegateComponentFactory extends AppComponentFactory {
@Override
public ContentProvider instantiateProvider(ClassLoader cl, String className)
throws ClassNotFoundException, IllegalAccessException, InstantiationException {
if (loader == null) loader = cl;
if (receiver != null)
return receiver.instantiateProvider(loader, className);
return create(className);

48
stub/src/main/java/com/topjohnwu/magisk/InjectAPK.java
View File

@ -5,6 +5,8 @@ import android.app.Application;
import android.content.ContentResolver;
import android.content.Context;
import android.content.ContextWrapper;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.net.Uri;
import android.os.Build;
import android.util.Log;
@ -17,6 +19,12 @@ import java.lang.reflect.Field;
public class InjectAPK {
static Object componentFactory;
private static DelegateComponentFactory getComponentFactory() {
return (DelegateComponentFactory) componentFactory;
}
@SuppressWarnings("ResultOfMethodCallIgnored")
static Application setup(Context context) {
// Get ContextImpl
@ -28,7 +36,6 @@ public class InjectAPK {
File update = DynAPK.update(context);
if (update.exists())
update.renameTo(apk);
Application result = null;
if (!apk.exists()) {
// Try copying APK
Uri uri = new Uri.Builder().scheme("content")
@ -48,42 +55,47 @@ public class InjectAPK {
}
if (apk.exists()) {
ClassLoader cl = new InjectedClassLoader(apk);
PackageManager pm = context.getPackageManager();
ApplicationInfo info = pm.getPackageArchiveInfo(apk.getPath(), 0).applicationInfo;
try {
// Create the receiver Application
Object app = cl.loadClass(Mapping.get("APP")).getConstructor(Object.class)
Object app = cl.loadClass(info.className)
.getConstructor(Object.class)
.newInstance(DynAPK.pack(dynData()));
// Create the receiver component factory
Object factory = null;
if (Build.VERSION.SDK_INT >= 28) {
factory = cl.loadClass(Mapping.get("ACF")).newInstance();
factory = cl.loadClass(info.appComponentFactory).newInstance();
}
setClassLoader(context, cl);
// Finally, set variables
result = (Application) app;
if (Build.VERSION.SDK_INT >= 28) {
DelegateComponentFactory.INSTANCE.loader = cl;
DelegateComponentFactory.INSTANCE.receiver = (AppComponentFactory) factory;
getComponentFactory().loader = cl;
getComponentFactory().receiver = (AppComponentFactory) factory;
}
return (Application) app;
} catch (Exception e) {
Log.e(InjectAPK.class.getSimpleName(), "", e);
apk.delete();
}
} else {
ClassLoader cl = new RedirectClassLoader();
try {
setClassLoader(context, cl);
if (Build.VERSION.SDK_INT >= 28) {
DelegateComponentFactory.INSTANCE.loader = cl;
}
} catch (Exception e) {
// Should never happen
Log.e(InjectAPK.class.getSimpleName(), "", e);
}
// fallthrough
}
return result;
ClassLoader cl = new RedirectClassLoader();
try {
setClassLoader(context, cl);
if (Build.VERSION.SDK_INT >= 28) {
getComponentFactory().loader = cl;
}
} catch (Exception e) {
Log.e(InjectAPK.class.getSimpleName(), "", e);
}
return null;
}
// Replace LoadedApk mClassLoader

3
stub/src/main/java/com/topjohnwu/magisk/Mapping.java
View File

@ -34,9 +34,6 @@ public class Mapping {
for (Map.Entry<String, String> e : map.entrySet()) {
inverseMap.put(e.getValue(), e.getKey());
}
map.put("APP", "com.topjohnwu.magisk.core.App");
map.put("ACF", "androidx.core.app.CoreComponentFactory");
}
public static String get(String name) {