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

Rename class

Browse Source
This commit is contained in:
topjohnwu
2022-02-02 02:50:27 -08:00
parent 355341f0ab
commit f4cf5dc0cd
11 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,7 +21,7 @@ public class DelegateComponentFactory extends AppComponentFactory {
@Override
public ClassLoader instantiateClassLoader(ClassLoader cl, ApplicationInfo info) {
DynLoad.loadAPK(info);
DynLoad.loadApk(info);
return new DelegateClassLoader();
}

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

@@ -115,7 +115,7 @@ public class DownloadActivity extends Activity {
finish();
};
// Download and upgrade the app
File apk = dynLoad ? DynAPK.current(this) : new File(getCacheDir(), "manager.apk");
File apk = dynLoad ? StubApk.current(this) : new File(getCacheDir(), "manager.apk");
request(apkLink).setExecutor(AsyncTask.THREAD_POOL_EXECUTOR).getAsFile(apk, file -> {
if (dynLoad) {
// TODO
@@ -140,7 +140,7 @@ public class DownloadActivity extends Activity {
try (is; out) {
APKInstall.transfer(is, out);
}
DynAPK.addAssetPath(getResources().getAssets(), apk.getPath());
StubApk.addAssetPath(getResources().getAssets(), apk.getPath());
} catch (Exception ignored) {
}
}

16
stub/src/main/java/com/topjohnwu/magisk/DynLoad.java
View File

@@ -31,7 +31,7 @@ public class DynLoad {
// The current active classloader
static ClassLoader loader = new RedirectClassLoader();
static Object componentFactory;
static final DynAPK.Data apkData = createApkData();
static final StubApk.Data apkData = createApkData();
private static boolean loadedApk = false;
@@ -46,13 +46,13 @@ public class DynLoad {
}
// Dynamically load APK from internal or external storage
static void loadAPK(ApplicationInfo info) {
static void loadApk(ApplicationInfo info) {
if (loadedApk)
return;
loadedApk = true;
File apk = DynAPK.current(info);
File update = DynAPK.update(info);
File apk = StubApk.current(info);
File update = StubApk.update(info);
if (update.exists()) {
// Rename from update
@@ -98,8 +98,8 @@ public class DynLoad {
// Dynamically load APK, inject ClassLoader into ContextImpl, then
// create the non-stub Application instance from the loaded APK
static Application createApp(Context context) {
File apk = DynAPK.current(context);
loadAPK(context.getApplicationInfo());
File apk = StubApk.current(context);
loadApk(context.getApplicationInfo());
// Trigger folder creation
context.getExternalFilesDir(null);
@@ -193,8 +193,8 @@ public class DynLoad {
}
}
private static DynAPK.Data createApkData() {
var data = new DynAPK.Data();
private static StubApk.Data createApkData() {
var data = new StubApk.Data();
data.setVersion(BuildConfig.STUB_VERSION);
data.setClassToComponent(Mapping.inverseMap);
data.setRootService(DelegateRootService.class);