rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Solve protected field display

Browse Source
This commit is contained in:
J-Jamet
2018-03-31 14:57:01 +02:00
parent 72b0cdf0d7
commit 90084ed2f7
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/keepassdroid/activities/EntryActivity.java
View File

@@ -304,10 +304,10 @@ public class EntryActivity extends LockingHideActivity {
MenuItem togglePassword = menu.findItem(R.id.menu_toggle_pass);
if (entryContentsView != null && togglePassword != null) {
if (!entryContentsView.isPasswordPresent()) {
togglePassword.setVisible(false);
} else {
if (entryContentsView.isPasswordPresent() || entryContentsView.atLeastOneFieldProtectedPresent()) {
changeShowPasswordIcon(togglePassword);
} else {
togglePassword.setVisible(false);
}
}

9
app/src/main/java/com/keepassdroid/view/EntryContentsView.java
View File

@@ -146,6 +146,15 @@ public class EntryContentsView extends LinearLayout {
return passwordContainerView.getVisibility() == VISIBLE;
}
public boolean atLeastOneFieldProtectedPresent() {
for (int i = 0; i < extrasView.getChildCount(); i++) {
View childCustomView = extrasView.getChildAt(i);
if (childCustomView instanceof EntryCustomFieldProtected)
return true;
}
return false;
}
public void setHiddenPasswordStyle(boolean hiddenStyle) {
if ( !hiddenStyle ) {
passwordView.setTransformationMethod(null);