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

Refactor APKInstall

Browse Source
This commit is contained in:
topjohnwu
2022-02-13 19:54:59 -08:00
parent 256ff31d11
commit 668e549208
5 changed files with 122 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/com/topjohnwu/magisk/core/download/DownloadService.kt
View File

@@ -72,9 +72,9 @@ class DownloadService : NotificationService() {
}
}
private fun openApkSession(): OutputStream {
private fun APKInstall.Session.open(): OutputStream {
Config.showUpdateDone = true
return APKInstall.openStream(this)
return openStream(this@DownloadService)
}
private suspend fun handleApp(stream: InputStream, subject: Subject.App) {
@@ -110,9 +110,9 @@ class DownloadService : NotificationService() {
apk.delete()
// Install
val receiver = APKInstall.register(this, null, null)
patched.inputStream().copyAndClose(openApkSession())
subject.intent = receiver.waitIntent()
val session = APKInstall.startSession(this)
patched.inputStream().copyAndClose(session.open())
subject.intent = session.waitIntent()
patched.delete()
} else {
@@ -131,9 +131,9 @@ class DownloadService : NotificationService() {
throw e
}
} else {
val receiver = APKInstall.register(this, null, null)
writeTee(openApkSession())
subject.intent = receiver.waitIntent()
val session = APKInstall.startSession(this)
writeTee(session.open())
subject.intent = session.waitIntent()
}
}

39
app/src/main/java/com/topjohnwu/magisk/core/tasks/HideAPK.kt
View File

@@ -1,6 +1,7 @@
package com.topjohnwu.magisk.core.tasks
import android.app.Activity
import android.app.ProgressDialog
import android.content.Context
import android.content.Intent
import android.widget.Toast
@@ -20,8 +21,7 @@ import com.topjohnwu.magisk.signing.SignApk
import com.topjohnwu.magisk.utils.APKInstall
import com.topjohnwu.magisk.utils.Utils
import com.topjohnwu.superuser.Shell
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import kotlinx.coroutines.*
import timber.log.Timber
import java.io.File
import java.io.FileOutputStream
@@ -108,7 +108,8 @@ object HideAPK {
Timber.e(e)
stub.createNewFile()
val cmd = "\$MAGISKBIN/magiskinit -x manager ${stub.path}"
if (!Shell.su(cmd).exec().isSuccess) return false
if (!Shell.su(cmd).exec().isSuccess)
return false
}
// Generate a new random package name and signature
@@ -120,20 +121,22 @@ object HideAPK {
return false
// Install and auto launch app
val receiver = APKInstall.register(activity, pkg) {
val session = APKInstall.startSession(activity, pkg) {
launchApp(activity, pkg)
}
val cmd = "adb_pm_install $repack ${activity.applicationInfo.uid}"
if (!Shell.su(cmd).exec().isSuccess) {
APKInstall.install(activity, repack)
receiver.waitIntent()?.let { activity.startActivity(it) }
try {
session.install(activity, repack)
} catch (e: IOException) {
Timber.e(e)
return false
}
session.waitIntent()?.let { activity.startActivity(it) }
return true
}
@Suppress("DEPRECATION")
suspend fun hide(activity: Activity, label: String) {
val dialog = android.app.ProgressDialog(activity).apply {
val dialog = ProgressDialog(activity).apply {
setTitle(activity.getString(R.string.hide_app_title))
isIndeterminate = true
setCancelable(false)
@@ -148,24 +151,28 @@ object HideAPK {
}
}
@DelicateCoroutinesApi
@Suppress("DEPRECATION")
fun restore(activity: Activity) {
val dialog = android.app.ProgressDialog(activity).apply {
val dialog = ProgressDialog(activity).apply {
setTitle(activity.getString(R.string.restore_img_msg))
isIndeterminate = true
setCancelable(false)
show()
}
val apk = StubApk.current(activity)
val receiver = APKInstall.register(activity, APPLICATION_ID) {
val session = APKInstall.startSession(activity, APPLICATION_ID) {
launchApp(activity, APPLICATION_ID)
dialog.dismiss()
}
val cmd = "adb_pm_install $apk ${activity.applicationInfo.uid}"
Shell.su(cmd).submit(Shell.EXECUTOR) { ret ->
if (ret.isSuccess) return@submit
APKInstall.install(activity, apk)
receiver.waitIntent()?.let { activity.startActivity(it) }
GlobalScope.launch(Dispatchers.IO) {
try {
session.install(activity, apk)
} catch (e: IOException) {
Timber.e(e)
return@launch
}
session.waitIntent()?.let { activity.startActivity(it) }
}
}
}