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

Proper app relaunch for stub

Browse Source
This commit is contained in:
topjohnwu
2022-02-02 04:44:22 -08:00
parent f4cf5dc0cd
commit c1fc3f373c
5 changed files with 68 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,13 +8,19 @@ import java.io.File;
// mapping when loading from platform (via LoadedApk.mClassLoader)
class InjectedClassLoader extends ClassLoader {
private static final String PKEY = "PHOENIX";
static final String PHOENIX = Mapping.inverseMap.get(PKEY);
InjectedClassLoader(File apk) {
super(new DynamicClassLoader(apk));
}
@Override
protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
return super.loadClass(Mapping.get(name), resolve);
String n = Mapping.get(name);
if (n.equals(PKEY))
return PhoenixActivity.class;
return super.loadClass(n, resolve);
}
}

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

@@ -5,7 +5,6 @@ import static android.R.string.ok;
import static android.R.string.yes;
import static com.topjohnwu.magisk.R.string.dling;
import static com.topjohnwu.magisk.R.string.no_internet_msg;
import static com.topjohnwu.magisk.R.string.relaunch_app;
import static com.topjohnwu.magisk.R.string.upgrade_msg;
import android.app.Activity;
@@ -17,7 +16,6 @@ import android.os.AsyncTask;
import android.os.Bundle;
import android.util.Log;
import android.view.ContextThemeWrapper;
import android.widget.Toast;
import com.topjohnwu.magisk.net.Networking;
import com.topjohnwu.magisk.net.Request;
@@ -111,14 +109,14 @@ public class DownloadActivity extends Activity {
dialog = ProgressDialog.show(themed, getString(dling), getString(dling) + " " + APP_NAME, true);
Runnable onSuccess = () -> {
dialog.dismiss();
Toast.makeText(themed, relaunch_app, Toast.LENGTH_LONG).show();
PhoenixActivity.rebirth(this, InjectedClassLoader.PHOENIX);
finish();
};
// Download and upgrade the app
File apk = dynLoad ? StubApk.current(this) : new File(getCacheDir(), "manager.apk");
request(apkLink).setExecutor(AsyncTask.THREAD_POOL_EXECUTOR).getAsFile(apk, file -> {
if (dynLoad) {
// TODO
runOnUiThread(onSuccess);
} else {
var receiver = APKInstall.register(this, BuildConfig.APPLICATION_ID, onSuccess);
APKInstall.installapk(this, file);