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
51e40dd9
Commit
51e40dd9
authored
Jul 10, 2019
by
Viktor De Pasquale
Committed by
John Wu
Jul 20, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed crashes caused by file exposure beyond app bounds
parent
b2048379
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
SubstrateDownloadService.kt
...pjohnwu/magisk/model/download/SubstrateDownloadService.kt
+3
-2
XAndroid.kt
app/src/main/java/com/topjohnwu/magisk/utils/XAndroid.kt
+2
-3
No files found.
app/src/main/java/com/topjohnwu/magisk/model/download/SubstrateDownloadService.kt
View file @
51e40dd9
...
@@ -8,13 +8,13 @@ import android.webkit.MimeTypeMap
...
@@ -8,13 +8,13 @@ import android.webkit.MimeTypeMap
import
android.widget.Toast
import
android.widget.Toast
import
androidx.core.app.NotificationCompat
import
androidx.core.app.NotificationCompat
import
androidx.core.content.getSystemService
import
androidx.core.content.getSystemService
import
androidx.core.net.toUri
import
com.skoumal.teanity.extensions.subscribeK
import
com.skoumal.teanity.extensions.subscribeK
import
com.topjohnwu.magisk.Config
import
com.topjohnwu.magisk.Config
import
com.topjohnwu.magisk.Const
import
com.topjohnwu.magisk.Const
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.data.repository.FileRepository
import
com.topjohnwu.magisk.data.repository.FileRepository
import
com.topjohnwu.magisk.model.entity.internal.DownloadSubject
import
com.topjohnwu.magisk.model.entity.internal.DownloadSubject
import
com.topjohnwu.magisk.utils.provide
import
com.topjohnwu.magisk.utils.toast
import
com.topjohnwu.magisk.utils.toast
import
com.topjohnwu.magisk.utils.writeToCachedFile
import
com.topjohnwu.magisk.utils.writeToCachedFile
import
com.topjohnwu.magisk.view.Notifications
import
com.topjohnwu.magisk.view.Notifications
...
@@ -87,7 +87,8 @@ abstract class SubstrateDownloadService : Service() {
...
@@ -87,7 +87,8 @@ abstract class SubstrateDownloadService : Service() {
protected
fun
fileIntent
(
fileName
:
String
):
Intent
{
protected
fun
fileIntent
(
fileName
:
String
):
Intent
{
val
file
=
downloadsFile
(
fileName
)
val
file
=
downloadsFile
(
fileName
)
return
Intent
(
Intent
.
ACTION_VIEW
)
return
Intent
(
Intent
.
ACTION_VIEW
)
.
setDataAndType
(
file
.
toUri
(),
file
.
type
)
.
setDataAndType
(
file
.
provide
(
this
),
file
.
type
)
.
addFlags
(
Intent
.
FLAG_GRANT_READ_URI_PERMISSION
)
}
}
protected
fun
moveToDownloads
(
file
:
File
)
{
protected
fun
moveToDownloads
(
file
:
File
)
{
...
...
app/src/main/java/com/topjohnwu/magisk/utils/XAndroid.kt
View file @
51e40dd9
...
@@ -91,9 +91,8 @@ fun ApplicationInfo.findAppLabel(pm: PackageManager): String {
...
@@ -91,9 +91,8 @@ fun ApplicationInfo.findAppLabel(pm: PackageManager): String {
fun
Intent
.
startActivity
(
context
:
Context
)
=
context
.
startActivity
(
this
)
fun
Intent
.
startActivity
(
context
:
Context
)
=
context
.
startActivity
(
this
)
fun
File
.
provide
():
Uri
{
fun
File
.
provide
(
context
:
Context
=
get
()):
Uri
{
val
context
:
Context
by
inject
()
return
FileProvider
.
getUriForFile
(
context
,
context
.
packageName
+
".provider"
,
this
)
return
FileProvider
.
getUriForFile
(
context
,
"com.topjohnwu.magisk.fileprovider"
,
this
)
}
}
fun
File
.
mv
(
destination
:
File
)
{
fun
File
.
mv
(
destination
:
File
)
{
...
...
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