Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
permission_handler
Overview
Overview
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
songyanzhi
permission_handler
Commits
252c844d
Commit
252c844d
authored
Jan 22, 2019
by
Maurits van Beusekom
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve permission checks
parent
0ea46a6b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
4 deletions
+12
-4
android/src/main/kotlin/com/baseflow/permissionhandler/PermissionHandlerPlugin.kt
+11
-3
example/android/build.gradle
+1
-1
No files found.
android/src/main/kotlin/com/baseflow/permissionhandler/PermissionHandlerPlugin.kt
View file @
252c844d
...
@@ -149,8 +149,13 @@ class PermissionHandlerPlugin(private val registrar: Registrar, private var requ
...
@@ -149,8 +149,13 @@ class PermissionHandlerPlugin(private val registrar: Registrar, private var requ
val
targetsMOrHigher
=
context
.
applicationInfo
.
targetSdkVersion
>=
android
.
os
.
Build
.
VERSION_CODES
.
M
val
targetsMOrHigher
=
context
.
applicationInfo
.
targetSdkVersion
>=
android
.
os
.
Build
.
VERSION_CODES
.
M
for
(
name
in
names
)
{
for
(
name
in
names
)
{
if
(
targetsMOrHigher
&&
ContextCompat
.
checkSelfPermission
(
context
,
name
)
!=
PackageManager
.
PERMISSION_GRANTED
)
{
if
(
targetsMOrHigher
)
{
return
PermissionStatus
.
DENIED
val
permissionStatus
=
ContextCompat
.
checkSelfPermission
(
context
,
name
)
if
(
permissionStatus
==
PackageManager
.
PERMISSION_DENIED
)
{
return
PermissionStatus
.
DENIED
}
else
if
(
permissionStatus
!=
PackageManager
.
PERMISSION_GRANTED
)
{
return
PermissionStatus
.
UNKNOWN
}
}
}
}
}
...
@@ -258,7 +263,10 @@ class PermissionHandlerPlugin(private val registrar: Registrar, private var requ
...
@@ -258,7 +263,10 @@ class PermissionHandlerPlugin(private val registrar: Registrar, private var requ
}
else
if
(
permission
==
PermissionGroup
.
LOCATION
)
{
}
else
if
(
permission
==
PermissionGroup
.
LOCATION
)
{
val
context
:
Context
?
=
registrar
.
activity
()
?:
registrar
.
activeContext
()
val
context
:
Context
?
=
registrar
.
activity
()
?:
registrar
.
activeContext
()
val
isLocationServiceEnabled
=
if
(
context
==
null
)
false
else
isLocationServiceEnabled
(
context
)
val
isLocationServiceEnabled
=
if
(
context
==
null
)
false
else
isLocationServiceEnabled
(
context
)
val
permissionStatus
=
if
(
isLocationServiceEnabled
)
grantResults
[
i
].
toPermissionStatus
()
else
PermissionStatus
.
DISABLED
var
permissionStatus
=
grantResults
[
i
].
toPermissionStatus
()
if
(
permissionStatus
==
PermissionStatus
.
GRANTED
&&
!
isLocationServiceEnabled
)
{
permissionStatus
=
PermissionStatus
.
DISABLED
}
if
(!
mRequestResults
.
containsKey
(
PermissionGroup
.
LOCATION_ALWAYS
))
{
if
(!
mRequestResults
.
containsKey
(
PermissionGroup
.
LOCATION_ALWAYS
))
{
mRequestResults
[
PermissionGroup
.
LOCATION_ALWAYS
]
=
permissionStatus
mRequestResults
[
PermissionGroup
.
LOCATION_ALWAYS
]
=
permissionStatus
...
...
example/android/build.gradle
View file @
252c844d
...
@@ -6,7 +6,7 @@ buildscript {
...
@@ -6,7 +6,7 @@ buildscript {
}
}
dependencies
{
dependencies
{
classpath
'com.android.tools.build:gradle:3.2.
0
'
classpath
'com.android.tools.build:gradle:3.2.
1
'
classpath
"org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath
"org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
}
}
...
...
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