Compare commits

...

1 Commits

Author SHA1 Message Date
Philipp Crocoll
c934755e1c make settings field for TrayTotp style otp entries optional
closes https://github.com/PhilippC/keepass2android/issues/2458
2024-01-03 08:06:20 +01:00

View File

@@ -31,17 +31,8 @@ namespace PluginTOTP
_muteWarnings = muteWarnings; _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; string seed;
entryFields.TryGetValue(SeedFieldName, out seed); entryFields.TryGetValue(SeedFieldName, out seed);
@@ -101,14 +92,14 @@ namespace PluginTOTP
private string[] SettingsGet(IDictionary<string, string> entryFields) 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) public TotpData GetTotpData(IDictionary<string, string> entryFields)
{ {
TotpData res = new TotpData(); TotpData res = new TotpData();
if (SettingsCheck(entryFields) && SeedCheck(entryFields)) if (HasSeed(entryFields))
{ {
bool ValidInterval; bool ValidLength; bool ValidUrl; bool ValidInterval; bool ValidLength; bool ValidUrl;
if (SettingsValidate(entryFields, out ValidInterval, out ValidLength, out ValidUrl)) if (SettingsValidate(entryFields, out ValidInterval, out ValidLength, out ValidUrl))