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

Merge branch 'patch-password-cursor' of https://github.com/DDoSolitary/keepass2android

Browse Source
This commit is contained in:
Philipp Crocoll
2019-08-15 05:48:53 +02:00
parent 7354c8933c b89f3906e9
commit 134234da12
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/keepass2android/CreateDatabaseActivity.cs
View File

@@ -150,6 +150,7 @@ namespace keepass2android
{ {
TextView password = (TextView)FindViewById(Resource.Id.entry_password); TextView password = (TextView)FindViewById(Resource.Id.entry_password);
TextView confpassword = (TextView)FindViewById(Resource.Id.entry_confpassword); TextView confpassword = (TextView)FindViewById(Resource.Id.entry_confpassword);
int selStart = password.SelectionStart, selEnd = password.SelectionEnd;
if (_showPassword) if (_showPassword)
{ {
password.InputType = InputTypes.ClassText | InputTypes.TextVariationVisiblePassword; password.InputType = InputTypes.ClassText | InputTypes.TextVariationVisiblePassword;
@@ -161,7 +162,7 @@ namespace keepass2android
password.InputType = InputTypes.ClassText | InputTypes.TextVariationPassword; password.InputType = InputTypes.ClassText | InputTypes.TextVariationPassword;
confpassword.Visibility = ViewStates.Visible; confpassword.Visibility = ViewStates.Visible;
} }
password.SetSelection(selStart, selEnd);
} }
private void CreateDatabase(bool makeCurrent) private void CreateDatabase(bool makeCurrent)

2
src/keepass2android/EntryEditActivity.cs
View File

@@ -393,6 +393,7 @@ namespace keepass2android
{ {
TextView password = (TextView) FindViewById(Resource.Id.entry_password); TextView password = (TextView) FindViewById(Resource.Id.entry_password);
TextView confpassword = (TextView) FindViewById(Resource.Id.entry_confpassword); TextView confpassword = (TextView) FindViewById(Resource.Id.entry_confpassword);
int selStart = password.SelectionStart, selEnd = password.SelectionEnd;
if (State.ShowPassword) if (State.ShowPassword)
{ {
password.InputType = InputTypes.ClassText | InputTypes.TextVariationVisiblePassword; password.InputType = InputTypes.ClassText | InputTypes.TextVariationVisiblePassword;
@@ -403,6 +404,7 @@ namespace keepass2android
password.InputType = InputTypes.ClassText | InputTypes.TextVariationPassword; password.InputType = InputTypes.ClassText | InputTypes.TextVariationPassword;
confpassword.Visibility = ViewStates.Visible; confpassword.Visibility = ViewStates.Visible;
} }
password.SetSelection(selStart, selEnd);
} }
void SaveEntry() void SaveEntry()

3
src/keepass2android/PasswordActivity.cs
View File

@@ -1498,6 +1498,7 @@ namespace keepass2android
private void MakePasswordMaskedOrVisible() private void MakePasswordMaskedOrVisible()
{ {
TextView password = (TextView) FindViewById(Resource.Id.password_edit); TextView password = (TextView) FindViewById(Resource.Id.password_edit);
int selStart = password.SelectionStart, selEnd = password.SelectionEnd;
if (_showPassword) if (_showPassword)
{ {
password.InputType = InputTypes.ClassText | InputTypes.TextVariationVisiblePassword; password.InputType = InputTypes.ClassText | InputTypes.TextVariationVisiblePassword;
@@ -1507,7 +1508,7 @@ namespace keepass2android
{ {
password.InputType = InputTypes.ClassText | InputTypes.TextVariationPassword; password.InputType = InputTypes.ClassText | InputTypes.TextVariationPassword;
} }
password.SetSelection(selStart, selEnd);
} }
protected override void OnPause() protected override void OnPause()