moparisthebest/keepass2android
1
0
Fork 0
mirror of https://github.com/moparisthebest/keepass2android synced 2024-11-22 09:12:17 -05:00
Code Issues Releases Wiki Activity

resolve field references when displaying in EntryActivity or username in grouplist

Browse Source
This commit is contained in:
Philipp Crocoll 2016-02-15 22:22:48 +01:00
parent 17309ebb4a
commit 118bd4f6ee
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/keepass2android/EntryActivity.cs
View File

@ -39,6 +39,7 @@ using KeePassLib.Security;
using KeePassLib.Utility; using KeePassLib.Utility;
using Keepass2android.Pluginsdk; using Keepass2android.Pluginsdk;
using keepass2android.Io; using keepass2android.Io;
using KeePass.Util.Spr;
using Uri = Android.Net.Uri; using Uri = Android.Net.Uri;
namespace keepass2android namespace keepass2android
@ -341,8 +342,7 @@ namespace keepass2android
_appTask = AppTask.GetTaskInOnCreate(savedInstanceState, Intent); _appTask = AppTask.GetTaskInOnCreate(savedInstanceState, Intent);
Entry = db.Entries[uuid]; Entry = db.Entries[uuid];
Android.Util.Log.Debug("KP2A", "Notes: " + Entry.Strings.ReadSafe(PwDefs.NotesField));
// Refresh Menu contents in case onCreateMenuOptions was called before Entry was set // Refresh Menu contents in case onCreateMenuOptions was called before Entry was set
ActivityCompat.InvalidateOptionsMenu(this); ActivityCompat.InvalidateOptionsMenu(this);
@ -836,7 +836,9 @@ namespace keepass2android
private void PopulateStandardText(int viewId, int containerViewId, String key) private void PopulateStandardText(int viewId, int containerViewId, String key)
{ {
PopulateText(viewId, containerViewId, Entry.Strings.ReadSafe(key)); String value = Entry.Strings.ReadSafe(key);
value = SprEngine.Compile(value, new SprContext(Entry, App.Kp2a.GetDb().KpDatabase, SprCompileFlags.All));
PopulateText(viewId, containerViewId, value);
_stringViews.Add(key, new StandardStringView(viewId, containerViewId, this)); _stringViews.Add(key, new StandardStringView(viewId, containerViewId, this));
} }

2
src/keepass2android/views/PwEntryView.cs
View File

@ -24,6 +24,7 @@ using KeePassLib;
using Android.Text; using Android.Text;
using Android.Text.Style; using Android.Text.Style;
using Android.Preferences; using Android.Preferences;
using KeePass.Util.Spr;
namespace keepass2android.view namespace keepass2android.view
@ -134,6 +135,7 @@ namespace keepass2android.view
_textView.SetTextColor(new Color((int)_defaultTextColor)); _textView.SetTextColor(new Color((int)_defaultTextColor));
String detail = pw.Strings.ReadSafe(PwDefs.UserNameField); String detail = pw.Strings.ReadSafe(PwDefs.UserNameField);
detail = SprEngine.Compile(detail, new SprContext(_entry, App.Kp2a.GetDb().KpDatabase, SprCompileFlags.All));
if ((_showDetail == false) || (String.IsNullOrEmpty(detail))) if ((_showDetail == false) || (String.IsNullOrEmpty(detail)))
{ {