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
6a10cc9c
Commit
6a10cc9c
authored
Sep 28, 2019
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove dependency Dexter
parent
6b317f91
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
37 additions
and
23 deletions
+37
-23
build.gradle
app/build.gradle
+0
-1
BaseActivity.kt
app/src/main/java/com/topjohnwu/magisk/base/BaseActivity.kt
+37
-22
No files found.
app/build.gradle
View file @
6a10cc9c
...
...
@@ -62,7 +62,6 @@ dependencies {
implementation
'com.jakewharton.timber:timber:4.7.1'
implementation
'com.ncapdevi:frag-nav:3.2.0'
implementation
'com.github.pwittchen:reactivenetwork-rx2:3.0.6'
implementation
'com.karumi:dexter:6.0.0'
implementation
"io.reactivex.rxjava2:rxjava:2.2.12"
implementation
"io.reactivex.rxjava2:rxkotlin:2.4.0"
...
...
app/src/main/java/com/topjohnwu/magisk/base/BaseActivity.kt
View file @
6a10cc9c
...
...
@@ -3,19 +3,17 @@ package com.topjohnwu.magisk.base
import
android.Manifest
import
android.content.Context
import
android.content.Intent
import
android.content.pm.PackageManager
import
android.content.res.Configuration
import
android.os.Bundle
import
androidx.appcompat.app.AppCompatActivity
import
androidx.appcompat.app.AppCompatDelegate
import
androidx.collection.SparseArrayCompat
import
androidx.core.app.ActivityCompat
import
androidx.core.content.ContextCompat
import
androidx.core.net.toUri
import
androidx.databinding.DataBindingUtil
import
androidx.databinding.ViewDataBinding
import
com.karumi.dexter.Dexter
import
com.karumi.dexter.MultiplePermissionsReport
import
com.karumi.dexter.PermissionToken
import
com.karumi.dexter.listener.PermissionRequest
import
com.karumi.dexter.listener.multi.MultiplePermissionsListener
import
com.topjohnwu.magisk.BR
import
com.topjohnwu.magisk.Config
import
com.topjohnwu.magisk.base.viewmodel.BaseViewModel
...
...
@@ -25,6 +23,7 @@ import com.topjohnwu.magisk.model.permissions.PermissionRequestBuilder
import
com.topjohnwu.magisk.utils.LocaleManager
import
com.topjohnwu.magisk.utils.Utils
import
com.topjohnwu.magisk.utils.currentLocale
import
kotlin.random.Random
typealias
RequestCallback
=
BaseActivity
<*,
*>.(
Int
,
Intent
?)
->
Unit
...
...
@@ -38,7 +37,7 @@ abstract class BaseActivity<ViewModel : BaseViewModel, Binding : ViewDataBinding
protected
open
val
navHostId
:
Int
=
0
protected
open
val
defaultPosition
:
Int
=
0
private
val
resultCallbacks
=
SparseArrayCompat
<
RequestCallback
>()
private
val
resultCallbacks
by
lazy
{
SparseArrayCompat
<
RequestCallback
>()
}
init
{
val
theme
=
if
(
Config
.
darkTheme
)
{
...
...
@@ -74,22 +73,38 @@ abstract class BaseActivity<ViewModel : BaseViewModel, Binding : ViewDataBinding
fun
withPermissions
(
vararg
permissions
:
String
,
builder
:
PermissionRequestBuilder
.()
->
Unit
)
{
val
request
=
PermissionRequestBuilder
().
apply
(
builder
).
build
()
Dexter
.
withActivity
(
this
)
.
withPermissions
(*
permissions
)
.
withListener
(
object
:
MultiplePermissionsListener
{
override
fun
onPermissionsChecked
(
report
:
MultiplePermissionsReport
)
{
if
(
report
.
areAllPermissionsGranted
())
{
val
ungranted
=
permissions
.
filter
{
ContextCompat
.
checkSelfPermission
(
this
,
it
)
!=
PackageManager
.
PERMISSION_GRANTED
}
if
(
ungranted
.
isEmpty
())
{
request
.
onSuccess
()
}
else
{
val
requestCode
=
Random
.
nextInt
(
256
,
512
)
resultCallbacks
[
requestCode
]
=
{
result
,
_
->
if
(
result
>
0
)
request
.
onSuccess
()
else
request
.
onFailure
()
}
ActivityCompat
.
requestPermissions
(
this
,
ungranted
.
toTypedArray
(),
requestCode
)
}
}
override
fun
onRequestPermissionsResult
(
requestCode
:
Int
,
permissions
:
Array
<
out
String
>,
grantResults
:
IntArray
)
{
var
success
=
true
for
(
res
in
grantResults
)
{
if
(
res
!=
PackageManager
.
PERMISSION_GRANTED
)
{
success
=
false
break
}
}
resultCallbacks
[
requestCode
]
?.
apply
{
resultCallbacks
.
remove
(
requestCode
)
invoke
(
this
@BaseActivity
,
if
(
success
)
1
else
-
1
,
null
)
}
override
fun
onPermissionRationaleShouldBeShown
(
permissions
:
MutableList
<
PermissionRequest
>,
token
:
PermissionToken
)
=
token
.
continuePermissionRequest
()
}).
check
()
}
fun
withExternalRW
(
builder
:
PermissionRequestBuilder
.()
->
Unit
)
{
...
...
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