Skip to content

Commit eee8046

Browse files
committed
Added fail scenario for updater
1 parent 34085a1 commit eee8046

File tree

4 files changed

+35
-16
lines changed

4 files changed

+35
-16
lines changed

FreeMove/FreeMove.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<DebugType>full</DebugType>
3535
<Optimize>false</Optimize>
3636
<OutputPath>bin\Debug\</OutputPath>
37-
<DefineConstants>TRACE;DEBUG;VERSION;1.1.4</DefineConstants>
37+
<DefineConstants>TRACE;DEBUG</DefineConstants>
3838
<ErrorReport>prompt</ErrorReport>
3939
<WarningLevel>4</WarningLevel>
4040
</PropertyGroup>
@@ -43,7 +43,7 @@
4343
<DebugType>pdbonly</DebugType>
4444
<Optimize>true</Optimize>
4545
<OutputPath>bin\Release\</OutputPath>
46-
<DefineConstants>TRACE;VERSION;1.1.3</DefineConstants>
46+
<DefineConstants>TRACE</DefineConstants>
4747
<ErrorReport>prompt</ErrorReport>
4848
<WarningLevel>4</WarningLevel>
4949
</PropertyGroup>

FreeMove/Properties/Resources.Designer.cs

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

FreeMove/Properties/Resources.resx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
<resheader name="writer">
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120-
<data name="VersionNumber" xml:space="preserve">
121-
<value>1.1.3</value>
120+
<data name="GitHubErrorMessage" xml:space="preserve">
121+
<value>Could not retrieve the version information from the GitHub server</value>
122122
</data>
123123
</root>

FreeMove/Updater.cs

Lines changed: 28 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,35 @@ public Updater()
2626

2727
private async void Updater_Load(object sender, EventArgs e)
2828
{
29-
if(await CheckForUpdate())
29+
try
3030
{
31-
progressBar1.Dispose();
32-
label1.Font = new Font("Lucida Console", label1.Font.Size);
33-
label1.Text = String.Format($"Current Version: {CurrentVersion}\nLatest Version: {NewVersion}\n\nOpen the download page?");
34-
button_Cancel.Enabled = true;
35-
button_Cancel.Click += delegate { Dispose(); };
31+
if (await CheckForUpdate())
32+
{
33+
progressBar1.Dispose();
34+
label1.Font = new Font("Lucida Console", label1.Font.Size);
35+
label1.Text = String.Format($"Current Version: {CurrentVersion}\nLatest Version: {NewVersion}\n\nOpen the download page?");
36+
button_Cancel.Enabled = true;
37+
button_Cancel.Click += delegate { Dispose(); };
3638

37-
button_Ok.Enabled = true;
38-
button_Ok.Click += delegate { System.Diagnostics.Process.Start("https://github.com/ImDema/FreeMove/releases/latest"); Dispose(); };
39+
button_Ok.Enabled = true;
40+
button_Ok.Click += delegate { System.Diagnostics.Process.Start("https://github.com/ImDema/FreeMove/releases/latest"); Dispose(); };
41+
}
42+
else
43+
{
44+
label1.Text = "There are no updates available";
45+
button_Ok.Enabled = true;
46+
button_Ok.Click += delegate { Dispose(); };
47+
}
48+
}
49+
catch(Exception ex)
50+
{
51+
if (ex.Message == Properties.Resources.GitHubErrorMessage)
52+
{
53+
label1.Text = Properties.Resources.GitHubErrorMessage;
54+
button_Ok.Enabled = true;
55+
button_Ok.Click += delegate { Dispose(); };
56+
}
57+
else throw ex;
3958
}
4059
}
4160

@@ -55,7 +74,7 @@ public async Task<bool> CheckForUpdate()
5574
break;
5675
}
5776
}
58-
if (NewVersion == "") throw new Exception("Could not retrieve the version information from the GitHub server");
77+
if (NewVersion == "") throw new Exception(Properties.Resources.GitHubErrorMessage);
5978
Assembly assembly = Assembly.GetExecutingAssembly();
6079
CurrentVersion = System.Diagnostics.FileVersionInfo.GetVersionInfo(assembly.Location).FileVersion;
6180
return CurrentVersion != NewVersion;

0 commit comments

Comments
 (0)