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

fix QuickUnlock with Unicode characters like emojis (length correction was incorrect or misleading), fixes #161

Browse Source
This commit is contained in:
Philipp Crocoll
2018-01-22 13:07:04 +01:00
parent 8487555315
commit c4e67db75f
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/keepass2android/QuickUnlock.cs
View File

@@ -340,8 +340,13 @@ namespace keepass2android
{ {
KcpPassword kcpPassword = (KcpPassword) App.Kp2a.GetDb().KpDatabase.MasterKey.GetUserKey(typeof (KcpPassword)); KcpPassword kcpPassword = (KcpPassword) App.Kp2a.GetDb().KpDatabase.MasterKey.GetUserKey(typeof (KcpPassword));
String password = kcpPassword.Password.ReadString(); String password = kcpPassword.Password.ReadString();
String expectedPasswordPart = password.Substring(Math.Max(0, password.Length - _quickUnlockLength),
Math.Min(password.Length, _quickUnlockLength)); var passwordStringInfo = new System.Globalization.StringInfo(password);
int passwordLength = passwordStringInfo.LengthInTextElements;
String expectedPasswordPart = passwordStringInfo.SubstringByTextElements(Math.Max(0, passwordLength - _quickUnlockLength),
Math.Min(passwordLength, _quickUnlockLength));
return expectedPasswordPart; return expectedPasswordPart;
} }
} }