Compare commits
	
		
			1 Commits
		
	
	
		
			1327--repl
			...
			2458--seed
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|   | c934755e1c | 
| @@ -937,9 +937,10 @@ namespace keepass2android | ||||
| 				iv.SetImageDrawable(Resources.GetDrawable(Resource.Drawable.ic00)); | ||||
| 			} | ||||
|  | ||||
|  | ||||
|  | ||||
|             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); | ||||
|  | ||||
| 			PopulateGroupText (Resource.Id.entry_group_name, Resource.Id.entryfield_group_container, KeyGroupFullPath); | ||||
|   | ||||
| @@ -31,17 +31,8 @@ namespace PluginTOTP | ||||
| 				_muteWarnings = muteWarnings; | ||||
| 			} | ||||
|  | ||||
| 			/// <summary> | ||||
| 			/// Check if specified Entry contains Settings that are not null. | ||||
| 			/// </summary> | ||||
| 			internal bool SettingsCheck(IDictionary<string, string> entryFields) | ||||
| 			{ | ||||
| 				string settings; | ||||
| 				entryFields.TryGetValue(SettingsFieldName, out settings); | ||||
| 				return !String.IsNullOrEmpty(settings); | ||||
| 			} | ||||
|  | ||||
| 			internal bool SeedCheck(IDictionary<string, string> entryFields) | ||||
| 			 | ||||
| 			internal bool HasSeed(IDictionary<string, string> entryFields) | ||||
| 			{ | ||||
| 				string seed; | ||||
| 				entryFields.TryGetValue(SeedFieldName, out seed); | ||||
| @@ -100,15 +91,15 @@ namespace PluginTOTP | ||||
| 			} | ||||
|  | ||||
| 			private string[] SettingsGet(IDictionary<string, string> entryFields) | ||||
| 			{ | ||||
| 				return entryFields[SettingsFieldName].Split(';'); | ||||
| 			} | ||||
|             { | ||||
|                 return entryFields.TryGetValue(SettingsFieldName, out var settings) ? settings.Split(';') : new[] { "30", "6" }; | ||||
|             } | ||||
|  | ||||
| 			public TotpData GetTotpData(IDictionary<string, string> entryFields) | ||||
| 			{ | ||||
| 				TotpData res = new TotpData(); | ||||
|  | ||||
| 				if (SettingsCheck(entryFields) && SeedCheck(entryFields)) | ||||
| 				if (HasSeed(entryFields)) | ||||
| 				{ | ||||
| 					bool ValidInterval; bool ValidLength; bool ValidUrl; | ||||
| 					if (SettingsValidate(entryFields, out ValidInterval, out ValidLength, out ValidUrl)) | ||||
|   | ||||
| @@ -30,7 +30,6 @@ using KeePassLib; | ||||
| using KeePassLib.Utility; | ||||
| using System.Threading; | ||||
| using System.Collections.Generic; | ||||
| using KeePass.Util.Spr; | ||||
|  | ||||
| namespace keepass2android.search | ||||
| { | ||||
| @@ -295,10 +294,7 @@ namespace keepass2android.search | ||||
|                             return Position.ToString(CultureInfo.InvariantCulture); | ||||
|                         case 1: // SuggestColumnText1 | ||||
|                             string username = CurrentEntry.Strings.ReadSafe(PwDefs.UserNameField); | ||||
| 							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+")"); | ||||
|                             return CurrentEntry.Strings.ReadSafe(PwDefs.TitleField) + (string.IsNullOrWhiteSpace(username) ? "" : " ("+username+")"); | ||||
|                         case 2: // SuggestColumnText2 | ||||
|                                 return Internationalise(_entriesWithContexts[Position].resultContext); | ||||
|                         case 3: // SuggestColumnIcon1 | ||||
|   | ||||
| @@ -10,7 +10,6 @@ using Android.OS; | ||||
| 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; | ||||
| @@ -109,7 +108,6 @@ namespace keepass2android.services.Kp2aAutofill | ||||
|  | ||||
|  | ||||
|             fieldCollection.DatasetName = pwEntry.Strings.ReadSafe(PwDefs.TitleField); | ||||
|             fieldCollection.DatasetName = SprEngine.Compile(fieldCollection.DatasetName, new SprContext(pwEntry, App.Kp2a.CurrentDb.KpDatabase, SprCompileFlags.All)); | ||||
|  | ||||
|             return fieldCollection; | ||||
|         } | ||||
|   | ||||
| @@ -125,8 +125,7 @@ namespace keepass2android.view | ||||
| 			} | ||||
|  | ||||
| 			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) | ||||
| 			{ | ||||
|   | ||||
		Reference in New Issue
	
	Block a user