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

fix merge issue

Browse Source
This commit is contained in:
Philipp Crocoll
2024-01-15 06:56:32 +01:00
parent 63631fa81f
commit 94ec8cf1ac
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/keepass2android/EntryActivity.cs
View File

@@ -975,7 +975,7 @@ namespace keepass2android
FindViewById(Resource.Id.password_vdots), PwDefs.PasswordField, FindViewById(Resource.Id.password_vdots), PwDefs.PasswordField,
FindViewById(Resource.Id.entryfield_container_password)); FindViewById(Resource.Id.entryfield_container_password));
RegisterTextPopup(FindViewById<RelativeLayout>(Resource.Id.totp_container), RegisterTextPopup(FindViewById<RelativeLayout>(Resource.Id.totp_container),
FindViewById(Resource.Id.totp_vdots), Kp2aTotp.TotpKey); FindViewById(Resource.Id.totp_vdots), Kp2aTotp.TotpKey, FindViewById(Resource.Id.entryfield_container_totp));
PopulateText(Resource.Id.entry_created, Resource.Id.entryfield_container_created, getDateTime(Entry.CreationTime)); PopulateText(Resource.Id.entry_created, Resource.Id.entryfield_container_created, getDateTime(Entry.CreationTime));