diff --git a/GreenshotJiraPlugin/JiraConnector.cs b/GreenshotJiraPlugin/JiraConnector.cs index 1eb02c3bb..cc4e980de 100644 --- a/GreenshotJiraPlugin/JiraConnector.cs +++ b/GreenshotJiraPlugin/JiraConnector.cs @@ -42,11 +42,6 @@ namespace GreenshotJiraPlugin { private JiraApi _jiraApi; public void Dispose() { - Dispose(true); - GC.SuppressFinalize(this); - } - - protected void Dispose(bool disposing) { if (_jiraApi != null) { Task.Run(async () => await Logout()).Wait(); @@ -59,10 +54,6 @@ namespace GreenshotJiraPlugin { _jiraApi = new JiraApi(new Uri(_url)); } - ~JiraConnector() { - Dispose(false); - } - /// /// Internal login which catches the exceptions /// diff --git a/GreenshotJiraPlugin/JiraDestination.cs b/GreenshotJiraPlugin/JiraDestination.cs index ba78a1fe4..8326e320c 100644 --- a/GreenshotJiraPlugin/JiraDestination.cs +++ b/GreenshotJiraPlugin/JiraDestination.cs @@ -52,11 +52,7 @@ namespace GreenshotJiraPlugin { _jira = jira; } - public override string Designation { - get { - return "Jira"; - } - } + public override string Designation => "Jira"; private string FormatUpload(Issue jira) { return Designation + " - " + jira.Key + ": " + jira.Fields.Summary.Substring(0, Math.Min(20, jira.Fields.Summary.Length)); @@ -72,17 +68,10 @@ namespace GreenshotJiraPlugin { } } - public override bool isActive { - get { - return base.isActive && !string.IsNullOrEmpty(Config.Url); - } - } + public override bool isActive => base.isActive && !string.IsNullOrEmpty(Config.Url); + + public override bool isDynamic => true; - public override bool isDynamic { - get { - return true; - } - } public override Image DisplayIcon { get { var resources = new ComponentResourceManager(typeof(JiraPlugin)); diff --git a/GreenshotJiraPlugin/JiraPlugin.cs b/GreenshotJiraPlugin/JiraPlugin.cs index 1133fdca5..3f2cdc969 100644 --- a/GreenshotJiraPlugin/JiraPlugin.cs +++ b/GreenshotJiraPlugin/JiraPlugin.cs @@ -32,7 +32,6 @@ namespace GreenshotJiraPlugin { /// public class JiraPlugin : IGreenshotPlugin { private static readonly log4net.ILog Log = log4net.LogManager.GetLogger(typeof(JiraPlugin)); - private PluginAttribute _jiraPluginAttributes; private JiraConnector _jiraConnector; private JiraConfiguration _config; private static JiraPlugin _instance; @@ -51,21 +50,11 @@ namespace GreenshotJiraPlugin { } } - public static JiraPlugin Instance { - get { - return _instance; - } - } + public static JiraPlugin Instance => _instance; public JiraPlugin() { _instance = this; } - - public PluginAttribute JiraPluginAttributes { - get { - return _jiraPluginAttributes; - } - } public IEnumerable Destinations() { yield return new JiraDestination(this); @@ -76,12 +65,8 @@ namespace GreenshotJiraPlugin { } //Needed for a fail-fast - public JiraConnector CurrentJiraConnector { - get { - return _jiraConnector; - } - } - + public JiraConnector CurrentJiraConnector => _jiraConnector; + public JiraConnector JiraConnector { get { if (_jiraConnector == null) { @@ -98,8 +83,6 @@ namespace GreenshotJiraPlugin { /// My own attributes /// true if plugin is initialized, false if not (doesn't show) public bool Initialize(IGreenshotHost pluginHost, PluginAttribute myAttributes) { - _jiraPluginAttributes = myAttributes; - // Register configuration (don't need the configuration itself) _config = IniConfig.GetIniSection(); return true;