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
fb04e324
Commit
fb04e324
authored
Aug 22, 2020
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bypass external rw check in the proper location
parent
14a2f63b
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
15 deletions
+16
-15
BaseViewModel.kt
app/src/main/java/com/topjohnwu/magisk/arch/BaseViewModel.kt
+3
-7
BaseActivity.kt
.../main/java/com/topjohnwu/magisk/core/base/BaseActivity.kt
+11
-6
ViewEvents.kt
app/src/main/java/com/topjohnwu/magisk/events/ViewEvents.kt
+2
-2
No files found.
app/src/main/java/com/topjohnwu/magisk/arch/BaseViewModel.kt
View file @
fb04e324
...
@@ -82,16 +82,12 @@ abstract class BaseViewModel(
...
@@ -82,16 +82,12 @@ abstract class BaseViewModel(
ViewActionEvent
(
action
).
publish
()
ViewActionEvent
(
action
).
publish
()
}
}
fun
withPermission
s
(
vararg
permissions
:
String
,
callback
:
(
Boolean
)
->
Unit
)
{
fun
withPermission
(
permission
:
String
,
callback
:
(
Boolean
)
->
Unit
)
{
PermissionEvent
(
permission
s
.
toList
()
,
callback
).
publish
()
PermissionEvent
(
permission
,
callback
).
publish
()
}
}
fun
withExternalRW
(
callback
:
()
->
Unit
)
{
fun
withExternalRW
(
callback
:
()
->
Unit
)
{
if
(
Build
.
VERSION
.
SDK_INT
>=
Build
.
VERSION_CODES
.
Q
)
{
withPermission
(
Manifest
.
permission
.
WRITE_EXTERNAL_STORAGE
)
{
callback
()
return
}
withPermissions
(
Manifest
.
permission
.
WRITE_EXTERNAL_STORAGE
)
{
if
(!
it
)
{
if
(!
it
)
{
SnackbarEvent
(
R
.
string
.
external_rw_permission_denied
).
publish
()
SnackbarEvent
(
R
.
string
.
external_rw_permission_denied
).
publish
()
}
else
{
}
else
{
...
...
app/src/main/java/com/topjohnwu/magisk/core/base/BaseActivity.kt
View file @
fb04e324
...
@@ -5,6 +5,7 @@ import android.content.Context
...
@@ -5,6 +5,7 @@ import android.content.Context
import
android.content.Intent
import
android.content.Intent
import
android.content.pm.PackageManager
import
android.content.pm.PackageManager
import
android.content.res.Configuration
import
android.content.res.Configuration
import
android.os.Build
import
androidx.appcompat.app.AppCompatActivity
import
androidx.appcompat.app.AppCompatActivity
import
androidx.collection.SparseArrayCompat
import
androidx.collection.SparseArrayCompat
import
androidx.core.app.ActivityCompat
import
androidx.core.app.ActivityCompat
...
@@ -30,13 +31,17 @@ abstract class BaseActivity : AppCompatActivity() {
...
@@ -30,13 +31,17 @@ abstract class BaseActivity : AppCompatActivity() {
super
.
attachBaseContext
(
base
.
wrap
(
false
))
super
.
attachBaseContext
(
base
.
wrap
(
false
))
}
}
fun
withPermission
s
(
vararg
permissions
:
String
,
builder
:
PermissionRequestBuilder
.()
->
Unit
)
{
fun
withPermission
(
permission
:
String
,
builder
:
PermissionRequestBuilder
.()
->
Unit
)
{
val
request
=
PermissionRequestBuilder
().
apply
(
builder
).
build
()
val
request
=
PermissionRequestBuilder
().
apply
(
builder
).
build
()
val
ungranted
=
permissions
.
filter
{
ContextCompat
.
checkSelfPermission
(
this
,
it
)
!=
PackageManager
.
PERMISSION_GRANTED
if
(
permission
==
Manifest
.
permission
.
WRITE_EXTERNAL_STORAGE
&&
Build
.
VERSION
.
SDK_INT
>=
29
)
{
// We do not need external rw on 29+
request
.
onSuccess
()
return
}
}
if
(
ungranted
.
isEmpty
()
)
{
if
(
ContextCompat
.
checkSelfPermission
(
this
,
permission
)
==
PackageManager
.
PERMISSION_GRANTED
)
{
request
.
onSuccess
()
request
.
onSuccess
()
}
else
{
}
else
{
val
requestCode
=
Random
.
nextInt
(
256
,
512
)
val
requestCode
=
Random
.
nextInt
(
256
,
512
)
...
@@ -46,12 +51,12 @@ abstract class BaseActivity : AppCompatActivity() {
...
@@ -46,12 +51,12 @@ abstract class BaseActivity : AppCompatActivity() {
else
else
request
.
onFailure
()
request
.
onFailure
()
}
}
ActivityCompat
.
requestPermissions
(
this
,
ungranted
.
toTypedArray
(
),
requestCode
)
ActivityCompat
.
requestPermissions
(
this
,
arrayOf
(
permission
),
requestCode
)
}
}
}
}
fun
withExternalRW
(
builder
:
PermissionRequestBuilder
.()
->
Unit
)
{
fun
withExternalRW
(
builder
:
PermissionRequestBuilder
.()
->
Unit
)
{
withPermission
s
(
Manifest
.
permission
.
WRITE_EXTERNAL_STORAGE
,
builder
=
builder
)
withPermission
(
Manifest
.
permission
.
WRITE_EXTERNAL_STORAGE
,
builder
=
builder
)
}
}
override
fun
onRequestPermissionsResult
(
override
fun
onRequestPermissionsResult
(
...
...
app/src/main/java/com/topjohnwu/magisk/events/ViewEvents.kt
View file @
fb04e324
...
@@ -24,12 +24,12 @@ class OpenChangelogEvent(val item: Repo) : ViewEventWithScope(), ContextExecutor
...
@@ -24,12 +24,12 @@ class OpenChangelogEvent(val item: Repo) : ViewEventWithScope(), ContextExecutor
}
}
class
PermissionEvent
(
class
PermissionEvent
(
private
val
permission
s
:
List
<
String
>
,
private
val
permission
:
String
,
private
val
callback
:
(
Boolean
)
->
Unit
private
val
callback
:
(
Boolean
)
->
Unit
)
:
ViewEvent
(),
ActivityExecutor
{
)
:
ViewEvent
(),
ActivityExecutor
{
override
fun
invoke
(
activity
:
BaseUIActivity
<
*
,
*
>)
=
override
fun
invoke
(
activity
:
BaseUIActivity
<
*
,
*
>)
=
activity
.
withPermission
s
(*
permissions
.
toTypedArray
()
)
{
activity
.
withPermission
(
permission
)
{
onSuccess
{
onSuccess
{
callback
(
true
)
callback
(
true
)
}
}
...
...
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