Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
Magisk
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Magisk
Commits
5133e591
Commit
5133e591
authored
Oct 23, 2019
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't relaunch app immediately
parent
1512c350
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
19 deletions
+6
-19
ManagerUpgrade.kt
...ava/com/topjohnwu/magisk/model/download/ManagerUpgrade.kt
+5
-6
PatchAPK.kt
app/src/main/java/com/topjohnwu/magisk/utils/PatchAPK.kt
+1
-2
Utils.kt
app/src/main/java/com/topjohnwu/magisk/utils/Utils.kt
+0
-5
utils.sh
app/src/main/res/raw/utils.sh
+0
-6
No files found.
app/src/main/java/com/topjohnwu/magisk/model/download/ManagerUpgrade.kt
View file @
5133e591
package
com.topjohnwu.magisk.model.download
import
com.topjohnwu.magisk.*
import
com.topjohnwu.magisk.BuildConfig
import
com.topjohnwu.magisk.Config
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.isRunningAsStub
import
com.topjohnwu.magisk.model.entity.internal.Configuration.APK.Restore
import
com.topjohnwu.magisk.model.entity.internal.Configuration.APK.Upgrade
import
com.topjohnwu.magisk.model.entity.internal.DownloadSubject
import
com.topjohnwu.magisk.ui.SplashActivity
import
com.topjohnwu.magisk.utils.PatchAPK
import
com.topjohnwu.magisk.utils.Utils
import
com.topjohnwu.superuser.Shell
import
java.io.File
...
...
@@ -35,9 +36,7 @@ private fun RemoteFileService.restore(apk: File, id: Int) {
Config
.
export
()
// Make it world readable
apk
.
setReadable
(
true
,
false
)
if
(
Shell
.
su
(
"pm install $apk"
).
exec
().
isSuccess
)
{
Utils
.
rmAndLaunch
(
packageName
,
SplashActivity
::
class
.
java
.
cmp
())
}
Shell
.
su
(
"pm install $apk && pm uninstall $packageName"
).
exec
()
}
fun
RemoteFileService
.
handleAPK
(
subject
:
DownloadSubject
.
Manager
)
...
...
app/src/main/java/com/topjohnwu/magisk/utils/PatchAPK.kt
View file @
5133e591
...
...
@@ -9,7 +9,6 @@ import com.topjohnwu.magisk.extensions.DynamicClassLoader
import
com.topjohnwu.magisk.extensions.get
import
com.topjohnwu.magisk.extensions.subscribeK
import
com.topjohnwu.magisk.extensions.writeTo
import
com.topjohnwu.magisk.ui.SplashActivity
import
com.topjohnwu.magisk.view.Notifications
import
com.topjohnwu.signing.JarMap
import
com.topjohnwu.signing.SignAPK
...
...
@@ -109,7 +108,7 @@ object PatchAPK {
Config
.
suManager
=
pkg
Config
.
export
()
Utils
.
rmAndLaunch
(
BuildConfig
.
APPLICATION_ID
,
SplashActivity
::
class
.
java
.
cmp
(
pkg
)
)
Shell
.
su
(
"pm uninstall ${BuildConfig.APPLICATION_ID}"
).
submit
(
)
return
true
}
...
...
app/src/main/java/com/topjohnwu/magisk/utils/Utils.kt
View file @
5133e591
package
com.topjohnwu.magisk.utils
import
android.content.ComponentName
import
android.content.Context
import
android.content.Intent
import
android.content.res.Resources
...
...
@@ -73,8 +72,4 @@ object Utils {
if
((
exists
()
&&
isDirectory
)
||
mkdirs
())
this
else
null
}
fun
rmAndLaunch
(
rm
:
String
,
component
:
ComponentName
)
{
Shell
.
su
(
"(rm_launch $rm ${component.flattenToString()})"
).
exec
()
}
}
app/src/main/res/raw/utils.sh
View file @
5133e591
...
...
@@ -109,9 +109,3 @@ EOF
touch
hosts/auto_mount
cd
/
}
rm_launch
()
{
pm uninstall
$1
am start
-n
$2
exit
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment