Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
briar
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
briar
briar
Commits
95cccd1d
Verified
Commit
95cccd1d
authored
4 years ago
by
akwizgran
Browse files
Options
Downloads
Patches
Plain Diff
Don't show duplicate unlock screen on API 29+.
parent
0a33c773
No related branches found
No related tags found
1 merge request
!1280
Don't show duplicate unlock screen on API 29+
Pipeline
#4752
passed
4 years ago
Stage: test
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
briar-android/src/main/java/org/briarproject/briar/android/account/UnlockActivity.java
+18
-8
18 additions, 8 deletions
...rg/briarproject/briar/android/account/UnlockActivity.java
with
18 additions
and
8 deletions
briar-android/src/main/java/org/briarproject/briar/android/account/UnlockActivity.java
+
18
−
8
View file @
95cccd1d
...
@@ -117,14 +117,24 @@ public class UnlockActivity extends BaseActivity {
...
@@ -117,14 +117,24 @@ public class UnlockActivity extends BaseActivity {
@RequiresApi
(
api
=
28
)
@RequiresApi
(
api
=
28
)
private
void
requestFingerprintUnlock
()
{
private
void
requestFingerprintUnlock
()
{
BiometricPrompt
biometricPrompt
=
new
Builder
(
this
)
BiometricPrompt
biometricPrompt
;
.
setTitle
(
getString
(
R
.
string
.
lock_unlock
))
if
(
SDK_INT
>=
29
)
{
.
setDescription
(
biometricPrompt
=
new
Builder
(
this
)
getString
(
R
.
string
.
lock_unlock_fingerprint_description
))
.
setTitle
(
getString
(
R
.
string
.
lock_unlock
))
.
setNegativeButton
(
getString
(
R
.
string
.
lock_unlock_password
),
.
setDescription
(
getString
(
getMainExecutor
(),
R
.
string
.
lock_unlock_fingerprint_description
))
(
dialog
,
which
)
->
requestKeyguardUnlock
())
.
setDeviceCredentialAllowed
(
true
)
.
build
();
.
build
();
}
else
{
biometricPrompt
=
new
Builder
(
this
)
.
setTitle
(
getString
(
R
.
string
.
lock_unlock
))
.
setDescription
(
getString
(
R
.
string
.
lock_unlock_fingerprint_description
))
.
setNegativeButton
(
getString
(
R
.
string
.
lock_unlock_password
),
getMainExecutor
(),
(
dialog
,
which
)
->
requestKeyguardUnlock
())
.
build
();
}
CancellationSignal
signal
=
new
CancellationSignal
();
CancellationSignal
signal
=
new
CancellationSignal
();
AuthenticationCallback
callback
=
new
AuthenticationCallback
()
{
AuthenticationCallback
callback
=
new
AuthenticationCallback
()
{
@Override
@Override
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment