Merge pull request #2493 from PhilippC/1327--replace-placeholders-in-…

…more-places replace placeholder in title for viewing entries and autofill entry a…
PhilippC · Jan 3, 2024 · 674ae26 · 674ae26
2 parents d2778e8 + 9f08e00
commit 674ae26
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/src/keepass2android/EntryActivity.cs b/src/keepass2android/EntryActivity.cs
@@ -937,10 +937,9 @@ protected void FillData()
 				iv.SetImageDrawable(Resources.GetDrawable(Resource.Drawable.ic00));
 			}
 
-
-
             SupportActionBar.Title = Entry.Strings.ReadSafe(PwDefs.TitleField);
-            SupportActionBar.SetDisplayHomeAsUpEnabled(true);
+            SupportActionBar.Title = SprEngine.Compile(SupportActionBar.Title, new SprContext(Entry, App.Kp2a.CurrentDb.KpDatabase, SprCompileFlags.All));
+			SupportActionBar.SetDisplayHomeAsUpEnabled(true);
             SupportActionBar.SetHomeButtonEnabled(true);
 
 			PopulateGroupText (Resource.Id.entry_group_name, Resource.Id.entryfield_group_container, KeyGroupFullPath);

diff --git a/src/keepass2android/search/SearchProvider.cs b/src/keepass2android/search/SearchProvider.cs
@@ -30,6 +30,7 @@ You should have received a copy of the GNU General Public License
 using KeePassLib.Utility;
 using System.Threading;
 using System.Collections.Generic;
+using KeePass.Util.Spr;
 
 namespace keepass2android.search
 {
@@ -294,7 +295,10 @@ public override string GetString(int column)
                             return Position.ToString(CultureInfo.InvariantCulture);
                         case 1: // SuggestColumnText1
                             string username = CurrentEntry.Strings.ReadSafe(PwDefs.UserNameField);
-                            return CurrentEntry.Strings.ReadSafe(PwDefs.TitleField) + (string.IsNullOrWhiteSpace(username) ? "" : " ("+username+")");
+							username = SprEngine.Compile(username, new SprContext(CurrentEntry, App.Kp2a.CurrentDb.KpDatabase, SprCompileFlags.All));
+                            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
                                 return Internationalise(_entriesWithContexts[Position].resultContext);
                         case 3: // SuggestColumnIcon1

diff --git a/src/keepass2android/services/Kp2aAutofill/ChooseForAutofillActivity.cs b/src/keepass2android/services/Kp2aAutofill/ChooseForAutofillActivity.cs
@@ -10,6 +10,7 @@
 using Android.Runtime;
 using Android.Views;
 using Android.Widget;
+using KeePass.Util.Spr;
 using keepass2android.services.AutofillBase;
 using keepass2android.services.AutofillBase.model;
 using Keepass2android.Pluginsdk;
@@ -108,6 +109,7 @@ public static FilledAutofillFieldCollection<ViewNodeInputField> GetFilledAutofil
 
 
             fieldCollection.DatasetName = pwEntry.Strings.ReadSafe(PwDefs.TitleField);
+            fieldCollection.DatasetName = SprEngine.Compile(fieldCollection.DatasetName, new SprContext(pwEntry, App.Kp2a.CurrentDb.KpDatabase, SprCompileFlags.All));
 
             return fieldCollection;
         }

diff --git a/src/keepass2android/views/PwEntryView.cs b/src/keepass2android/views/PwEntryView.cs
@@ -125,7 +125,8 @@ private void PopulateView(View ev, PwEntry pw, int pos)
 			}
 
 			String title = pw.Strings.ReadSafe(PwDefs.TitleField);
-			var str = new SpannableString(title);
+            title = SprEngine.Compile(title, new SprContext(_entry, db.KpDatabase, SprCompileFlags.All));
+            var str = new SpannableString(title);
 
 			if (isExpired)
 			{