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

don't try to use samsung api if Fingprint Unlock with Android API is set up, should fix #126

Browse Source
This commit is contained in:
Philipp Crocoll
2018-07-23 10:07:30 +02:00
parent 7a860f8564
commit c452a66a4f
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/keepass2android/FingerprintModule.cs
View File

@@ -265,6 +265,11 @@ namespace keepass2android
_iv = Base64.Decode(PreferenceManager.GetDefaultSharedPreferences(context).GetString(GetIvPrefKey(prefKey), null), 0); _iv = Base64.Decode(PreferenceManager.GetDefaultSharedPreferences(context).GetString(GetIvPrefKey(prefKey), null), 0);
} }
public static bool IsSetUp(Context context, string prefKey)
{
return PreferenceManager.GetDefaultSharedPreferences(context).GetString(GetIvPrefKey(prefKey), null) != null;
}
public override bool Init() public override bool Init()
{ {
Kp2aLog.Log("FP: Init for Dec"); Kp2aLog.Log("FP: Init for Dec");

9
src/keepass2android/QuickUnlock.cs
View File

@@ -261,7 +261,7 @@ namespace keepass2android
_fingerprintIdentifier = new FingerprintDecryption(fpModule, App.Kp2a.GetDb().CurrentFingerprintPrefKey, this, _fingerprintIdentifier = new FingerprintDecryption(fpModule, App.Kp2a.GetDb().CurrentFingerprintPrefKey, this,
App.Kp2a.GetDb().CurrentFingerprintPrefKey); App.Kp2a.GetDb().CurrentFingerprintPrefKey);
} }
if (_fingerprintIdentifier == null) if ((_fingerprintIdentifier == null) && (!FingerprintDecryption.IsSetUp(this, App.Kp2a.GetDb().CurrentFingerprintPrefKey)))
{ {
try try
{ {
@@ -277,11 +277,14 @@ namespace keepass2android
catch (Exception) catch (Exception)
{ {
Kp2aLog.Log("trying Samsung Fingerprint API...failed."); Kp2aLog.Log("trying Samsung Fingerprint API...failed.");
FindViewById<ImageButton>(Resource.Id.fingerprintbtn).Visibility = ViewStates.Gone;
_fingerprintIdentifier = null; _fingerprintIdentifier = null;
return false;
} }
} }
if (_fingerprintIdentifier == null)
{
FindViewById<ImageButton>(Resource.Id.fingerprintbtn).Visibility = ViewStates.Gone;
return false;
}
btn.Tag = GetString(Resource.String.fingerprint_unlock_hint); btn.Tag = GetString(Resource.String.fingerprint_unlock_hint);
if (_fingerprintIdentifier.Init()) if (_fingerprintIdentifier.Init())