Compare commits

..

1 Commits

Author SHA1 Message Date
Philipp Crocoll
dfd101da77 do not log folder name to fix #2466 2024-01-02 16:34:30 +01:00
5 changed files with 5 additions and 12 deletions

View File

@@ -937,9 +937,10 @@ namespace keepass2android
iv.SetImageDrawable(Resources.GetDrawable(Resource.Drawable.ic00)); iv.SetImageDrawable(Resources.GetDrawable(Resource.Drawable.ic00));
} }
SupportActionBar.Title = Entry.Strings.ReadSafe(PwDefs.TitleField); SupportActionBar.Title = Entry.Strings.ReadSafe(PwDefs.TitleField);
SupportActionBar.Title = SprEngine.Compile(SupportActionBar.Title, new SprContext(Entry, App.Kp2a.CurrentDb.KpDatabase, SprCompileFlags.All)); SupportActionBar.SetDisplayHomeAsUpEnabled(true);
SupportActionBar.SetDisplayHomeAsUpEnabled(true);
SupportActionBar.SetHomeButtonEnabled(true); SupportActionBar.SetHomeButtonEnabled(true);
PopulateGroupText (Resource.Id.entry_group_name, Resource.Id.entryfield_group_container, KeyGroupFullPath); PopulateGroupText (Resource.Id.entry_group_name, Resource.Id.entryfield_group_container, KeyGroupFullPath);

View File

@@ -30,7 +30,6 @@ using KeePassLib;
using KeePassLib.Utility; using KeePassLib.Utility;
using System.Threading; using System.Threading;
using System.Collections.Generic; using System.Collections.Generic;
using KeePass.Util.Spr;
namespace keepass2android.search namespace keepass2android.search
{ {
@@ -295,10 +294,7 @@ namespace keepass2android.search
return Position.ToString(CultureInfo.InvariantCulture); return Position.ToString(CultureInfo.InvariantCulture);
case 1: // SuggestColumnText1 case 1: // SuggestColumnText1
string username = CurrentEntry.Strings.ReadSafe(PwDefs.UserNameField); string username = CurrentEntry.Strings.ReadSafe(PwDefs.UserNameField);
username = SprEngine.Compile(username, new SprContext(CurrentEntry, App.Kp2a.CurrentDb.KpDatabase, SprCompileFlags.All)); return CurrentEntry.Strings.ReadSafe(PwDefs.TitleField) + (string.IsNullOrWhiteSpace(username) ? "" : " ("+username+")");
var title = CurrentEntry.Strings.ReadSafe(PwDefs.TitleField);
title = SprEngine.Compile(title, new SprContext(CurrentEntry, App.Kp2a.CurrentDb.KpDatabase, SprCompileFlags.All));
return title + (string.IsNullOrWhiteSpace(username) ? "" : " ("+username+")");
case 2: // SuggestColumnText2 case 2: // SuggestColumnText2
return Internationalise(_entriesWithContexts[Position].resultContext); return Internationalise(_entriesWithContexts[Position].resultContext);
case 3: // SuggestColumnIcon1 case 3: // SuggestColumnIcon1

View File

@@ -10,7 +10,6 @@ using Android.OS;
using Android.Runtime; using Android.Runtime;
using Android.Views; using Android.Views;
using Android.Widget; using Android.Widget;
using KeePass.Util.Spr;
using keepass2android.services.AutofillBase; using keepass2android.services.AutofillBase;
using keepass2android.services.AutofillBase.model; using keepass2android.services.AutofillBase.model;
using Keepass2android.Pluginsdk; using Keepass2android.Pluginsdk;
@@ -109,7 +108,6 @@ namespace keepass2android.services.Kp2aAutofill
fieldCollection.DatasetName = pwEntry.Strings.ReadSafe(PwDefs.TitleField); fieldCollection.DatasetName = pwEntry.Strings.ReadSafe(PwDefs.TitleField);
fieldCollection.DatasetName = SprEngine.Compile(fieldCollection.DatasetName, new SprContext(pwEntry, App.Kp2a.CurrentDb.KpDatabase, SprCompileFlags.All));
return fieldCollection; return fieldCollection;
} }

View File

@@ -125,8 +125,7 @@ namespace keepass2android.view
} }
String title = pw.Strings.ReadSafe(PwDefs.TitleField); String title = pw.Strings.ReadSafe(PwDefs.TitleField);
title = SprEngine.Compile(title, new SprContext(_entry, db.KpDatabase, SprCompileFlags.All)); var str = new SpannableString(title);
var str = new SpannableString(title);
if (isExpired) if (isExpired)
{ {

View File

@@ -80,7 +80,6 @@ namespace keepass2android.view
private void PopulateView(View gv, PwGroup pw) private void PopulateView(View gv, PwGroup pw)
{ {
_pwGroup = pw; _pwGroup = pw;
Kp2aLog.Log($"Populating group view {_groupBaseActivity.IsFinishing} {pw.Name}");
if (_groupBaseActivity.IsFinishing) if (_groupBaseActivity.IsFinishing)
return; return;