Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
VideoLAN
VLC-iOS
Commits
ab09092d
Commit
ab09092d
authored
Feb 14, 2018
by
Carola
Browse files
KeychainCoordinator: don't prompt for TouchID if it's disabled in the settings
(cherry picked from commit
c5a1cbc9
)
parent
9af5072e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Sources/KeychainCoordinator.swift
View file @
ab09092d
...
@@ -19,12 +19,20 @@ class KeychainCoordinator:NSObject, PAPasscodeViewControllerDelegate {
...
@@ -19,12 +19,20 @@ class KeychainCoordinator:NSObject, PAPasscodeViewControllerDelegate {
@objc
class
var
passcodeLockEnabled
:
Bool
{
@objc
class
var
passcodeLockEnabled
:
Bool
{
return
UserDefaults
.
standard
.
bool
(
forKey
:
kVLCSettingPasscodeOnKey
)
return
UserDefaults
.
standard
.
bool
(
forKey
:
kVLCSettingPasscodeOnKey
)
}
}
private
var
laContext
=
LAContext
()
private
var
touchIDEnabled
:
Bool
{
private
var
touchIDEnabled
:
Bool
{
return
UserDefaults
.
standard
.
bool
(
forKey
:
kVLCSettingPasscodeAllowTouchID
)
var
touchIDEnabled
=
UserDefaults
.
standard
.
bool
(
forKey
:
kVLCSettingPasscodeAllowTouchID
)
if
#available(iOS 11.0, *)
{
touchIDEnabled
=
touchIDEnabled
&&
laContext
.
biometryType
==
.
touchID
}
return
touchIDEnabled
}
}
private
var
faceIDEnabled
:
Bool
{
private
var
faceIDEnabled
:
Bool
{
return
UserDefaults
.
standard
.
bool
(
forKey
:
kVLCSettingPasscodeAllowFaceID
)
var
faceIDEnabled
=
UserDefaults
.
standard
.
bool
(
forKey
:
kVLCSettingPasscodeAllowFaceID
)
if
#available(iOS 11.0, *)
{
faceIDEnabled
=
faceIDEnabled
&&
laContext
.
biometryType
==
.
faceID
}
return
faceIDEnabled
}
}
static
let
passcodeService
=
"org.videolan.vlc-ios.passcode"
static
let
passcodeService
=
"org.videolan.vlc-ios.passcode"
...
@@ -96,7 +104,7 @@ class KeychainCoordinator:NSObject, PAPasscodeViewControllerDelegate {
...
@@ -96,7 +104,7 @@ class KeychainCoordinator:NSObject, PAPasscodeViewControllerDelegate {
if
(
avoidPromptingTouchOrFaceID
||
UIApplication
.
shared
.
applicationState
!=
.
active
)
{
if
(
avoidPromptingTouchOrFaceID
||
UIApplication
.
shared
.
applicationState
!=
.
active
)
{
return
return
}
}
let
laContext
=
LAContext
()
if
laContext
.
canEvaluatePolicy
(
.
deviceOwnerAuthenticationWithBiometrics
,
error
:
nil
){
if
laContext
.
canEvaluatePolicy
(
.
deviceOwnerAuthenticationWithBiometrics
,
error
:
nil
){
avoidPromptingTouchOrFaceID
=
true
avoidPromptingTouchOrFaceID
=
true
laContext
.
evaluatePolicy
(
.
deviceOwnerAuthenticationWithBiometrics
,
laContext
.
evaluatePolicy
(
.
deviceOwnerAuthenticationWithBiometrics
,
...
...
Write
Preview
Supports
Markdown
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