From d697b93f6a90484454e6de32193b555436db5674 Mon Sep 17 00:00:00 2001 From: Philipp Crocoll Date: Mon, 16 Dec 2019 12:05:10 +0100 Subject: [PATCH] allow to show attachments for template entries --- src/keepass2android/EntryEditActivity.cs | 7 ++++++- src/keepass2android/EntryEditActivityState.cs | 16 +++++++++++----- src/keepass2android/KpEntryTemplatedEdit.cs | 14 +++++++++----- 3 files changed, 26 insertions(+), 11 deletions(-) diff --git a/src/keepass2android/EntryEditActivity.cs b/src/keepass2android/EntryEditActivity.cs index 002ca67d..cc5e811c 100644 --- a/src/keepass2android/EntryEditActivity.cs +++ b/src/keepass2android/EntryEditActivity.cs @@ -915,7 +915,12 @@ namespace keepass2android item.SetVisible(false); foreach (View v in _editModeHiddenViews) v.Visibility = ViewStates.Visible; - return true; + State.EditMode.ShowAddAttachments = true; + ViewGroup binariesGroup = (ViewGroup)FindViewById(Resource.Id.binaries); + binariesGroup.Visibility = ViewStates.Visible; + FindViewById(Resource.Id.entry_binaries_container).Visibility = ViewStates.Visible; + + return true; case Android.Resource.Id.Home: OnBackPressed(); return true; diff --git a/src/keepass2android/EntryEditActivityState.cs b/src/keepass2android/EntryEditActivityState.cs index b3c45275..7cebeee7 100644 --- a/src/keepass2android/EntryEditActivityState.cs +++ b/src/keepass2android/EntryEditActivityState.cs @@ -18,12 +18,18 @@ namespace keepass2android return keys; } - public virtual bool ShowAddAttachments - { - get { return true; } - } + protected bool? manualShowAddAttachments = null; - public virtual bool ShowAddExtras + public virtual bool ShowAddAttachments + { + get + { + if (manualShowAddAttachments != null) return (bool)manualShowAddAttachments; + return true; } + set { manualShowAddAttachments = value; } + } + + public virtual bool ShowAddExtras { get { return true; } } diff --git a/src/keepass2android/KpEntryTemplatedEdit.cs b/src/keepass2android/KpEntryTemplatedEdit.cs index 85f5c72b..0ed60edc 100644 --- a/src/keepass2android/KpEntryTemplatedEdit.cs +++ b/src/keepass2android/KpEntryTemplatedEdit.cs @@ -138,12 +138,16 @@ namespace keepass2android return keys.OrderBy(s => s, c); } - public override bool ShowAddAttachments - { - get { return false; } - } + public override bool ShowAddAttachments + { + get + { + if (manualShowAddAttachments != null) return (bool)manualShowAddAttachments; + return false; + } + } - public override bool ShowAddExtras + public override bool ShowAddExtras { get { return false; } }