Skip to content

Commit

Permalink
2.26 release, adding ability to specify supported SSL protocols and f…
Browse files Browse the repository at this point in the history
…ixing occasional POP3 error.
  • Loading branch information
bertjohnson committed Aug 28, 2016
1 parent 285b6f2 commit eee7f0e
Show file tree
Hide file tree
Showing 12 changed files with 189 additions and 67 deletions.
179 changes: 143 additions & 36 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,50 @@
# User-specific files
*.suo
*.user
*.userosscache
*.sln.docstates

# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs

# Build results
[Dd]ebug/
[Dd]ebugPublic/
[Rr]elease/
[Rr]eleases/
x64/
build/
x86/
bld/
[Bb]in/
[Oo]bj/
[Ll]og/

# Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
!packages/*/build/
# Visual Studio 2015 cache/options directory
.vs/
# Uncomment if you have tasks that create the project's static files in wwwroot
#wwwroot/

# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*

# NUNIT
*.VisualState.xml
TestResult.xml

# Build Results of an ATL Project
[Dd]ebugPS/
[Rr]eleasePS/
dlldata.c

# DNX
project.lock.json
project.fragment.lock.json
artifacts/

*_i.c
*_p.c
*_i.h
*.ilk
*.meta
*.obj
Expand All @@ -42,28 +67,42 @@ build/
*.vssscc
.builds
*.pidb
*.log
*.svclog
*.scc

# Chutzpah Test files
_Chutzpah*

# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opendb
*.opensdf
*.sdf
*.cachefile
*.VC.db
*.VC.VC.opendb

# Visual Studio profiler
*.psess
*.vsp
*.vspx
*.sap

# TFS 2012 Local Workspace
$tf/

# Guidance Automation Toolkit
*.gpState

# ReSharper is a .NET coding add-in
_ReSharper*/
*.[Rr]e[Ss]harper
*.DotSettings.user

# JustCode is a .NET coding add-in
.JustCode

# TeamCity is a build add-in
_TeamCity*
Expand All @@ -72,8 +111,16 @@ _TeamCity*
*.dotCover

# NCrunch
*.ncrunch*
_NCrunch_*
.*crunch*.local.xml
nCrunchTemp_*

# MightyMoose
*.mm.*
AutoTest.Net/

# Web workbench (sass)
.sass-cache/

# Installshield output folder
[Ee]xpress/
Expand All @@ -92,67 +139,127 @@ DocProject/Help/html
publish/

# Publish Web Output
*.Publish.xml
*.[Pp]ublish.xml
*.azurePubxml
# TODO: Comment the next line if you want to checkin your web deploy settings
# but database connection strings (with potential passwords) will be unencrypted
*.pubxml
*.publishproj

# Microsoft Azure Web App publish settings. Comment the next line if you want to
# checkin your Azure Web App publish settings, but sensitive information contained
# in these scripts will be unencrypted
PublishScripts/

# NuGet Packages Directory
## TODO: If you have NuGet Package Restore enabled, uncomment the next line
#packages/
# NuGet Packages
*.nupkg
# The packages folder can be ignored because of Package Restore
**/packages/*
# except build/, which is used as an MSBuild target.
!**/packages/build/
# Uncomment if necessary however generally it will be regenerated when needed
#!**/packages/repositories.config
# NuGet v3's project.json files produces more ignoreable files
*.nuget.props
*.nuget.targets

# Windows Azure Build Output
csx
# Microsoft Azure Build Output
csx/
*.build.csdef

# Windows Store app package directory
# Microsoft Azure Emulator
ecf/
rcf/

# Windows Store app package directories and files
AppPackages/
BundleArtifacts/
Package.StoreAssociation.xml
_pkginfo.txt

# Visual Studio cache files
# files ending in .cache can be ignored
*.[Cc]ache
# but keep track of directories ending in .cache
!*.[Cc]ache/

# Others
sql/
*.Cache
ClientBin/
[Ss]tyle[Cc]op.*
~$*
*~
*.dbmdl
*.[Pp]ublish.xml
*.dbproj.schemaview
*.pfx
*.publishsettings
node_modules/
orleans.codegen.cs

# Since there are multiple workflows, uncomment next line to ignore bower_components
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
#bower_components/

# RIA/Silverlight projects
Generated_Code/

# Backup & report files from converting an old project file to a newer
# Visual Studio version. Backup files are not needed, because we have git ;-)
# Backup & report files from converting an old project file
# to a newer Visual Studio version. Backup files are not needed,
# because we have git ;-)
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
UpgradeLog*.htm

# SQL Server files
App_Data/*.mdf
App_Data/*.ldf
*.mdf
*.ldf

# Business Intelligence projects
*.rdl.data
*.bim.layout
*.bim_*.settings

#LightSwitch generated files
GeneratedArtifacts/
_Pvt_Extensions/
ModelManifest.xml
# Microsoft Fakes
FakesAssemblies/

# =========================
# Windows detritus
# =========================
# GhostDoc plugin setting file
*.GhostDoc.xml

# Node.js Tools for Visual Studio
.ntvs_analysis.dat

# Windows image file caches
Thumbs.db
ehthumbs.db
# Visual Studio 6 build log
*.plg

# Folder config file
Desktop.ini
# Visual Studio 6 workspace options file
*.opt

# Recycle Bin used on file shares
$RECYCLE.BIN/
# Visual Studio LightSwitch build output
**/*.HTMLClient/GeneratedArtifacts
**/*.DesktopClient/GeneratedArtifacts
**/*.DesktopClient/ModelManifest.xml
**/*.Server/GeneratedArtifacts
**/*.Server/ModelManifest.xml
_Pvt_Extensions

# Mac desktop service store files
.DS_Store
# Paket dependency manager
.paket/paket.exe
paket-files/

# FAKE - F# Make
.fake/

# JetBrains Rider
.idea/
*.sln.iml

# CodeRush
.cr/

# Python Tools for Visual Studio (PTVS)
__pycache__/
*.pyc

# =========================
# OpaqueMail settings
# =========================
OpaqueMail.TestClient.exe.config
4 changes: 2 additions & 2 deletions OpaqueMail.CertHelper/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.2.5")]
[assembly: AssemblyFileVersion("2.2.5")]
[assembly: AssemblyVersion("2.2.6")]
[assembly: AssemblyFileVersion("2.2.6")]
4 changes: 2 additions & 2 deletions OpaqueMail.Proxy/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.2.5")]
[assembly: AssemblyFileVersion("2.2.5")]
[assembly: AssemblyVersion("2.2.6")]
[assembly: AssemblyFileVersion("2.2.6")]
4 changes: 2 additions & 2 deletions OpaqueMail.ProxyService/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.2.5")]
[assembly: AssemblyFileVersion("2.2.5")]
[assembly: AssemblyVersion("2.2.6")]
[assembly: AssemblyFileVersion("2.2.6")]
4 changes: 2 additions & 2 deletions OpaqueMail.ProxySettings/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.2.5")]
[assembly: AssemblyFileVersion("2.2.5")]
[assembly: AssemblyVersion("2.2.6")]
[assembly: AssemblyFileVersion("2.2.6")]
14 changes: 7 additions & 7 deletions OpaqueMail.TestClient/Form1.cs
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ private async void ImapAppendMessageButton_Click(object sender, EventArgs e)
// Ensure we connected successfully.
if (!myImapClient.IsConnected)
{
MessageBox.Show("Unable to connect to the IMAP server. Please double-check your settings.", "Unable to connect.", MessageBoxButtons.OK, MessageBoxIcon.Error);
MessageBox.Show("Unable to connect to the IMAP server. Please double-check your settings.\r\n\r\n" + myImapClient.LastErrorMessage, "Unable to connect.", MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
}
Expand Down Expand Up @@ -207,7 +207,7 @@ private async void ImapGetQuotaButton_Click(object sender, EventArgs e)
// Ensure we connected successfully.
if (!myImapClient.IsConnected)
{
MessageBox.Show("Unable to connect to the IMAP server. Please double-check your settings.", "Unable to connect.", MessageBoxButtons.OK, MessageBoxIcon.Error);
MessageBox.Show("Unable to connect to the IMAP server. Please double-check your settings.\r\n\r\n" + myImapClient.LastErrorMessage, "Unable to connect.", MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
}
Expand Down Expand Up @@ -387,7 +387,7 @@ private async void ImapSearchText_KeyDown(object sender, System.Windows.Forms.Ke
// Ensure we connected successfully.
if (!myImapClient.IsConnected)
{
MessageBox.Show("Unable to connect to the IMAP server. Please double-check your settings.", "Unable to connect.", MessageBoxButtons.OK, MessageBoxIcon.Error);
MessageBox.Show("Unable to connect to the IMAP server. Please double-check your settings.\r\n\r\n" + myImapClient.LastErrorMessage, "Unable to connect.", MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}

Expand Down Expand Up @@ -790,7 +790,7 @@ private async Task RefreshImapMessages(bool repopulateMailboxes)

if (string.IsNullOrEmpty(ImapHost.Text) || string.IsNullOrEmpty(ImapPort.Text) || string.IsNullOrEmpty(ImapUsername.Text) || string.IsNullOrEmpty(ImapPassword.Text))
{
MessageBox.Show("Unable to connect to the IMAP server. Please double-check your settings.", "Unable to connect.", MessageBoxButtons.OK, MessageBoxIcon.Error);
MessageBox.Show("Unable to connect to the IMAP server. Please double-check your settings.\r\n\r\n" + myImapClient.LastErrorMessage, "Unable to connect.", MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}

Expand All @@ -812,7 +812,7 @@ private async Task RefreshImapMessages(bool repopulateMailboxes)
// Ensure we connected successfully.
if (!myImapClient.IsConnected || !myImapClient.IsAuthenticated)
{
MessageBox.Show("Unable to connect to the IMAP server. Please double-check your settings.", "Unable to connect.", MessageBoxButtons.OK, MessageBoxIcon.Error);
MessageBox.Show("Unable to connect to the IMAP server. Please double-check your settings.\r\n\r\n" + myImapClient.LastErrorMessage, "Unable to connect.", MessageBoxButtons.OK, MessageBoxIcon.Error);
myImapClient = null;
return;
}
Expand Down Expand Up @@ -895,7 +895,7 @@ private async Task RefreshPop3Messages()
{
if (string.IsNullOrEmpty(Pop3Host.Text) || string.IsNullOrEmpty(Pop3Port.Text) || string.IsNullOrEmpty(Pop3Username.Text) || string.IsNullOrEmpty(Pop3Password.Text))
{
MessageBox.Show("Unable to connect to the POP3 server. Please double-check your settings.", "Unable to connect.", MessageBoxButtons.OK, MessageBoxIcon.Error);
MessageBox.Show("Unable to connect to the POP3 server. Please double-check your settings.\r\n\r\n" + myPop3Client.LastErrorMessage, "Unable to connect.", MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}

Expand All @@ -917,7 +917,7 @@ private async Task RefreshPop3Messages()
// Ensure we connected successfully.
if (!myPop3Client.IsConnected || !myPop3Client.IsAuthenticated)
{
MessageBox.Show("Unable to connect to the POP3 server. Please double-check your settings.", "Unable to connect.", MessageBoxButtons.OK, MessageBoxIcon.Error);
MessageBox.Show("Unable to connect to the POP3 server. Please double-check your settings.\r\n\r\n" + myPop3Client.LastErrorMessage, "Unable to connect.", MessageBoxButtons.OK, MessageBoxIcon.Error);
myPop3Client = null;
return;
}
Expand Down
4 changes: 2 additions & 2 deletions OpaqueMail.TestClient/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.2.5")]
[assembly: AssemblyFileVersion("2.2.5")]
[assembly: AssemblyVersion("2.2.6")]
[assembly: AssemblyFileVersion("2.2.6")]
2 changes: 1 addition & 1 deletion OpaqueMail.doxygen
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ PROJECT_NAME = "OpaqueMail"
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = 2.2.5
PROJECT_NUMBER = 2.2.6

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
Expand Down
Loading

0 comments on commit eee7f0e

Please sign in to comment.