这是indexloc提供的服务，不要输入任何密码
Skip to content

Update to BiometricManager #376

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update to BiometricManager #376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9041da
Update to BiometricManager
danog Sep 30, 2020
285584a
Update build.gradle
danog Sep 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ android {
}

dependencies {
implementation 'com.google.android.material:material:1.0.0'
implementation 'androidx.biometric:biometric:1.0.0-alpha04'
implementation "androidx.media:media:1.1.0"
implementation 'com.google.android.material:material:1.2.1'
implementation 'androidx.biometric:biometric:1.0.1'
implementation "androidx.media:media:1.2.0"
}

task versionName {
Expand Down
15 changes: 10 additions & 5 deletions app/src/main/java/com/termux/api/FingerprintAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@

import androidx.annotation.NonNull;
import androidx.biometric.BiometricConstants;
import androidx.biometric.BiometricManager;
import androidx.biometric.BiometricPrompt;
import androidx.core.hardware.fingerprint.FingerprintManagerCompat;
import androidx.fragment.app.FragmentActivity;

import com.termux.api.util.ResultReturner;
Expand Down Expand Up @@ -71,7 +71,7 @@ static void onReceive(final Context context, final Intent intent) {
resetFingerprintResult();

if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
FingerprintManagerCompat fingerprintManagerCompat = FingerprintManagerCompat.from(context);
BiometricManager fingerprintManagerCompat = BiometricManager.from(context);
// make sure we have a valid fingerprint sensor before attempting to launch Fingerprint activity
if (validateFingerprintSensor(context, fingerprintManagerCompat)) {
Intent fingerprintIntent = new Intent(context, FingerprintActivity.class);
Expand Down Expand Up @@ -120,16 +120,21 @@ public void writeJson(JsonWriter out) throws Exception {
* Ensure that we have a fingerprint sensor and that the user has already enrolled fingerprints
*/
@TargetApi(Build.VERSION_CODES.M)
protected static boolean validateFingerprintSensor(Context context, FingerprintManagerCompat fingerprintManagerCompat) {
protected static boolean validateFingerprintSensor(Context context, BiometricManager biometricManager) {
boolean result = true;

if (!fingerprintManagerCompat.isHardwareDetected()) {
if (biometricManager.canAuthenticate() == BiometricManager.BIOMETRIC_ERROR_NO_HARDWARE) {
Toast.makeText(context, "No fingerprint scanner found!", Toast.LENGTH_SHORT).show();
appendFingerprintError(ERROR_NO_HARDWARE);
result = false;
}
if (biometricManager.canAuthenticate() == BiometricManager.BIOMETRIC_ERROR_HW_UNAVAILABLE) {
Toast.makeText(context, "No fingerprint scanner available!", Toast.LENGTH_SHORT).show();
appendFingerprintError(ERROR_NO_HARDWARE);
result = false;
}

if (!fingerprintManagerCompat.hasEnrolledFingerprints()) {
if (biometricManager.canAuthenticate() == BiometricManager.BIOMETRIC_ERROR_NONE_ENROLLED) {
Toast.makeText(context, "No fingerprints enrolled", Toast.LENGTH_SHORT).show();
appendFingerprintError(ERROR_NO_ENROLLED_FINGERPRINTS);
result = false;
Expand Down
29 changes: 0 additions & 29 deletions app/src/main/res/layout/activity_permission.xml
View file
Open in desktop

This file was deleted.