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
45c1f6bc
Commit
45c1f6bc
authored
Oct 23, 2019
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix restore manager when running as stub
parent
0d31e5c8
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
8 deletions
+4
-8
ManagerUpgrade.kt
...ava/com/topjohnwu/magisk/model/download/ManagerUpgrade.kt
+2
-5
RemoteFileService.kt
.../com/topjohnwu/magisk/model/download/RemoteFileService.kt
+2
-3
No files found.
app/src/main/java/com/topjohnwu/magisk/model/download/ManagerUpgrade.kt
View file @
45c1f6bc
package
com.topjohnwu.magisk.model.download
import
com.topjohnwu.magisk.BuildConfig
import
com.topjohnwu.magisk.Config
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.cmp
import
com.topjohnwu.magisk.*
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
...
...
@@ -14,7 +11,7 @@ import com.topjohnwu.superuser.Shell
import
java.io.File
private
fun
RemoteFileService
.
patchPackage
(
apk
:
File
,
id
:
Int
)
{
if
(
packageName
!=
BuildConfig
.
APPLICATION_ID
)
{
if
(
!
isRunningAsStub
&&
packageName
!=
BuildConfig
.
APPLICATION_ID
)
{
update
(
id
)
{
notification
->
notification
.
setProgress
(
0
,
0
,
true
)
.
setProgress
(
0
,
0
,
true
)
...
...
app/src/main/java/com/topjohnwu/magisk/model/download/RemoteFileService.kt
View file @
45c1f6bc
...
...
@@ -12,7 +12,6 @@ import com.topjohnwu.magisk.extensions.writeTo
import
com.topjohnwu.magisk.model.entity.internal.DownloadSubject
import
com.topjohnwu.magisk.model.entity.internal.DownloadSubject.*
import
com.topjohnwu.magisk.utils.ProgressInputStream
import
com.topjohnwu.magisk.isRunningAsStub
import
com.topjohnwu.magisk.view.Notifications
import
com.topjohnwu.superuser.ShellUtils
import
io.reactivex.Completable
...
...
@@ -72,7 +71,7 @@ abstract class RemoteFileService : NotificationService() {
else
->
Completable
.
fromAction
{
stream
.
writeTo
(
subject
.
file
)
}
}
}.
doOnComplete
{
if
(
!
isRunningAsStub
&&
subject
is
Manager
)
if
(
subject
is
Manager
)
handleAPK
(
subject
)
}
...
...
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