qwe/keepass2android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix crash when no FingerprintManager is available, fixes #474

Browse Source
This commit is contained in:
Philipp Crocoll
2018-08-15 04:47:38 +02:00
parent f3a857f26f
commit 0ef73952b1
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/keepass2android/FingerprintModule.cs
View File

@@ -34,7 +34,7 @@ namespace keepass2android
public FingerprintManager FingerprintManager
{
get { return (FingerprintManager) Context.GetSystemService(Context.FingerprintService); }
get { return Context.GetSystemService(Context.FingerprintService) as FingerprintManager; }
}
public KeyguardManager KeyguardManager

2
src/keepass2android/FingerprintSetupActivity.cs
View File

@@ -223,7 +223,7 @@ namespace keepass2android
if (requestCode == FingerprintPermissionRequestCode && grantResults[0] == Permission.Granted)
{
FingerprintModule fpModule = new FingerprintModule(this);
if (!fpModule.FingerprintManager.IsHardwareDetected)
if (fpModule.FingerprintManager == null || (!fpModule.FingerprintManager.IsHardwareDetected))
{
//seems like not all Samsung Devices (e.g. Note 4) don't support the Android 6 fingerprint API
if (!TrySetupSamsung())

2
src/keepass2android/GroupBaseActivity.cs
View File

@@ -633,7 +633,7 @@ namespace keepass2android
{
FingerprintModule fpModule = new FingerprintModule(this);
if (fpModule.FingerprintManager.IsHardwareDetected)
if (fpModule.FingerprintManager != null && fpModule.FingerprintManager.IsHardwareDetected)
{
FingerprintUnlockMode um;
Enum.TryParse(_prefs.GetString(Database.GetFingerprintModePrefKey(App.Kp2a.GetDb().Ioc), ""), out um);