Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-17 13:19:52 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '1716-duplicate-unlock-screen' into 'master'

Browse Source 
Don't show duplicate unlock screen on API 29+

Closes #1716

See merge request briar/briar!1280
This commit is contained in:
akwizgran
2020-09-04 12:07:46 +00:00
parent 0a33c77393 95cccd1d15
commit 3e5b7f451a
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
briar-android/src/main/java/org/briarproject/briar/android/account/UnlockActivity.java
View File

@@ -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