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
084e0a73
Commit
084e0a73
authored
Feb 03, 2022
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cleanup DownloadService
parent
10f991b8
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
210 additions
and
215 deletions
+210
-215
DownloadService.kt
...ava/com/topjohnwu/magisk/core/download/DownloadService.kt
+92
-105
ManagerHandler.kt
...java/com/topjohnwu/magisk/core/download/ManagerHandler.kt
+0
-67
ModuleProcessor.kt
...ava/com/topjohnwu/magisk/core/download/ModuleProcessor.kt
+0
-38
NotificationService.kt
...com/topjohnwu/magisk/core/download/NotificationService.kt
+113
-0
Subject.kt
...c/main/java/com/topjohnwu/magisk/core/download/Subject.kt
+1
-1
ManagerInstallDialog.kt
...om/topjohnwu/magisk/events/dialog/ManagerInstallDialog.kt
+1
-1
HomeViewModel.kt
...c/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt
+2
-2
Notifications.kt
app/src/main/java/com/topjohnwu/magisk/view/Notifications.kt
+1
-1
No files found.
app/src/main/java/com/topjohnwu/magisk/core/download/DownloadService.kt
View file @
084e0a73
This diff is collapsed.
Click to expand it.
app/src/main/java/com/topjohnwu/magisk/core/download/ManagerHandler.kt
deleted
100644 → 0
View file @
10f991b8
package
com.topjohnwu.magisk.core.download
import
androidx.core.net.toFile
import
com.topjohnwu.magisk.PhoenixActivity
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.StubApk
import
com.topjohnwu.magisk.core.Info
import
com.topjohnwu.magisk.core.isRunningAsStub
import
com.topjohnwu.magisk.core.tasks.HideAPK
import
com.topjohnwu.magisk.core.utils.MediaStoreUtils.outputStream
import
com.topjohnwu.magisk.ktx.copyAndClose
import
com.topjohnwu.magisk.ktx.writeTo
import
com.topjohnwu.magisk.utils.APKInstall
import
java.io.File
import
java.io.InputStream
import
java.io.OutputStream
private
class
TeeOutputStream
(
private
val
o1
:
OutputStream
,
private
val
o2
:
OutputStream
)
:
OutputStream
()
{
override
fun
write
(
b
:
Int
)
{
o1
.
write
(
b
)
o2
.
write
(
b
)
}
override
fun
write
(
b
:
ByteArray
?,
off
:
Int
,
len
:
Int
)
{
o1
.
write
(
b
,
off
,
len
)
o2
.
write
(
b
,
off
,
len
)
}
override
fun
close
()
{
o1
.
close
()
o2
.
close
()
}
}
suspend
fun
DownloadService
.
handleAPK
(
subject
:
Subject
.
Manager
,
stream
:
InputStream
)
{
fun
write
(
output
:
OutputStream
)
{
val
external
=
subject
.
externalFile
.
outputStream
()
stream
.
copyAndClose
(
TeeOutputStream
(
external
,
output
))
}
if
(
isRunningAsStub
)
{
val
apk
=
subject
.
file
.
toFile
()
val
id
=
subject
.
notifyId
write
(
StubApk
.
update
(
this
).
outputStream
())
if
(
Info
.
stub
!!
.
version
<
subject
.
stub
.
versionCode
)
{
// Also upgrade stub
update
(
id
)
{
it
.
setProgress
(
0
,
0
,
true
)
.
setContentTitle
(
getString
(
R
.
string
.
hide_app_title
))
.
setContentText
(
""
)
}
service
.
fetchFile
(
subject
.
stub
.
link
).
byteStream
().
writeTo
(
apk
)
val
patched
=
File
(
apk
.
parent
,
"patched.apk"
)
HideAPK
.
patch
(
this
,
apk
,
patched
,
packageName
,
applicationInfo
.
nonLocalizedLabel
)
apk
.
delete
()
patched
.
renameTo
(
apk
)
}
else
{
val
clz
=
Info
.
stub
!!
.
classToComponent
[
"PHOENIX"
]
!!
PhoenixActivity
.
rebirth
(
this
,
clz
)
return
}
}
val
receiver
=
APKInstall
.
register
(
this
,
null
,
null
)
write
(
APKInstall
.
openStream
(
this
,
false
))
subject
.
intent
=
receiver
.
waitIntent
()
}
app/src/main/java/com/topjohnwu/magisk/core/download/ModuleProcessor.kt
deleted
100644 → 0
View file @
10f991b8
package
com.topjohnwu.magisk.core.download
import
android.net.Uri
import
com.topjohnwu.magisk.core.utils.MediaStoreUtils.outputStream
import
com.topjohnwu.magisk.ktx.forEach
import
com.topjohnwu.magisk.ktx.withStreams
import
java.io.InputStream
import
java.util.zip.ZipEntry
import
java.util.zip.ZipInputStream
import
java.util.zip.ZipOutputStream
fun
InputStream
.
toModule
(
file
:
Uri
,
installer
:
InputStream
)
{
val
input
=
ZipInputStream
(
buffered
())
val
output
=
ZipOutputStream
(
file
.
outputStream
().
buffered
())
withStreams
(
input
,
output
)
{
zin
,
zout
->
zout
.
putNextEntry
(
ZipEntry
(
"META-INF/"
))
zout
.
putNextEntry
(
ZipEntry
(
"META-INF/com/"
))
zout
.
putNextEntry
(
ZipEntry
(
"META-INF/com/google/"
))
zout
.
putNextEntry
(
ZipEntry
(
"META-INF/com/google/android/"
))
zout
.
putNextEntry
(
ZipEntry
(
"META-INF/com/google/android/update-binary"
))
installer
.
copyTo
(
zout
)
zout
.
putNextEntry
(
ZipEntry
(
"META-INF/com/google/android/updater-script"
))
zout
.
write
(
"#MAGISK\n"
.
toByteArray
(
charset
(
"UTF-8"
)))
zin
.
forEach
{
entry
->
val
path
=
entry
.
name
if
(
path
.
isNotEmpty
()
&&
!
path
.
startsWith
(
"META-INF"
))
{
zout
.
putNextEntry
(
ZipEntry
(
path
))
if
(!
entry
.
isDirectory
)
{
zin
.
copyTo
(
zout
)
}
}
}
}
}
app/src/main/java/com/topjohnwu/magisk/core/download/NotificationService.kt
0 → 100644
View file @
084e0a73
package
com.topjohnwu.magisk.core.download
import
android.app.Notification
import
android.content.Intent
import
android.os.IBinder
import
androidx.lifecycle.MutableLiveData
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.core.base.BaseService
import
com.topjohnwu.magisk.core.utils.ProgressInputStream
import
com.topjohnwu.magisk.di.ServiceLocator
import
com.topjohnwu.magisk.ktx.synchronized
import
com.topjohnwu.magisk.view.Notifications
import
okhttp3.ResponseBody
import
java.io.InputStream
open
class
NotificationService
:
BaseService
()
{
private
val
notifications
=
HashMap
<
Int
,
Notification
.
Builder
>().
synchronized
()
protected
val
hasNotifications
get
()
=
notifications
.
isNotEmpty
()
protected
val
service
get
()
=
ServiceLocator
.
networkService
override
fun
onBind
(
intent
:
Intent
?):
IBinder
?
=
null
override
fun
onTaskRemoved
(
rootIntent
:
Intent
?)
{
super
.
onTaskRemoved
(
rootIntent
)
notifications
.
forEach
{
Notifications
.
mgr
.
cancel
(
it
.
key
)
}
notifications
.
clear
()
}
protected
fun
ResponseBody
.
toProgressStream
(
subject
:
Subject
):
InputStream
{
val
max
=
contentLength
()
val
total
=
max
.
toFloat
()
/
1048576
val
id
=
subject
.
notifyId
update
(
id
)
{
it
.
setContentTitle
(
subject
.
title
)
}
return
ProgressInputStream
(
byteStream
())
{
val
progress
=
it
.
toFloat
()
/
1048576
update
(
id
)
{
notification
->
if
(
max
>
0
)
{
broadcast
(
progress
/
total
,
subject
)
notification
.
setProgress
(
max
.
toInt
(),
it
.
toInt
(),
false
)
.
setContentText
(
"%.2f / %.2f MB"
.
format
(
progress
,
total
))
}
else
{
broadcast
(-
1f
,
subject
)
notification
.
setContentText
(
"%.2f MB / ??"
.
format
(
progress
))
}
}
}
}
private
fun
finalNotify
(
id
:
Int
,
editor
:
(
Notification
.
Builder
)
->
Unit
):
Int
{
val
notification
=
remove
(
id
)
?.
also
(
editor
)
?:
return
-
1
val
newId
=
Notifications
.
nextId
()
Notifications
.
mgr
.
notify
(
newId
,
notification
.
build
())
return
newId
}
protected
fun
notifyFail
(
subject
:
Subject
)
=
finalNotify
(
subject
.
notifyId
)
{
broadcast
(-
2f
,
subject
)
it
.
setContentText
(
getString
(
R
.
string
.
download_file_error
))
.
setSmallIcon
(
android
.
R
.
drawable
.
stat_notify_error
)
.
setOngoing
(
false
)
}
protected
fun
notifyFinish
(
subject
:
Subject
)
=
finalNotify
(
subject
.
notifyId
)
{
broadcast
(
1f
,
subject
)
it
.
setContentTitle
(
subject
.
title
)
.
setContentText
(
getString
(
R
.
string
.
download_complete
))
.
setSmallIcon
(
android
.
R
.
drawable
.
stat_sys_download_done
)
.
setProgress
(
0
,
0
,
false
)
.
setOngoing
(
false
)
.
setAutoCancel
(
true
)
subject
.
pendingIntent
(
this
)
?.
let
{
intent
->
it
.
setContentIntent
(
intent
)
}
}
private
fun
create
()
=
Notifications
.
progress
(
this
,
""
)
private
fun
updateForeground
()
{
if
(
hasNotifications
)
{
val
(
id
,
notification
)
=
notifications
.
entries
.
first
()
startForeground
(
id
,
notification
.
build
())
}
else
{
stopForeground
(
false
)
}
}
protected
fun
update
(
id
:
Int
,
editor
:
(
Notification
.
Builder
)
->
Unit
=
{})
{
val
wasEmpty
=
!
hasNotifications
val
notification
=
notifications
.
getOrPut
(
id
,
::
create
).
also
(
editor
)
if
(
wasEmpty
)
updateForeground
()
else
Notifications
.
mgr
.
notify
(
id
,
notification
.
build
())
}
protected
fun
remove
(
id
:
Int
):
Notification
.
Builder
?
{
val
n
=
notifications
.
remove
(
id
)
?.
also
{
updateForeground
()
}
Notifications
.
mgr
.
cancel
(
id
)
return
n
}
companion
object
{
@JvmStatic
protected
val
progressBroadcast
=
MutableLiveData
<
Pair
<
Float
,
Subject
>?>()
private
fun
broadcast
(
progress
:
Float
,
subject
:
Subject
)
{
progressBroadcast
.
postValue
(
progress
to
subject
)
}
}
}
app/src/main/java/com/topjohnwu/magisk/core/download/Subject.kt
View file @
084e0a73
...
...
@@ -56,7 +56,7 @@ sealed class Subject : Parcelable {
}
@Parcelize
class
Manager
(
class
App
(
private
val
json
:
MagiskJson
=
Info
.
remote
.
magisk
,
val
stub
:
StubJson
=
Info
.
remote
.
stub
,
override
val
notifyId
:
Int
=
Notifications
.
nextId
()
...
...
app/src/main/java/com/topjohnwu/magisk/events/dialog/ManagerInstallDialog.kt
View file @
084e0a73
...
...
@@ -29,7 +29,7 @@ class ManagerInstallDialog : MarkDownDialog() {
setCancelable
(
true
)
setButton
(
MagiskDialog
.
ButtonType
.
POSITIVE
)
{
text
=
R
.
string
.
install
onClick
{
DownloadService
.
start
(
context
,
Subject
.
Manager
())
}
onClick
{
DownloadService
.
start
(
context
,
Subject
.
App
())
}
}
setButton
(
MagiskDialog
.
ButtonType
.
NEGATIVE
)
{
text
=
android
.
R
.
string
.
cancel
...
...
app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt
View file @
084e0a73
...
...
@@ -10,7 +10,7 @@ import com.topjohnwu.magisk.arch.*
import
com.topjohnwu.magisk.core.Config
import
com.topjohnwu.magisk.core.Info
import
com.topjohnwu.magisk.core.download.Subject
import
com.topjohnwu.magisk.core.download.Subject.
Manager
import
com.topjohnwu.magisk.core.download.Subject.
App
import
com.topjohnwu.magisk.data.repository.NetworkService
import
com.topjohnwu.magisk.databinding.itemBindingOf
import
com.topjohnwu.magisk.databinding.set
...
...
@@ -112,7 +112,7 @@ class HomeViewModel(
}.
publish
()
fun
onProgressUpdate
(
progress
:
Float
,
subject
:
Subject
)
{
if
(
subject
is
Manager
)
if
(
subject
is
App
)
stateManagerProgress
=
progress
.
times
(
100f
).
roundToInt
()
}
...
...
app/src/main/java/com/topjohnwu/magisk/view/Notifications.kt
View file @
084e0a73
...
...
@@ -48,7 +48,7 @@ object Notifications {
}
fun
managerUpdate
(
context
:
Context
)
{
val
intent
=
DownloadService
.
getPendingIntent
(
context
,
Subject
.
Manager
())
val
intent
=
DownloadService
.
getPendingIntent
(
context
,
Subject
.
App
())
val
builder
=
updateBuilder
(
context
)
.
setContentTitle
(
context
.
getString
(
R
.
string
.
magisk_update_title
))
...
...
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