mirror of
https://github.com/topjohnwu/Magisk.git
synced 2024-12-25 20:27:39 +00:00
Try install with root first
This commit is contained in:
parent
bba2ac8817
commit
0a6140c6eb
@ -21,6 +21,7 @@ public class APKInstall {
|
|||||||
if (Build.VERSION.SDK_INT >= 24) {
|
if (Build.VERSION.SDK_INT >= 24) {
|
||||||
intent.setData(FileProvider.getUriForFile(c, c.getPackageName() + ".provider", apk));
|
intent.setData(FileProvider.getUriForFile(c, c.getPackageName() + ".provider", apk));
|
||||||
} else {
|
} else {
|
||||||
|
//noinspection ResultOfMethodCallIgnored SetWorldReadable
|
||||||
apk.setReadable(true, false);
|
apk.setReadable(true, false);
|
||||||
intent.setData(Uri.fromFile(apk));
|
intent.setData(Uri.fromFile(apk));
|
||||||
}
|
}
|
||||||
@ -31,15 +32,17 @@ public class APKInstall {
|
|||||||
c.startActivity(installIntent(c, apk));
|
c.startActivity(installIntent(c, apk));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void installAndWait(Activity c, File apk, BroadcastReceiver r) {
|
public static void registerInstallReceiver(Context c, BroadcastReceiver r) {
|
||||||
IntentFilter filter = new IntentFilter();
|
IntentFilter filter = new IntentFilter();
|
||||||
filter.addAction(Intent.ACTION_PACKAGE_REPLACED);
|
filter.addAction(Intent.ACTION_PACKAGE_REPLACED);
|
||||||
filter.addAction(Intent.ACTION_PACKAGE_ADDED);
|
filter.addAction(Intent.ACTION_PACKAGE_ADDED);
|
||||||
filter.addDataScheme("package");
|
filter.addDataScheme("package");
|
||||||
c.getApplicationContext().registerReceiver(r, filter);
|
c.getApplicationContext().registerReceiver(r, filter);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void installHideResult(Activity c, File apk) {
|
||||||
Intent intent = installIntent(c, apk);
|
Intent intent = installIntent(c, apk);
|
||||||
intent.putExtra(Intent.EXTRA_RETURN_RESULT, true);
|
intent.putExtra(Intent.EXTRA_RETURN_RESULT, true);
|
||||||
c.startActivityForResult(intent, 0);
|
c.startActivityForResult(intent, 0); // Ignore result, use install receiver
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -21,6 +21,7 @@ import com.topjohnwu.magisk.utils.APKInstall
|
|||||||
import com.topjohnwu.magisk.utils.Utils
|
import com.topjohnwu.magisk.utils.Utils
|
||||||
import com.topjohnwu.signing.JarMap
|
import com.topjohnwu.signing.JarMap
|
||||||
import com.topjohnwu.signing.SignApk
|
import com.topjohnwu.signing.SignApk
|
||||||
|
import com.topjohnwu.superuser.Shell
|
||||||
import kotlinx.coroutines.Dispatchers
|
import kotlinx.coroutines.Dispatchers
|
||||||
import kotlinx.coroutines.withContext
|
import kotlinx.coroutines.withContext
|
||||||
import timber.log.Timber
|
import timber.log.Timber
|
||||||
@ -141,7 +142,9 @@ object HideAPK {
|
|||||||
return false
|
return false
|
||||||
|
|
||||||
// Install and auto launch app
|
// Install and auto launch app
|
||||||
APKInstall.installAndWait(activity, repack, WaitPackageReceiver(pkg, activity))
|
APKInstall.registerInstallReceiver(activity, WaitPackageReceiver(pkg, activity))
|
||||||
|
if (!Shell.su("adb_pm_install $repack").exec().isSuccess)
|
||||||
|
APKInstall.installHideResult(activity, repack)
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -156,6 +159,8 @@ object HideAPK {
|
|||||||
|
|
||||||
fun restore(activity: Activity) {
|
fun restore(activity: Activity) {
|
||||||
val apk = DynAPK.current(activity)
|
val apk = DynAPK.current(activity)
|
||||||
APKInstall.installAndWait(activity, apk, WaitPackageReceiver(APPLICATION_ID, activity))
|
APKInstall.registerInstallReceiver(activity, WaitPackageReceiver(APPLICATION_ID, activity))
|
||||||
|
if (!Shell.su("adb_pm_install $apk").exec().isSuccess)
|
||||||
|
APKInstall.installHideResult(activity, apk)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user