From 893ecb6a91d5bedc04b3e487dc9b1ff172c4e142 Mon Sep 17 00:00:00 2001 From: Brian Pellin Date: Thu, 2 Nov 2017 21:27:30 -0500 Subject: [PATCH] Limit unneeded fingerprint problem messages. --- .../com/keepassdroid/PasswordActivity.java | 12 ++++++++-- .../fingerprint/FingerPrintHelper.java | 23 ++++++++++++++++++- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/keepassdroid/PasswordActivity.java b/app/src/main/java/com/keepassdroid/PasswordActivity.java index a50f9d73c..61b2b8cb0 100644 --- a/app/src/main/java/com/keepassdroid/PasswordActivity.java +++ b/app/src/main/java/com/keepassdroid/PasswordActivity.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2016 Brian Pellin. + * Copyright 2009-2017 Brian Pellin. * * This file is part of KeePassDroid. * @@ -455,8 +455,16 @@ public class PasswordActivity extends LockingActivity implements FingerPrintHelp @Override public void onException() { - Toast.makeText(this, R.string.fingerprint_error, Toast.LENGTH_SHORT).show(); + onException(true); + } + + @Override + public void onException(boolean showMessage) { + if (showMessage) { + Toast.makeText(this, R.string.fingerprint_error, Toast.LENGTH_SHORT).show(); + } checkAvailability(); // restarts listening + } private class DefaultCheckChange implements CompoundButton.OnCheckedChangeListener { diff --git a/app/src/main/java/com/keepassdroid/fingerprint/FingerPrintHelper.java b/app/src/main/java/com/keepassdroid/fingerprint/FingerPrintHelper.java index 12030e02a..2fcd2a29f 100644 --- a/app/src/main/java/com/keepassdroid/fingerprint/FingerPrintHelper.java +++ b/app/src/main/java/com/keepassdroid/fingerprint/FingerPrintHelper.java @@ -1,3 +1,22 @@ +/* + * Copyright 2017 Hans Cappelle + * + * This file is part of KeePassDroid. + * + * KeePassDroid is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * KeePassDroid is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with KeePassDroid. If not, see . + * + */ package com.keepassdroid.fingerprint; import android.annotation.SuppressLint; @@ -81,6 +100,8 @@ public class FingerPrintHelper { void onException(); + void onException(boolean showWarningMessage); + } @TargetApi(BuildCompat.VERSION_CODE_M) @@ -175,7 +196,7 @@ public class FingerPrintHelper { if (!isFingerprintInitialized()) { if (fingerPrintCallback != null) { - fingerPrintCallback.onException(); + fingerPrintCallback.onException(false); } return; }