No expiry date

This commit is contained in:
Jaex 2014-05-11 10:11:41 +03:00
parent 02e21cae1d
commit 123f55564b
5 changed files with 3 additions and 12 deletions

View file

@ -416,11 +416,6 @@ public static bool CheckVersion(Version currentVersion, Version latestVersion)
return NormalizeVersion(latestVersion).CompareTo(NormalizeVersion(currentVersion)) > 0;
}
public static bool CheckExpiryDate(DateTime expiryDate)
{
return DateTime.Today > expiryDate;
}
private static Version NormalizeVersion(Version version)
{
return new Version(Math.Max(version.Major, 0), Math.Max(version.Minor, 0), Math.Max(version.Build, 0), Math.Max(version.Revision, 0));

View file

@ -54,7 +54,7 @@ public GitHubUpdateChecker(string owner, string repo)
public override void CheckUpdate()
{
UpdateInfo = new UpdateInfo { CurrentVersion = this.CurrentVersion, ExpiryDate = this.ExpiryDate };
UpdateInfo = new UpdateInfo { CurrentVersion = this.CurrentVersion };
try
{

View file

@ -30,7 +30,6 @@ namespace HelpersLib
{
public abstract class UpdateChecker
{
public DateTime ExpiryDate { get; set; }
public Version CurrentVersion { get; set; }
public ReleaseChannelType ReleaseType { get; set; }
public IWebProxy Proxy { get; set; }

View file

@ -33,7 +33,6 @@ public class UpdateInfo
public UpdateStatus Status { get; set; }
public Version CurrentVersion { get; set; }
public Version LatestVersion { get; set; }
public DateTime ExpiryDate { get; set; }
private string filename;
@ -66,8 +65,8 @@ public UpdateInfo()
public void RefreshStatus()
{
if (Status != UpdateStatus.UpdateCheckFailed && !string.IsNullOrEmpty(DownloadURL) && CurrentVersion != null && LatestVersion != null &&
(forceUpdate || Helpers.CheckVersion(CurrentVersion, LatestVersion) || Helpers.CheckExpiryDate(ExpiryDate)))
if (Status != UpdateStatus.UpdateCheckFailed && CurrentVersion != null && LatestVersion != null &&
!string.IsNullOrEmpty(DownloadURL) && (forceUpdate || Helpers.CheckVersion(CurrentVersion, LatestVersion)))
{
Status = UpdateStatus.UpdateAvailable;
}

View file

@ -26,7 +26,6 @@ You should have received a copy of the GNU General Public License
using HelpersLib;
using ImageEffectsLib;
using ScreenCaptureLib;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Drawing;
@ -395,7 +394,6 @@ public static Icon GetProgressIcon(int percentage)
public static UpdateChecker CheckUpdate()
{
UpdateChecker updateChecker = new GitHubUpdateChecker("ShareX", "ShareX");
updateChecker.ExpiryDate = new DateTime(2014, 05, 18);
updateChecker.CurrentVersion = Program.AssemblyVersion;
updateChecker.Proxy = ProxyInfo.Current.GetWebProxy();
updateChecker.CheckUpdate();