From 8e59023534f2f2519919e84bc0adaef13ac26bd4 Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Sat, 20 May 2017 18:16:55 +0100
Subject: [PATCH 01/29] Re-enable installer compression (oops...)

---
 installer/common.iss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/installer/common.iss b/installer/common.iss
index 322a9a0c..a3606cf4 100644
--- a/installer/common.iss
+++ b/installer/common.iss
@@ -29,8 +29,8 @@ OutputDir="."
 OutputBaseFilename={#AppName}Setup-{#Arch}
 SetupIconFile={#AppSrc}\Icons\default.ico
 WizardSmallImageFile=..\icon.bmp
-;Compression=lzma2/max
-Compression=None
+Compression=lzma2/max
+;Compression=None
 SolidCompression=yes
 PrivilegesRequired=admin
 CloseApplications=yes

From 29c7e43a6c3c250ecc983fbaa89c141b9ac89077 Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Thu, 25 May 2017 21:11:17 +0100
Subject: [PATCH 02/29] Tweak all of the log levels, with a view to making it
 Info

---
 src/SyncTrayzor/Services/AutostartProvider.cs  | 10 +++++-----
 .../Services/Config/ConfigurationProvider.cs   |  6 +++---
 .../Services/Conflicts/ConflictFileWatcher.cs  |  2 +-
 src/SyncTrayzor/Services/DirectoryWatcher.cs   |  2 +-
 src/SyncTrayzor/Services/FileWatcher.cs        |  6 +++---
 .../Services/Ipc/IpcCommsClientFactory.cs      |  4 ++--
 src/SyncTrayzor/Services/MemoryUsageLogger.cs  |  2 +-
 .../Services/Metering/MeteredNetworkManager.cs | 18 +++++++++---------
 .../Services/Metering/NetworkCostManager.cs    |  6 +++---
 .../Services/ProcessStartProvider.cs           |  8 ++++----
 .../PortableUpdateVariantHandler.cs            |  2 +-
 .../UpdateManagement/UpdateDownloader.cs       |  2 +-
 .../Services/UpdateManagement/UpdateManager.cs |  4 ++--
 .../Syncthing/ApiClient/SyncthingApiClient.cs  |  6 +++---
 .../ApiClient/SyncthingHttpClientHandler.cs    | 10 +++++++++-
 .../EventWatcher/SyncthingEventWatcher.cs      |  2 +-
 src/SyncTrayzor/Syncthing/SyncthingManager.cs  |  2 +-
 src/SyncTrayzor/Syncthing/SyncthingPoller.cs   |  2 +-
 .../Syncthing/SyncthingProcessRunner.cs        |  4 ++--
 19 files changed, 53 insertions(+), 45 deletions(-)

diff --git a/src/SyncTrayzor/Services/AutostartProvider.cs b/src/SyncTrayzor/Services/AutostartProvider.cs
index 3efc5319..029ec95b 100644
--- a/src/SyncTrayzor/Services/AutostartProvider.cs
+++ b/src/SyncTrayzor/Services/AutostartProvider.cs
@@ -77,7 +77,7 @@ private void CheckAccess()
 
                         this._canWrite = true;
                         this._canRead = true;
-                        logger.Info("Have read/write access to the registry");
+                        logger.Debug("Have read/write access to the registry");
                         return;
                     }
                 }
@@ -95,7 +95,7 @@ private void CheckAccess()
                         new RegistryPermission(RegistryPermissionAccess.Read, runPathWithHive).Demand();
 
                         this._canRead = true;
-                        logger.Info("Have read-only access to the registry");
+                        logger.Warn("Have read-only access to the registry");
                         return;
                     }
                 }
@@ -103,7 +103,7 @@ private void CheckAccess()
             catch (SecurityException) { }
             catch (UnauthorizedAccessException) { }
 
-            logger.Info("Have no access to the registry");
+            logger.Warn("Have no access to the registry");
         }
 
         private string FindKeyName()
@@ -180,7 +180,7 @@ public AutostartConfiguration GetCurrentSetup()
             }
 
             var config = new AutostartConfiguration() { AutoStart = autoStart, StartMinimized = startMinimized };
-            logger.Info("GetCurrentSetup determined that the current configuration is: {0}", config);
+            logger.Debug("GetCurrentSetup determined that the current configuration is: {0}", config);
             return config;
         }
 
@@ -189,7 +189,7 @@ public void SetAutoStart(AutostartConfiguration config)
             if (!this.CanWrite)
                 throw new InvalidOperationException("Don't have permission to write to the registry");
 
-            logger.Info("Setting AutoStart to {0}", config);
+            logger.Debug("Setting AutoStart to {0}", config);
 
             using (var registryKey = this.OpenRegistryKey(true))
             {
diff --git a/src/SyncTrayzor/Services/Config/ConfigurationProvider.cs b/src/SyncTrayzor/Services/Config/ConfigurationProvider.cs
index 494b6ac0..7a71ddbc 100644
--- a/src/SyncTrayzor/Services/Config/ConfigurationProvider.cs
+++ b/src/SyncTrayzor/Services/Config/ConfigurationProvider.cs
@@ -118,7 +118,7 @@ public void Initialize(Configuration defaultConfiguration)
             if (!this.filesystem.FileExists(expandedSyncthingPath))
             {
                 // We know that this.paths.SyncthingBackupPath exists, because we checked this above
-                logger.Info("Syncthing doesn't exist at {0}, so copying from {1}", expandedSyncthingPath, this.paths.SyncthingBackupPath);
+                logger.Warn("Syncthing doesn't exist at {0}, so copying from {1}", expandedSyncthingPath, this.paths.SyncthingBackupPath);
 
                 var expandedSyncthingPathDir = Path.GetDirectoryName(expandedSyncthingPath);
                 if (!this.filesystem.DirectoryExists(expandedSyncthingPathDir))
@@ -140,7 +140,7 @@ private Configuration LoadFromDisk(Configuration defaultConfiguration, out bool
 
             // Merge any updates from app.config / Configuration into the configuration file on disk
             // (creating if necessary)
-            logger.Debug("Loaded default configuration: {0}", defaultConfiguration);
+            logger.Info("Loaded default configuration: {0}", defaultConfiguration);
             XDocument defaultConfig;
             using (var ms = new System.IO.MemoryStream())
             {
@@ -167,7 +167,7 @@ private Configuration LoadFromDisk(Configuration defaultConfiguration, out bool
                 }
                 else
                 {
-                    logger.Debug($"Configuration file {this.paths.ConfigurationFilePath} doesn't exist, so creating");
+                    logger.Info($"Configuration file {this.paths.ConfigurationFilePath} doesn't exist, so creating");
                     hadToCreate = true;
                     loadedConfig = defaultConfig;
                 }
diff --git a/src/SyncTrayzor/Services/Conflicts/ConflictFileWatcher.cs b/src/SyncTrayzor/Services/Conflicts/ConflictFileWatcher.cs
index 58625739..a128ecfb 100644
--- a/src/SyncTrayzor/Services/Conflicts/ConflictFileWatcher.cs
+++ b/src/SyncTrayzor/Services/Conflicts/ConflictFileWatcher.cs
@@ -162,7 +162,7 @@ private void RefreshConflictedFiles()
 
                 this.conflictedFiles = conflictFiles.ToList();
 
-                logger.Info($"Refreshing conflicted files. Found {this.conflictedFiles.Count} from {this.conflictFileOptions.Count} options");
+                logger.Debug($"Refreshing conflicted files. Found {this.conflictedFiles.Count} from {this.conflictFileOptions.Count} options");
             }
 
             this.ConflictedFilesChanged?.Invoke(this, EventArgs.Empty);
diff --git a/src/SyncTrayzor/Services/DirectoryWatcher.cs b/src/SyncTrayzor/Services/DirectoryWatcher.cs
index 8d73b5df..251a431f 100644
--- a/src/SyncTrayzor/Services/DirectoryWatcher.cs
+++ b/src/SyncTrayzor/Services/DirectoryWatcher.cs
@@ -142,7 +142,7 @@ private bool OnPreviewDirectoryChanged(string subPath, bool pathExists)
 
         private void OnDirectoryChanged(string subPath)
         {
-            logger.Info("Path Changed: {0}", Path.Combine(this.Directory, subPath));
+            logger.Debug("Path Changed: {0}", Path.Combine(this.Directory, subPath));
             this.DirectoryChanged?.Invoke(this, new DirectoryChangedEventArgs(this.Directory, subPath));
         }
 
diff --git a/src/SyncTrayzor/Services/FileWatcher.cs b/src/SyncTrayzor/Services/FileWatcher.cs
index fe56bbd2..16c08c79 100644
--- a/src/SyncTrayzor/Services/FileWatcher.cs
+++ b/src/SyncTrayzor/Services/FileWatcher.cs
@@ -131,12 +131,12 @@ private void CheckExistence()
             var exists = System.IO.Directory.Exists(this.Directory);
             if (exists && this.watcher == null)
             {
-                logger.Info("Path {0} appeared. Creating watcher", this.Directory);
+                logger.Debug("Path {0} appeared. Creating watcher", this.Directory);
                 this.watcher = this.TryToCreateWatcher(this.Directory);
             }
             else if (!exists && this.watcher != null)
             {
-                logger.Info("Path {0} disappeared. Destroying watcher", this.Directory);
+                logger.Debug("Path {0} disappeared. Destroying watcher", this.Directory);
                 this.watcher.Dispose();
                 this.watcher = null;
             }
@@ -172,7 +172,7 @@ private void OnChanged(object source, FileSystemEventArgs e)
             }
             catch (Exception ex)
             {
-                logger.Error(ex, $"Failed to see whether file/dir {e.FullPath} exists");
+                logger.Warn(ex, $"Failed to see whether file/dir {e.FullPath} exists");
             }
         }
 
diff --git a/src/SyncTrayzor/Services/Ipc/IpcCommsClientFactory.cs b/src/SyncTrayzor/Services/Ipc/IpcCommsClientFactory.cs
index 4325222b..f0a38898 100644
--- a/src/SyncTrayzor/Services/Ipc/IpcCommsClientFactory.cs
+++ b/src/SyncTrayzor/Services/Ipc/IpcCommsClientFactory.cs
@@ -33,7 +33,7 @@ public IIpcCommsClient TryCreateClient()
                     // Only care if the process came from our session: allow multiple instances under different users
                     if (String.Equals(process.MainModule.FileName, ourLocation, StringComparison.OrdinalIgnoreCase) && process.SessionId == ourProcess.SessionId && process.Id != ourProcess.Id)
                     {
-                        logger.Debug("Found process with ID {0} and location {1}", process.Id, process.MainModule.FileName);
+                        logger.Info("Found process with ID {0} and location {1}", process.Id, process.MainModule.FileName);
                         return new IpcCommsClient(process.Id);
                     }
                     else if (process.Id != ourProcess.Id)
@@ -43,7 +43,7 @@ public IIpcCommsClient TryCreateClient()
                 }
                 catch (Exception e)
                 {
-                    logger.Error(e, $"Error accessing information for process with PID {process.Id}");
+                    logger.Warn(e, $"Error accessing information for process with PID {process.Id}");
                 }
             }
 
diff --git a/src/SyncTrayzor/Services/MemoryUsageLogger.cs b/src/SyncTrayzor/Services/MemoryUsageLogger.cs
index 1a8c6006..4054b03a 100644
--- a/src/SyncTrayzor/Services/MemoryUsageLogger.cs
+++ b/src/SyncTrayzor/Services/MemoryUsageLogger.cs
@@ -31,7 +31,7 @@ public MemoryUsageLogger()
             };
             this.timer.Elapsed += (o, e) =>
             {
-                logger.Debug("Working Set: {0}. Private Memory Size: {1}. GC Total Memory: {2}",
+                logger.Info("Working Set: {0}. Private Memory Size: {1}. GC Total Memory: {2}",
                     FormatUtils.BytesToHuman(this.process.WorkingSet64), FormatUtils.BytesToHuman(this.process.PrivateMemorySize64),
                     FormatUtils.BytesToHuman(GC.GetTotalMemory(true)));
             };
diff --git a/src/SyncTrayzor/Services/Metering/MeteredNetworkManager.cs b/src/SyncTrayzor/Services/Metering/MeteredNetworkManager.cs
index 05fde211..6e49d56a 100644
--- a/src/SyncTrayzor/Services/Metering/MeteredNetworkManager.cs
+++ b/src/SyncTrayzor/Services/Metering/MeteredNetworkManager.cs
@@ -124,12 +124,12 @@ private void DevicePaused(object sender, DevicePausedEventArgs e)
                 if (deviceState == DeviceState.Unpaused)
                 {
                     this.deviceStates[e.Device] = DeviceState.PausedRenegade;
-                    logger.Info($"Device {e.Device.DeviceId} has been paused, and has gone renegade");
+                    logger.Debug($"Device {e.Device.DeviceId} has been paused, and has gone renegade");
                 }
                 else if (deviceState == DeviceState.UnpausedRenegade)
                 {
                     this.deviceStates[e.Device] = DeviceState.Paused;
-                    logger.Info($"Device {e.Device.DeviceId} has been paused, and has stopped being renegade");
+                    logger.Debug($"Device {e.Device.DeviceId} has been paused, and has stopped being renegade");
                     changed = true;
                 }
             }
@@ -155,13 +155,13 @@ private void DeviceResumed(object sender, DeviceResumedEventArgs e)
                 if (deviceState == DeviceState.Paused)
                 {
                     this.deviceStates[e.Device] = DeviceState.UnpausedRenegade;
-                    logger.Info($"Device {e.Device.DeviceId} has been resumed, and has gone renegade");
+                    logger.Debug($"Device {e.Device.DeviceId} has been resumed, and has gone renegade");
                     changed = true;
                 }
                 else if (deviceState == DeviceState.PausedRenegade)
                 {
                     this.deviceStates[e.Device] = DeviceState.Unpaused;
-                    logger.Info($"Device {e.Device.DeviceId} has been resumed, and has stopped being renegade");
+                    logger.Debug($"Device {e.Device.DeviceId} has been resumed, and has stopped being renegade");
                 }
             }
 
@@ -190,7 +190,7 @@ private void NetworkCostsChanged(object sender, EventArgs e)
             if (!this.IsEnabled)
                 return;
 
-            logger.Info("Network costs changed. Updating devices");
+            logger.Debug("Network costs changed. Updating devices");
             this.ResetRenegades();
             this.Update();
         }
@@ -200,7 +200,7 @@ private void NetworksChanged(object sender, EventArgs e)
             if (!this.IsEnabled)
                 return;
 
-            logger.Info("Networks changed. Updating devices");
+            logger.Debug("Networks changed. Updating devices");
             this.ResetRenegades();
             this.Update();
         }
@@ -295,7 +295,7 @@ private async Task<bool> UpdateDeviceAsync(Device device)
 
             if (deviceState == DeviceState.PausedRenegade || deviceState == DeviceState.UnpausedRenegade)
             {
-                logger.Info($"Skipping update of device {device.DeviceId} as it has gone renegade");
+                logger.Debug($"Skipping update of device {device.DeviceId} as it has gone renegade");
                 return false;
             }
 
@@ -307,7 +307,7 @@ private async Task<bool> UpdateDeviceAsync(Device device)
 
             if (shouldBePaused && !device.Paused)
             {
-                logger.Info($"Pausing device {device.DeviceId}");
+                logger.Debug($"Pausing device {device.DeviceId}");
                 try
                 {
                     await this.syncthingManager.Devices.PauseDeviceAsync(device);
@@ -325,7 +325,7 @@ private async Task<bool> UpdateDeviceAsync(Device device)
             }
             else if (!shouldBePaused && device.Paused)
             {
-                logger.Info($"Resuming device {device.DeviceId}");
+                logger.Debug($"Resuming device {device.DeviceId}");
                 try
                 {
                     await this.syncthingManager.Devices.ResumeDeviceAsync(device);
diff --git a/src/SyncTrayzor/Services/Metering/NetworkCostManager.cs b/src/SyncTrayzor/Services/Metering/NetworkCostManager.cs
index a82f57fe..363c52be 100644
--- a/src/SyncTrayzor/Services/Metering/NetworkCostManager.cs
+++ b/src/SyncTrayzor/Services/Metering/NetworkCostManager.cs
@@ -73,17 +73,17 @@ public bool IsConnectionMetered(IPAddress address)
             catch (ArgumentException e)
             {
                 // See #210
-                logger.Error(e, $"GetCost failed (ArgumentException). IP: {address}, Bytes: {BitConverter.ToString(sockAddr.data)}");
+                logger.Warn(e, $"GetCost failed (ArgumentException). IP: {address}, Bytes: {BitConverter.ToString(sockAddr.data)}");
             }
             catch (COMException e)
             {
                 // See #215
-                logger.Error(e, $"GetCost failed (COMException, HResult {e.HResult}). IP: {address}, Bytes: {BitConverter.ToString(sockAddr.data)}");
+                logger.Warn(e, $"GetCost failed (COMException, HResult {e.HResult}). IP: {address}, Bytes: {BitConverter.ToString(sockAddr.data)}");
             }
             catch (Exception e)
             {
                 // Being safe...
-                logger.Error(e, $"GetCost failed for an unknown reason. IP: {address}, Bytes: {BitConverter.ToString(sockAddr.data)}");
+                logger.Warn(e, $"GetCost failed for an unknown reason. IP: {address}, Bytes: {BitConverter.ToString(sockAddr.data)}");
             }
 
             return false;
diff --git a/src/SyncTrayzor/Services/ProcessStartProvider.cs b/src/SyncTrayzor/Services/ProcessStartProvider.cs
index 5f582e3e..80b85fdc 100644
--- a/src/SyncTrayzor/Services/ProcessStartProvider.cs
+++ b/src/SyncTrayzor/Services/ProcessStartProvider.cs
@@ -35,13 +35,13 @@ public ProcessStartProvider(IAssemblyProvider assemblyProvider, IConfigurationPr
 
         public void Start(string filename)
         {
-            logger.Info("Starting {0}", filename);
+            logger.Debug("Starting {0}", filename);
             Process.Start(filename);
         }
 
         public void Start(string filename, string arguments)
         {
-            logger.Info("Starting {0} {1}", filename, arguments);
+            logger.Debug("Starting {0} {1}", filename, arguments);
             Process.Start(filename, arguments);
         }
 
@@ -58,7 +58,7 @@ public void StartDetached(string filename, string arguments, string launchAfterF
             var launch = launchAfterFinished == null ? null : String.Format("--launch=\"{0}\"", launchAfterFinished.Replace("\"", "\\\""));
             var formattedArguments = $"--shell {launch} -- \"{filename}\" {arguments}";
 
-            logger.Info("Starting {0} {1}", processRunnerPath, formattedArguments);
+            logger.Debug("Starting {0} {1}", processRunnerPath, formattedArguments);
             var startInfo = new ProcessStartInfo()
             {
                 FileName = processRunnerPath,
@@ -78,7 +78,7 @@ public void StartElevatedDetached(string filename, string arguments, string laun
             var launch = launchAfterFinished == null ? null : String.Format("--launch=\"{0}\"", launchAfterFinished.Replace("\"", "\\\""));
             var formattedArguments = $"--nowindow -- \"{processRunnerPath}\" --runas {launch} -- \"{filename}\" {arguments}";
 
-            logger.Info("Starting {0} {1}", processRunnerPath, formattedArguments);
+            logger.Debug("Starting {0} {1}", processRunnerPath, formattedArguments);
 
             var startInfo = new ProcessStartInfo()
             {
diff --git a/src/SyncTrayzor/Services/UpdateManagement/PortableUpdateVariantHandler.cs b/src/SyncTrayzor/Services/UpdateManagement/PortableUpdateVariantHandler.cs
index 18ca8e91..679d0596 100644
--- a/src/SyncTrayzor/Services/UpdateManagement/PortableUpdateVariantHandler.cs
+++ b/src/SyncTrayzor/Services/UpdateManagement/PortableUpdateVariantHandler.cs
@@ -108,7 +108,7 @@ private async Task<string> ExtractDownloadedZip(string zipPath)
             var destinationDir = Path.Combine(Path.GetDirectoryName(zipPath), Path.GetFileNameWithoutExtension(zipPath));
             if (this.filesystem.DirectoryExists(destinationDir))
             {
-                logger.Info($"Extracted directory {destinationDir} already exists. Deleting...");
+                logger.Debug($"Extracted directory {destinationDir} already exists. Deleting...");
                 this.filesystem.DeleteDirectory(destinationDir, true);
             }
 
diff --git a/src/SyncTrayzor/Services/UpdateManagement/UpdateDownloader.cs b/src/SyncTrayzor/Services/UpdateManagement/UpdateDownloader.cs
index 98efd28e..f02cb965 100644
--- a/src/SyncTrayzor/Services/UpdateManagement/UpdateDownloader.cs
+++ b/src/SyncTrayzor/Services/UpdateManagement/UpdateDownloader.cs
@@ -157,7 +157,7 @@ private async Task<bool> TryDownloadToFileAsync(string downloadPath, string url)
                             FormatUtils.BytesToHuman(p.BytesRead), FormatUtils.BytesToHuman(responseLength), (p.BytesRead * 100) / responseLength);
                         if (downloadProgressString != previousDownloadProgressString)
                         {
-                            logger.Info(downloadProgressString);
+                            logger.Debug(downloadProgressString);
                             previousDownloadProgressString = downloadProgressString;
                         }
                     });
diff --git a/src/SyncTrayzor/Services/UpdateManagement/UpdateManager.cs b/src/SyncTrayzor/Services/UpdateManagement/UpdateManager.cs
index de9fdcfe..8bbf751d 100644
--- a/src/SyncTrayzor/Services/UpdateManagement/UpdateManager.cs
+++ b/src/SyncTrayzor/Services/UpdateManagement/UpdateManager.cs
@@ -215,7 +215,7 @@ private async Task CheckForUpdatesAsync()
                     // If another application is fullscreen, don't bother
                     if (this.userActivityMonitor.IsWindowFullscreen())
                     {
-                        logger.Info("Another application was fullscreen, so we didn't prompt the user");
+                        logger.Debug("Another application was fullscreen, so we didn't prompt the user");
                         return;
                     }
 
@@ -235,7 +235,7 @@ private async Task CheckForUpdatesAsync()
                     catch (OperationCanceledException)
                     {
                         this.toastCts = null;
-                        logger.Info("Update toast cancelled. Moving to a dialog");
+                        logger.Debug("Update toast cancelled. Moving to a dialog");
                         promptResult = this.updatePromptProvider.ShowDialog(checkResult, variantHandler.CanAutoInstall, variantHandler.RequiresUac);
                     }
                 }
diff --git a/src/SyncTrayzor/Syncthing/ApiClient/SyncthingApiClient.cs b/src/SyncTrayzor/Syncthing/ApiClient/SyncthingApiClient.cs
index 13f0b5ca..43be026e 100644
--- a/src/SyncTrayzor/Syncthing/ApiClient/SyncthingApiClient.cs
+++ b/src/SyncTrayzor/Syncthing/ApiClient/SyncthingApiClient.cs
@@ -34,7 +34,7 @@ public SyncthingApiClient(Uri baseAddress, string apiKey)
 
         public Task ShutdownAsync()
         {
-            logger.Info("Requesting API shutdown");
+            logger.Debug("Requesting API shutdown");
             return this.api.ShutdownAsync();
         }
 
@@ -112,13 +112,13 @@ public Task SetDebugFacilitiesAsync(IEnumerable<string> enable, IEnumerable<stri
 
         public Task PauseDeviceAsync(string deviceId)
         {
-            logger.Info("Pausing device {0}", deviceId);
+            logger.Debug("Pausing device {0}", deviceId);
             return this.api.PauseDeviceAsync(deviceId);
         }
 
         public Task ResumeDeviceAsync(string deviceId)
         {
-            logger.Info("Resuming device {0}", deviceId);
+            logger.Debug("Resuming device {0}", deviceId);
             return this.api.ResumeDeviceAsync(deviceId);
         }
     }
diff --git a/src/SyncTrayzor/Syncthing/ApiClient/SyncthingHttpClientHandler.cs b/src/SyncTrayzor/Syncthing/ApiClient/SyncthingHttpClientHandler.cs
index c12e9b5d..5c7e0ee6 100644
--- a/src/SyncTrayzor/Syncthing/ApiClient/SyncthingHttpClientHandler.cs
+++ b/src/SyncTrayzor/Syncthing/ApiClient/SyncthingHttpClientHandler.cs
@@ -19,9 +19,17 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
         {
             var response = await base.SendAsync(request, cancellationToken);
             if (response.IsSuccessStatusCode)
-                logger.Trace(() => response.Content.ReadAsStringAsync().Result.Trim());
+            {
+                if (logger.IsTraceEnabled)
+                {
+                    var content = (await response.Content.ReadAsStringAsync()).Trim();
+                    logger.Trace(content);
+                }
+            }
             else
+            {
                 logger.Warn("Non-successful status code. {0} {1}", response, (await response.Content.ReadAsStringAsync()).Trim());
+            }
 
             return response;
         }
diff --git a/src/SyncTrayzor/Syncthing/EventWatcher/SyncthingEventWatcher.cs b/src/SyncTrayzor/Syncthing/EventWatcher/SyncthingEventWatcher.cs
index 63e1418d..11b80dcd 100644
--- a/src/SyncTrayzor/Syncthing/EventWatcher/SyncthingEventWatcher.cs
+++ b/src/SyncTrayzor/Syncthing/EventWatcher/SyncthingEventWatcher.cs
@@ -108,7 +108,7 @@ await this.DoWithErrorHandlingAsync(() =>
                     {
                         if (evt.IsValid)
                         {
-                            logger.Debug(evt);
+                            logger.Trace(evt);
                             evt.Visit(this);
                         }
                         else
diff --git a/src/SyncTrayzor/Syncthing/SyncthingManager.cs b/src/SyncTrayzor/Syncthing/SyncthingManager.cs
index 3a8ace54..2068d6fe 100644
--- a/src/SyncTrayzor/Syncthing/SyncthingManager.cs
+++ b/src/SyncTrayzor/Syncthing/SyncthingManager.cs
@@ -341,7 +341,7 @@ private async Task StartClientAsync()
             }
             catch (OperationCanceledException) // If Syncthing dies on its own, etc
             {
-                logger.Info("StartClientAsync aborted");
+                logger.Debug("StartClientAsync aborted");
             }
             catch (ApiException e)
             {
diff --git a/src/SyncTrayzor/Syncthing/SyncthingPoller.cs b/src/SyncTrayzor/Syncthing/SyncthingPoller.cs
index 31a550a5..f80d1083 100644
--- a/src/SyncTrayzor/Syncthing/SyncthingPoller.cs
+++ b/src/SyncTrayzor/Syncthing/SyncthingPoller.cs
@@ -127,7 +127,7 @@ protected async Task<bool> DoWithErrorHandlingAsync(Func<Task> action, Cancellat
             {
                 // Anything else?
                 // We can't abort, as then the exception will be lost. So log it, and keep going
-                logger.Error(e, "Unexpected exception while polling");
+                logger.Warn(e, "Unexpected exception while polling");
                 errored = true;
             }
 
diff --git a/src/SyncTrayzor/Syncthing/SyncthingProcessRunner.cs b/src/SyncTrayzor/Syncthing/SyncthingProcessRunner.cs
index 11e46fd9..fa8b88e9 100644
--- a/src/SyncTrayzor/Syncthing/SyncthingProcessRunner.cs
+++ b/src/SyncTrayzor/Syncthing/SyncthingProcessRunner.cs
@@ -223,10 +223,10 @@ private void OnProcessExited()
                 this.process = null;
             }
 
-            logger.Info("Syncthing process stopped with exit status {0}", exitStatus);
+            logger.Debug("Syncthing process stopped with exit status {0}", exitStatus);
             if (exitStatus == SyncthingExitStatus.Restarting || exitStatus == SyncthingExitStatus.Upgrading)
             {
-                logger.Info("Syncthing process requested restart, so restarting");
+                logger.Debug("Syncthing process requested restart, so restarting");
                 this.OnProcessRestarted();
                 this.Start();
             }

From 48a6f3cf8b5e0bf59895fed53d9d125b64b1a821 Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Thu, 25 May 2017 21:52:40 +0100
Subject: [PATCH 03/29] Add option to change logging level, and default to Info

I'm not having to debug issues from people's log files any more...

Fixes #370
---
 src/SyncTrayzor/Bootstrapper.cs               |  2 +-
 .../Pages/Settings/SettingsView.xaml          |  8 ++++-
 .../Pages/Settings/SettingsViewModel.cs       | 27 +++++++++-----
 .../Properties/Resources.Designer.cs          | 36 +++++++++++++++++++
 src/SyncTrayzor/Properties/Resources.resx     | 16 +++++++++
 .../Services/Config/Configuration.cs          |  5 ++-
 src/SyncTrayzor/Services/Config/LogLevel.cs   | 15 ++++++++
 .../Services/ConfigurationApplicator.cs       | 28 +++++++++++++++
 src/SyncTrayzor/SyncTrayzor.csproj            |  1 +
 9 files changed, 127 insertions(+), 11 deletions(-)
 create mode 100644 src/SyncTrayzor/Services/Config/LogLevel.cs

diff --git a/src/SyncTrayzor/Bootstrapper.cs b/src/SyncTrayzor/Bootstrapper.cs
index ff304303..f9634da2 100644
--- a/src/SyncTrayzor/Bootstrapper.cs
+++ b/src/SyncTrayzor/Bootstrapper.cs
@@ -100,7 +100,7 @@ protected override void Configure()
 
             var logger = LogManager.GetCurrentClassLogger();
             var assembly = this.Container.Get<IAssemblyProvider>();
-            logger.Debug("SyncTrazor version {0} ({1}) started at {2} (.NET version: {3})", assembly.FullVersion, assembly.ProcessorArchitecture, assembly.Location, DotNetVersionFinder.FindDotNetVersion());
+            logger.Info("SyncTrazor version {0} ({1}) started at {2} (.NET version: {3})", assembly.FullVersion, assembly.ProcessorArchitecture, assembly.Location, DotNetVersionFinder.FindDotNetVersion());
 
             // This needs to happen before anything which might cause the unhandled exception stuff to be shown, as that wants to know
             // where to find the log file.
diff --git a/src/SyncTrayzor/Pages/Settings/SettingsView.xaml b/src/SyncTrayzor/Pages/Settings/SettingsView.xaml
index 5b2d0e12..474f1a23 100644
--- a/src/SyncTrayzor/Pages/Settings/SettingsView.xaml
+++ b/src/SyncTrayzor/Pages/Settings/SettingsView.xaml
@@ -213,11 +213,17 @@
             <TabItem Header="{l:Loc SettingsView_Tab_Logging}">
                 <DockPanel>
                     <GroupBox DockPanel.Dock="Bottom" Header="{l:Loc SettingsView_Section_SyncTrayzor}">
-                        <Button DockPanel.Dock="Top" Margin="0,10,0,0" Padding="5,0"
+                        <DockPanel>
+                            <StackPanel DockPanel.Dock="Top" Orientation="Horizontal">
+                                <Label Content="{l:Loc SettingsView_Logging_LogLevel}"/>.
+                                <ComboBox ItemsSource="{Binding LogLevels}" SelectedValuePath="Value" SelectedValue="{Binding SelectedLogLevel.Value}"/>
+                            </StackPanel>
+                            <Button DockPanel.Dock="Top" Margin="0,10,0,0" Padding="5,0"
                                     Command="{s:Action ShowSyncTrayzorLogFile}"
                                     HorizontalAlignment="Left"
                                     Style="{StaticResource DialogButton}"
                                     Content="{l:Loc SettingsView_Logging_ShowSyncTrayzorLog}"/>
+                        </DockPanel>
                     </GroupBox>
 
                     <GroupBox Header="{l:Loc SettingsView_Section_Syncthing}">
diff --git a/src/SyncTrayzor/Pages/Settings/SettingsViewModel.cs b/src/SyncTrayzor/Pages/Settings/SettingsViewModel.cs
index 3a748cb7..9b7aceff 100644
--- a/src/SyncTrayzor/Pages/Settings/SettingsViewModel.cs
+++ b/src/SyncTrayzor/Pages/Settings/SettingsViewModel.cs
@@ -94,6 +94,9 @@ public class SettingsViewModel : Screen
 
         public BindableCollection<DebugFacilitySetting> SyncthingDebugFacilities { get; } = new BindableCollection<DebugFacilitySetting>();
 
+        public BindableCollection<LabelledValue<LogLevel>> LogLevels { get; }
+        public SettingItem<LogLevel> SelectedLogLevel { get; set; }
+
         public SettingsViewModel(
             IConfigurationProvider configurationProvider,
             IAutostartProvider autostartProvider,
@@ -180,6 +183,22 @@ public SettingsViewModel(
             this.SyncthingDenyUpgrade = this.CreateBasicSettingItem(x => x.SyncthingDenyUpgrade);
             this.SyncthingDenyUpgrade.RequiresSyncthingRestart = true;
 
+            this.PriorityLevels = new BindableCollection<LabelledValue<SyncthingPriorityLevel>>()
+            {
+                LabelledValue.Create(Resources.SettingsView_Syncthing_ProcessPriority_AboveNormal, Services.Config.SyncthingPriorityLevel.AboveNormal),
+                LabelledValue.Create(Resources.SettingsView_Syncthing_ProcessPriority_Normal, Services.Config.SyncthingPriorityLevel.Normal),
+                LabelledValue.Create(Resources.SettingsView_Syncthing_ProcessPriority_BelowNormal, Services.Config.SyncthingPriorityLevel.BelowNormal),
+                LabelledValue.Create(Resources.SettingsView_Syncthing_ProcessPriority_Idle, Services.Config.SyncthingPriorityLevel.Idle),
+            };
+
+            this.LogLevels = new BindableCollection<LabelledValue<LogLevel>>()
+            {
+                LabelledValue.Create(Resources.SettingsView_Logging_LogLevel_Info, LogLevel.Info),
+                LabelledValue.Create(Resources.SettingsView_Logging_LogLevel_Debug, LogLevel.Debug),
+                LabelledValue.Create(Resources.SettingsView_Logging_LogLevel_Trace, LogLevel.Trace),
+            };
+            this.SelectedLogLevel = this.CreateBasicSettingItem(x => x.LogLevel);
+
             var configuration = this.configurationProvider.Load();
 
             foreach (var settingItem in this.settings)
@@ -193,14 +212,6 @@ public SettingsViewModel(
                 folderSetting.Bind(s => s.IsNotified, (o, e) => this.UpdateAreAllFoldersNotified());
             }
 
-            this.PriorityLevels = new BindableCollection<LabelledValue<SyncthingPriorityLevel>>()
-            {
-                LabelledValue.Create(Resources.SettingsView_Syncthing_ProcessPriority_AboveNormal, Services.Config.SyncthingPriorityLevel.AboveNormal),
-                LabelledValue.Create(Resources.SettingsView_Syncthing_ProcessPriority_Normal, Services.Config.SyncthingPriorityLevel.Normal),
-                LabelledValue.Create(Resources.SettingsView_Syncthing_ProcessPriority_BelowNormal, Services.Config.SyncthingPriorityLevel.BelowNormal),
-                LabelledValue.Create(Resources.SettingsView_Syncthing_ProcessPriority_Idle, Services.Config.SyncthingPriorityLevel.Idle),
-            };
-
             this.Bind(s => s.AreAllFoldersNotified, (o, e) =>
             {
                 if (this.updatingFolderSettings)
diff --git a/src/SyncTrayzor/Properties/Resources.Designer.cs b/src/SyncTrayzor/Properties/Resources.Designer.cs
index 38fdf714..810796e1 100644
--- a/src/SyncTrayzor/Properties/Resources.Designer.cs
+++ b/src/SyncTrayzor/Properties/Resources.Designer.cs
@@ -936,6 +936,42 @@ public static string SettingsView_Logging_Explanation {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Log Level:.
+        /// </summary>
+        public static string SettingsView_Logging_LogLevel {
+            get {
+                return ResourceManager.GetString("SettingsView_Logging_LogLevel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Debug.
+        /// </summary>
+        public static string SettingsView_Logging_LogLevel_Debug {
+            get {
+                return ResourceManager.GetString("SettingsView_Logging_LogLevel_Debug", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Info (Default).
+        /// </summary>
+        public static string SettingsView_Logging_LogLevel_Info {
+            get {
+                return ResourceManager.GetString("SettingsView_Logging_LogLevel_Info", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Trace.
+        /// </summary>
+        public static string SettingsView_Logging_LogLevel_Trace {
+            get {
+                return ResourceManager.GetString("SettingsView_Logging_LogLevel_Trace", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Show Syncthing Log File.
         /// </summary>
diff --git a/src/SyncTrayzor/Properties/Resources.resx b/src/SyncTrayzor/Properties/Resources.resx
index ceee06c9..adba0914 100644
--- a/src/SyncTrayzor/Properties/Resources.resx
+++ b/src/SyncTrayzor/Properties/Resources.resx
@@ -964,4 +964,20 @@ Please donate to my charity fundraising campaign.</value>
     <value>Donate</value>
     <comment>Shown in the top right of the menu bar, if the user hasn't yet donated</comment>
   </data>
+  <data name="SettingsView_Logging_LogLevel" xml:space="preserve">
+    <value>Log Level:</value>
+    <comment>Label shown before SyncTrayzor logging level ComboBox</comment>
+  </data>
+  <data name="SettingsView_Logging_LogLevel_Debug" xml:space="preserve">
+    <value>Debug</value>
+    <comment>Name for the Debug log level (which provides lots of debug info)</comment>
+  </data>
+  <data name="SettingsView_Logging_LogLevel_Info" xml:space="preserve">
+    <value>Info (Default)</value>
+    <comment>Name for the Info log level</comment>
+  </data>
+  <data name="SettingsView_Logging_LogLevel_Trace" xml:space="preserve">
+    <value>Trace</value>
+    <comment>Name for the Trace log level (which provides the most debug info)</comment>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/SyncTrayzor/Services/Config/Configuration.cs b/src/SyncTrayzor/Services/Config/Configuration.cs
index dbd9c6db..d4ccce16 100644
--- a/src/SyncTrayzor/Services/Config/Configuration.cs
+++ b/src/SyncTrayzor/Services/Config/Configuration.cs
@@ -74,6 +74,7 @@ public string LatestNotifiedVersionRaw
         public IconAnimationMode IconAnimationMode { get; set; }
         public string OpenFolderCommand { get; set; }
         public string ShowFileInFolderCommand { get; set; }
+        public LogLevel LogLevel { get; set; }
 
         public Configuration()
         {
@@ -113,6 +114,7 @@ public Configuration()
             this.IconAnimationMode = IconAnimationMode.DataTransferring;
             this.OpenFolderCommand = "explorer.exe \"{0}\"";
             this.ShowFileInFolderCommand = "explorer.exe /select, \"{0}\"";
+            this.LogLevel = LogLevel.Info;
         }
 
         public Configuration(Configuration other)
@@ -151,6 +153,7 @@ public Configuration(Configuration other)
             this.IconAnimationMode = other.IconAnimationMode;
             this.OpenFolderCommand = other.OpenFolderCommand;
             this.ShowFileInFolderCommand = other.ShowFileInFolderCommand;
+            this.LogLevel = other.LogLevel;
         }
 
         public override string ToString()
@@ -169,7 +172,7 @@ public override string ToString()
                 $"EnableConflictFileMonitoring={this.EnableConflictFileMonitoring} SyncthingDebugFacilities=[{String.Join(",", this.SyncthingDebugFacilities)}] "+
                 $"ConflictResolverDeletesToRecycleBin={this.ConflictResolverDeletesToRecycleBin} PauseDevicesOnMeteredNetworks={this.PauseDevicesOnMeteredNetworks} "+
                 $"HaveDonated={this.HaveDonated} IconAnimationMode={this.IconAnimationMode} OpenFolderCommand={this.OpenFolderCommand} ShowFileInFolderCommand={this.ShowFileInFolderCommand}" +
-                $">";
+                $"LogLevel={this.LogLevel}>";
         }
     }
 }
diff --git a/src/SyncTrayzor/Services/Config/LogLevel.cs b/src/SyncTrayzor/Services/Config/LogLevel.cs
new file mode 100644
index 00000000..9c79803f
--- /dev/null
+++ b/src/SyncTrayzor/Services/Config/LogLevel.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SyncTrayzor.Services.Config
+{
+    public enum LogLevel
+    {
+        Info,
+        Debug,
+        Trace,
+    }
+}
diff --git a/src/SyncTrayzor/Services/ConfigurationApplicator.cs b/src/SyncTrayzor/Services/ConfigurationApplicator.cs
index 0010e7c7..5eb7e01d 100644
--- a/src/SyncTrayzor/Services/ConfigurationApplicator.cs
+++ b/src/SyncTrayzor/Services/ConfigurationApplicator.cs
@@ -6,6 +6,7 @@
 using System;
 using System.Linq;
 using SyncTrayzor.Services.Metering;
+using System.Collections.Generic;
 
 namespace SyncTrayzor.Services
 {
@@ -116,6 +117,33 @@ private void ApplyNewConfiguration(Configuration configuration)
 
             this.alertsManager.EnableConflictedFileAlerts = configuration.EnableConflictFileMonitoring;
             this.alertsManager.EnableFailedTransferAlerts = configuration.EnableFailedTransferAlerts;
+
+            SetLogLevel(configuration);
+        }
+
+        private static readonly Dictionary<LogLevel, NLog.LogLevel> logLevelMapping = new Dictionary<Config.LogLevel, NLog.LogLevel>()
+        {
+            { LogLevel.Info, NLog.LogLevel.Info },
+            { LogLevel.Debug, NLog.LogLevel.Debug },
+            { LogLevel.Trace, NLog.LogLevel.Trace },
+        };
+
+        private static void SetLogLevel(Configuration configuration)
+        {
+            var logLevel = logLevelMapping[configuration.LogLevel];
+            var rules = NLog.LogManager.Configuration.LoggingRules;
+            var logFileRule = rules.FirstOrDefault(rule => rule.Targets.Any(target => target.Name == "logfile"));
+            if (logFileRule != null)
+            {
+                foreach (var level in NLog.LogLevel.AllLoggingLevels)
+                {
+                    if (level < logLevel)
+                        logFileRule.DisableLoggingForLevel(level);
+                    else
+                        logFileRule.EnableLoggingForLevel(level);
+                }
+                NLog.LogManager.ReconfigExistingLoggers();
+            }
         }
 
         private void OnDataLoaded(object sender, EventArgs e)
diff --git a/src/SyncTrayzor/SyncTrayzor.csproj b/src/SyncTrayzor/SyncTrayzor.csproj
index 202562a7..4065555b 100644
--- a/src/SyncTrayzor/SyncTrayzor.csproj
+++ b/src/SyncTrayzor/SyncTrayzor.csproj
@@ -245,6 +245,7 @@
     <Compile Include="Services\Config\EnvironmentalVariableCollection.cs" />
     <Compile Include="Services\Config\FolderConfiguration.cs" />
     <Compile Include="Services\Config\IconAnimationMode.cs" />
+    <Compile Include="Services\Config\LogLevel.cs" />
     <Compile Include="Services\Config\SyncthingPriorityLevel.cs" />
     <Compile Include="Services\Config\SyncTrayzorVariant.cs" />
     <Compile Include="Services\Config\WindowPlacement.cs" />

From 087029944ca42ccee492286e0385fe434cbce6f0 Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Mon, 29 May 2017 09:48:37 +0100
Subject: [PATCH 04/29] Set file version on installer

---
 installer/common.iss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/installer/common.iss b/installer/common.iss
index a3606cf4..7d351c73 100644
--- a/installer/common.iss
+++ b/installer/common.iss
@@ -16,6 +16,7 @@
 AppId={{#AppId}
 AppName={#AppName} ({#Arch})
 AppVersion={#AppVersion}
+VersionInfoVersion={#AppVersion}
 ;AppVerName={#AppName} {#AppVersion}
 AppPublisher={#AppPublisher}
 AppPublisherURL={#AppURL}

From d9c20fd4f81cb0abb25ebe52e609d1b1782bc176 Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Mon, 5 Jun 2017 21:39:31 +0100
Subject: [PATCH 05/29] Add a /StartSyncTrayzor installer parameter

This causes SyncTrayzor to be started if the installer is started
with /silent, and will start it minimized.

Fixes #371
---
 README.md            |  7 +++++++
 installer/common.iss | 31 +++++++++++++++++++++++++++----
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 8907c226..7d358bac 100644
--- a/README.md
+++ b/README.md
@@ -205,3 +205,10 @@ Building from Source
 You'll need [Visual Studio 2017](https://www.visualstudio.com/en-us/downloads/download-visual-studio-vs.aspx).
 Clone/download the repository, open `src\SyncTrayzor.sln`, and compile.
 You'll also need to [download syncthing.exe](https://github.com/syncthing/syncthing/releases) and place it in the `bin\x86\Debug`, `bin\x64\Debug`, `bin\x86\Release`, or `bin\x64\Release` folder as appropriate.
+
+
+Notes for System Administrators
+-------------------------------
+
+The installer is built using Inno Setup, and has various command-line options, [documented here](http://www.jrsoftware.org/ishelp/index.php?topic=setupcmdline).
+If you pass the `/silent` command-line flag when SyncTrayzor won't be launched when the installer completes: add `/StartSyncTrayzor` to override this (which also caused SyncTrayzor to be launched minimized).
\ No newline at end of file
diff --git a/installer/common.iss b/installer/common.iss
index 7d351c73..bd10bde7 100644
--- a/installer/common.iss
+++ b/installer/common.iss
@@ -80,7 +80,7 @@ Name: "{group}\{cm:UninstallProgram,{#AppName}}"; Filename: "{uninstallexe}"
 Name: "{commondesktop}\{#AppName}"; Filename: "{app}\{#AppExeName}"; Tasks: desktopicon
 
 [Run]
-Filename: "{app}\{#AppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(AppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
+Filename: "{app}\{#AppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(AppName, '&', '&&')}}"; Flags: nowait postinstall; Parameters: {code:SyncTrayzorStartFlags}; Check: ShouldStartSyncTrayzor
 
 [Code]
 var
@@ -239,10 +239,33 @@ begin
   Result := GlobalRestartRequired;
 end;
 
+function ShouldStartSyncTrayzor(): Boolean;
+var
+  flagPassed: Boolean;
+  i: Integer;
+begin
+  // Can't use {param}, as it doesn't match flags with no value
+  flagPassed := False;
+  for i := 0 to ParamCount do begin
+    if ParamStr(i) = '/StartSyncTrayzor' then begin
+      flagPassed := True;
+      break;
+    end;
+  end;
+  Result := (not WizardSilent()) or flagPassed;
+end;
+
+function SyncTrayzorStartFlags(param: String): String;
+begin
+   if WizardSilent() then begin
+      Result := '-minimized'
+   end else begin
+      Result := ''
+   end;
+end;
+
 [UninstallDelete]
 Type: files; Name: "{app}\ProcessRunner.exe.old"
 Type: files; Name: "{app}\InstallCount.txt"
 Type: filesandordirs; Name: "{userappdata}\{#AppDataFolder}"
-Type: filesandordirs; Name: "{localappdata}\{#AppDataFolder}"
-
-
+Type: filesandordirs; Name: "{localappdata}\{#AppDataFolder}"
\ No newline at end of file

From 4fee8185828b72aab31367167233bce6b08953ad Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Thu, 8 Jun 2017 12:15:55 +0100
Subject: [PATCH 06/29] Fix typo which was crashing the settings screen

---
 src/SyncTrayzor/Pages/Settings/SettingsView.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SyncTrayzor/Pages/Settings/SettingsView.xaml b/src/SyncTrayzor/Pages/Settings/SettingsView.xaml
index 474f1a23..e030b711 100644
--- a/src/SyncTrayzor/Pages/Settings/SettingsView.xaml
+++ b/src/SyncTrayzor/Pages/Settings/SettingsView.xaml
@@ -215,7 +215,7 @@
                     <GroupBox DockPanel.Dock="Bottom" Header="{l:Loc SettingsView_Section_SyncTrayzor}">
                         <DockPanel>
                             <StackPanel DockPanel.Dock="Top" Orientation="Horizontal">
-                                <Label Content="{l:Loc SettingsView_Logging_LogLevel}"/>.
+                                <Label Content="{l:Loc SettingsView_Logging_LogLevel}"/>
                                 <ComboBox ItemsSource="{Binding LogLevels}" SelectedValuePath="Value" SelectedValue="{Binding SelectedLogLevel.Value}"/>
                             </StackPanel>
                             <Button DockPanel.Dock="Top" Margin="0,10,0,0" Padding="5,0"

From a20fe08694f6bee13df35cc2b5d16dc238a7a236 Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Tue, 20 Jun 2017 10:15:13 +0100
Subject: [PATCH 07/29] Try a different approach to see if we have registry
 access

Fixes #378
---
 src/SyncTrayzor/Services/AutostartProvider.cs | 44 ++++++++++++++-----
 1 file changed, 32 insertions(+), 12 deletions(-)

diff --git a/src/SyncTrayzor/Services/AutostartProvider.cs b/src/SyncTrayzor/Services/AutostartProvider.cs
index 029ec95b..5edd77e4 100644
--- a/src/SyncTrayzor/Services/AutostartProvider.cs
+++ b/src/SyncTrayzor/Services/AutostartProvider.cs
@@ -57,28 +57,47 @@ public AutostartProvider(IAssemblyProvider assemblyProvider)
             // Default
             this.IsEnabled = true;
 
-            this.CheckAccess();
-
             // Find a key, if we can, which points to our current location
-            if (this.CanRead)
-                this.keyName = this.FindKeyName();
+            this.keyName = this.FindKeyNameAndCheckAccess();
         }
 
-        private void CheckAccess()
+        private string FindKeyNameAndCheckAccess()
         {
+            string keyName = null;
+
+            try
+            {
+                keyName = this.FindKeyName();
+            }
+            catch (Exception e) when (e is SecurityException || e is UnauthorizedAccessException)
+            {
+                // Can't even get the key name? 
+                logger.Warn("Unable to find registry key name: do not have read access to the registry");
+                return null;
+            }
+
             try
             {
                 using (var key = this.OpenRegistryKey(true))
                 {
                     if (key != null) // It's null if "there was an error"
                     {
-                        // We can open it, but not have access to create subkeys, I think
-                        new RegistryPermission(RegistryPermissionAccess.AllAccess, runPathWithHive).Demand();
+                        // We can open it, but not have access to edit this value
+                        var value = key.GetValue(keyName);
+                        if (value != null)
+                        {
+                            key.SetValue(keyName, value);
+                        }
+                        else
+                        {
+                            key.SetValue(keyName, string.Empty);
+                            key.DeleteValue(keyName);
+                        }
 
                         this._canWrite = true;
                         this._canRead = true;
                         logger.Debug("Have read/write access to the registry");
-                        return;
+                        return keyName;
                     }
                 }
             }
@@ -91,19 +110,20 @@ private void CheckAccess()
                 {
                     if (key != null) // It's null if "there was an error"
                     {
-                        // We can open it, but not have access to read subkeys, I think
-                        new RegistryPermission(RegistryPermissionAccess.Read, runPathWithHive).Demand();
+                        // We can open it, but not have access to read this value
+                        var value = key.GetValue(keyName);
 
                         this._canRead = true;
                         logger.Warn("Have read-only access to the registry");
-                        return;
+                        return keyName;
                     }
                 }
             }
             catch (SecurityException) { }
             catch (UnauthorizedAccessException) { }
 
-            logger.Warn("Have no access to the registry");
+            logger.Warn("Could find registry key name, but have no access to the registry");
+            return null;
         }
 
         private string FindKeyName()

From fe6304ca512e5ceda18f1747979ad90d303864aa Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Sun, 25 Jun 2017 14:01:34 +0100
Subject: [PATCH 08/29] Remove a useless line from SyncthingConnectionsWatcher,
 fixing NRE

Not sure why this was ever added. It caused an NRE if prevConnections was null.

Fixes #380
---
 src/SyncTrayzor/Syncthing/SyncthingConnectionsWatcher.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/SyncTrayzor/Syncthing/SyncthingConnectionsWatcher.cs b/src/SyncTrayzor/Syncthing/SyncthingConnectionsWatcher.cs
index 514642e8..913122e5 100644
--- a/src/SyncTrayzor/Syncthing/SyncthingConnectionsWatcher.cs
+++ b/src/SyncTrayzor/Syncthing/SyncthingConnectionsWatcher.cs
@@ -45,7 +45,6 @@ protected override void OnStart()
         protected override void OnStop()
         {
             this.apiClient = null;
-            var prev = this.prevConnections.Total;
 
             // Send an update with zero transfer rate, since that's what we're now doing
             this.Update(this.prevConnections);

From fad5fb6aff41cbb455f8a8d36972b11ed4dfcc7b Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Tue, 27 Jun 2017 16:19:26 +0100
Subject: [PATCH 09/29] Make FreePortFinder more resilient

User reported that FreePortFinder was failing to find a free port when
another instance of Syncthing was running - it was rethrowing the exception
after the first attempt, which means it's a SocketError I wasn't anticipating.
There isn't enough information to say what SocketError it was though.

Just continue on all of them. We'll give up after a few anyway.

Fixes #381
---
 src/SyncTrayzor/Syncthing/FreePortFinder.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/SyncTrayzor/Syncthing/FreePortFinder.cs b/src/SyncTrayzor/Syncthing/FreePortFinder.cs
index b0f6bb36..8bc1d5aa 100644
--- a/src/SyncTrayzor/Syncthing/FreePortFinder.cs
+++ b/src/SyncTrayzor/Syncthing/FreePortFinder.cs
@@ -31,10 +31,7 @@ public int FindFreePort(int startingPort)
                 }
                 catch (SocketException e)
                 {
-                    if (e.SocketErrorCode == SocketError.AddressAlreadyInUse)
-                        lastException = e;
-                    else
-                        throw;
+                    lastException = e;
                 }
             }
 

From 370ac528bde9fcad685a60677300d97464d14222 Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Fri, 4 Aug 2017 12:37:20 +0100
Subject: [PATCH 10/29] Don't store an API Key in config

There's no need to any more. Just generate a new one on each startup.

We used to generate and store one in the days when Syncthing could only
accept a single API key. Therefore we let the user change the API key
in our config, so they could also use that AIP key in other applications.
Since Syncthing began allowing us to specify an additional API key, this
became no longer necessary. We remove the API key from the settings UI,
but did not remove it from the config.
---
 .../Settings/SyncthingApiKeyValidator.cs      | 17 ----------------
 .../Properties/Resources.Designer.cs          |  9 ---------
 src/SyncTrayzor/Properties/Resources.resx     |  5 +----
 .../Services/Config/Configuration.cs          |  7 ++-----
 .../Services/Config/ConfigurationProvider.cs  | 17 ----------------
 .../Services/ConfigurationApplicator.cs       |  1 -
 src/SyncTrayzor/SyncTrayzor.csproj            |  1 -
 src/SyncTrayzor/Syncthing/SyncthingManager.cs | 20 +++++++++++++++++--
 8 files changed, 21 insertions(+), 56 deletions(-)
 delete mode 100644 src/SyncTrayzor/Pages/Settings/SyncthingApiKeyValidator.cs

diff --git a/src/SyncTrayzor/Pages/Settings/SyncthingApiKeyValidator.cs b/src/SyncTrayzor/Pages/Settings/SyncthingApiKeyValidator.cs
deleted file mode 100644
index bab1ea8c..00000000
--- a/src/SyncTrayzor/Pages/Settings/SyncthingApiKeyValidator.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using FluentValidation;
-using SyncTrayzor.Properties;
-using System.Linq;
-
-namespace SyncTrayzor.Pages.Settings
-{
-    public class SyncthingApiKeyValidator : AbstractValidator<SettingItem<string>>
-    {
-        private const string apiKeyChars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-";
-
-        public SyncthingApiKeyValidator()
-        {
-            RuleFor(x => x.Value).NotEmpty().WithMessage(Resources.SettingsView_Validation_NotShouldBeEmpty);
-            RuleFor(x => x.Value).Must(x => x.All(c => apiKeyChars.Contains(c))).WithMessage(Resources.SettingsView_Validation_ApiKeyInvalidChars);
-        }
-    }
-}
diff --git a/src/SyncTrayzor/Properties/Resources.Designer.cs b/src/SyncTrayzor/Properties/Resources.Designer.cs
index 810796e1..2d7cbd13 100644
--- a/src/SyncTrayzor/Properties/Resources.Designer.cs
+++ b/src/SyncTrayzor/Properties/Resources.Designer.cs
@@ -1399,15 +1399,6 @@ public static string SettingsView_UseComputerCulture {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to API key should contain only a-z A-Z 0-9 and -.
-        /// </summary>
-        public static string SettingsView_Validation_ApiKeyInvalidChars {
-            get {
-                return ResourceManager.GetString("SettingsView_Validation_ApiKeyInvalidChars", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Must have the form &apos;host:port&apos;, e.g. &apos;localhost:8384&apos;.
         /// </summary>
diff --git a/src/SyncTrayzor/Properties/Resources.resx b/src/SyncTrayzor/Properties/Resources.resx
index adba0914..6572985e 100644
--- a/src/SyncTrayzor/Properties/Resources.resx
+++ b/src/SyncTrayzor/Properties/Resources.resx
@@ -338,7 +338,7 @@ Please adjust your settings / whitelists to allow '{1}' to execute</value>
   </data>
   <data name="SettingsView_Validation_NotShouldBeEmpty" xml:space="preserve">
     <value>Should not be empty</value>
-    <comment>Validation message (shown in red) below the SettingsView_SyncthingAddress or SettingsView_ApiKey fields when the user makes this field empty</comment>
+    <comment>Validation message (shown in red) below the SettingsView_SyncthingAddress field when the user makes this field empty</comment>
   </data>
   <data name="ThirdPartyComponentsView_ComponentDescriptionLabel" xml:space="preserve">
     <value>Description:</value>
@@ -637,9 +637,6 @@ Full Path: {1}</value>
   <data name="SettingsView_DisableHardwareRendering" xml:space="preserve">
     <value>Disable hardware rendering</value>
   </data>
-  <data name="SettingsView_Validation_ApiKeyInvalidChars" xml:space="preserve">
-    <value>API key should contain only a-z A-Z 0-9 and -</value>
-  </data>
   <data name="SettingsView_RestartSyncthing_Message" xml:space="preserve">
     <value>You must restart Syncthing for these settings to take effect.
 
diff --git a/src/SyncTrayzor/Services/Config/Configuration.cs b/src/SyncTrayzor/Services/Config/Configuration.cs
index d4ccce16..aeaeb12e 100644
--- a/src/SyncTrayzor/Services/Config/Configuration.cs
+++ b/src/SyncTrayzor/Services/Config/Configuration.cs
@@ -31,7 +31,6 @@ public int Version
         public bool ShowSynchronizedBalloonEvenIfNothingDownloaded { get; set; }
         public string SyncthingAddress { get; set; }
         public bool StartSyncthingAutomatically { get; set; }
-        public string SyncthingApiKey { get; set; }
 
         [XmlArrayItem("SyncthingCommandLineFlag")]
         public List<string> SyncthingCommandLineFlags { get; set; }
@@ -88,7 +87,6 @@ public Configuration()
             this.ShowDeviceOrFolderRejectedBalloons = true;
             this.SyncthingAddress = "localhost:8384";
             this.StartSyncthingAutomatically = true;
-            this.SyncthingApiKey = null;
             this.SyncthingCommandLineFlags = new List<string>();
             this.SyncthingEnvironmentalVariables = new EnvironmentalVariableCollection();
             this.SyncthingDenyUpgrade = false;
@@ -127,7 +125,6 @@ public Configuration(Configuration other)
             this.ShowDeviceOrFolderRejectedBalloons = other.ShowDeviceOrFolderRejectedBalloons;
             this.SyncthingAddress = other.SyncthingAddress;
             this.StartSyncthingAutomatically = other.StartSyncthingAutomatically;
-            this.SyncthingApiKey = other.SyncthingApiKey;
             this.SyncthingCommandLineFlags = other.SyncthingCommandLineFlags;
             this.SyncthingEnvironmentalVariables = other.SyncthingEnvironmentalVariables;
             this.SyncthingDenyUpgrade = other.SyncthingDenyUpgrade;
@@ -161,8 +158,8 @@ public override string ToString()
             return $"<Configuration ShowTrayIconOnlyOnClose={this.ShowTrayIconOnlyOnClose} MinimizeToTray={this.MinimizeToTray} CloseToTray={this.CloseToTray} " +
                 $"ShowDeviceConnectivityBalloons={this.ShowDeviceConnectivityBalloons} ShowDeviceOrFolderRejectedBalloons={this.ShowDeviceOrFolderRejectedBalloons} " +
                 $"SyncthingAddress={this.SyncthingAddress} StartSyncthingAutomatically={this.StartSyncthingAutomatically} " +
-                $"SyncthingCommandLineFlags=[{String.Join(",", this.SyncthingCommandLineFlags)}]" +
-                $"SyncthingApiKey={this.SyncthingApiKey} SyncthingEnvironmentalVariables=[{String.Join(" ", this.SyncthingEnvironmentalVariables)}] " +
+                $"SyncthingCommandLineFlags=[{String.Join(",", this.SyncthingCommandLineFlags)}] " +
+                $"SyncthingEnvironmentalVariables=[{String.Join(" ", this.SyncthingEnvironmentalVariables)}] " +
                 $"SyncthingDenyUpgrade={this.SyncthingDenyUpgrade} SyncthingPriorityLevel={this.SyncthingPriorityLevel} " +
                 $"Folders=[{String.Join(", ", this.Folders)}] NotifyOfNewVersions={this.NotifyOfNewVersions} LatestNotifiedVersion={this.LatestNotifiedVersion} " +
                 $"ObfuscateDeviceIDs={this.ObfuscateDeviceIDs} UseComputerCulture={this.UseComputerCulture} SyncthingConsoleHeight={this.SyncthingConsoleHeight} WindowPlacement={this.WindowPlacement} " +
diff --git a/src/SyncTrayzor/Services/Config/ConfigurationProvider.cs b/src/SyncTrayzor/Services/Config/ConfigurationProvider.cs
index 7a71ddbc..ff23cb49 100644
--- a/src/SyncTrayzor/Services/Config/ConfigurationProvider.cs
+++ b/src/SyncTrayzor/Services/Config/ConfigurationProvider.cs
@@ -36,9 +36,6 @@ public interface IConfigurationProvider
 
     public class ConfigurationProvider : IConfigurationProvider
     {
-        private const string apiKeyChars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-";
-        private const int apiKeyLength = 40;
-
         // Together these come to half a second, which is probably sensible
         private const int fileSaveRetryCount = 10;
         private const int fileSaveFailureDelayMs = 50;
@@ -179,9 +176,6 @@ private Configuration LoadFromDisk(Configuration defaultConfiguration, out bool
                 throw new BadConfigurationException(this.paths.ConfigurationFilePath, e);
             }
 
-            if (configuration.SyncthingApiKey == null)
-                configuration.SyncthingApiKey = this.GenerateApiKey();
-
             this.SaveToFile(configuration);
 
             return configuration;
@@ -432,17 +426,6 @@ private void SaveToFile(Configuration config)
                 throw new CouldNotSaveConfigurationExeption(this.paths.ConfigurationFilePath, lastException);
         }
 
-        private string GenerateApiKey()
-        {
-            var random = new Random();
-            var apiKey = new char[apiKeyLength];
-            for (int i = 0; i < apiKeyLength; i++)
-            {
-                apiKey[i] = apiKeyChars[random.Next(apiKeyChars.Length)];
-            }
-            return new string(apiKey);
-        }
-
         private void OnConfigurationChanged(Configuration newConfiguration)
         {
             this.eventDispatcher.Raise(this.ConfigurationChanged, new ConfigurationChangedEventArgs(newConfiguration));
diff --git a/src/SyncTrayzor/Services/ConfigurationApplicator.cs b/src/SyncTrayzor/Services/ConfigurationApplicator.cs
index 5eb7e01d..227efcc9 100644
--- a/src/SyncTrayzor/Services/ConfigurationApplicator.cs
+++ b/src/SyncTrayzor/Services/ConfigurationApplicator.cs
@@ -92,7 +92,6 @@ private void ApplyNewConfiguration(Configuration configuration)
             this.notifyIconManager.ShowDeviceOrFolderRejectedBalloons = configuration.ShowDeviceOrFolderRejectedBalloons;
 
             this.syncthingManager.PreferredHostAndPort = configuration.SyncthingAddress;
-            this.syncthingManager.ApiKey = configuration.SyncthingApiKey;
             this.syncthingManager.SyncthingCommandLineFlags = configuration.SyncthingCommandLineFlags;
             this.syncthingManager.SyncthingEnvironmentalVariables = configuration.SyncthingEnvironmentalVariables;
             this.syncthingManager.SyncthingCustomHomeDir = String.IsNullOrWhiteSpace(configuration.SyncthingCustomHomePath) ?
diff --git a/src/SyncTrayzor/SyncTrayzor.csproj b/src/SyncTrayzor/SyncTrayzor.csproj
index 4065555b..8c4ccb58 100644
--- a/src/SyncTrayzor/SyncTrayzor.csproj
+++ b/src/SyncTrayzor/SyncTrayzor.csproj
@@ -225,7 +225,6 @@
     <Compile Include="Pages\Settings\KeyValueStringParser.cs" />
     <Compile Include="Pages\Settings\SettingItem.cs" />
     <Compile Include="Pages\Settings\SyncthingAddressValidator.cs" />
-    <Compile Include="Pages\Settings\SyncthingApiKeyValidator.cs" />
     <Compile Include="Pages\Settings\SyncthingCommandLineFlagsValidator.cs" />
     <Compile Include="Pages\Settings\SyncthingEnvironmentalVariablesValidator.cs" />
     <Compile Include="Pages\Tray\FileTransferViewModel.cs" />
diff --git a/src/SyncTrayzor/Syncthing/SyncthingManager.cs b/src/SyncTrayzor/Syncthing/SyncthingManager.cs
index 2068d6fe..058a26a3 100644
--- a/src/SyncTrayzor/Syncthing/SyncthingManager.cs
+++ b/src/SyncTrayzor/Syncthing/SyncthingManager.cs
@@ -31,7 +31,7 @@ public interface ISyncthingManager : IDisposable
         event EventHandler<FolderRejectedEventArgs> FolderRejected;
 
         string ExecutablePath { get; set; }
-        string ApiKey { get; set; }
+        string ApiKey { get; }
         string PreferredHostAndPort { get; set; }
         Uri Address { get; set; }
         List<string> SyncthingCommandLineFlags { get; set; }
@@ -62,6 +62,9 @@ public interface ISyncthingManager : IDisposable
 
     public class SyncthingManager : ISyncthingManager
     {
+        private const string apiKeyChars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-";
+        private const int apiKeyLength = 40;
+
         private static readonly Logger logger = LogManager.GetCurrentClassLogger();
 
         private readonly SynchronizedEventDispatcher eventDispatcher;
@@ -121,7 +124,7 @@ public SyncthingConnectionStats TotalConnectionStats
         public event EventHandler ProcessExitedWithError;
 
         public string ExecutablePath { get; set; }
-        public string ApiKey { get; set; }
+        public string ApiKey { get; }
         public string PreferredHostAndPort { get; set; }
         public Uri Address { get; set; }
         public string SyncthingCustomHomeDir { get; set; }
@@ -159,6 +162,8 @@ public SyncthingManager(
             this.StartedTime = DateTime.MinValue;
             this.LastConnectivityEventTime = DateTime.MinValue;
 
+            this.ApiKey = this.GenerateApiKey();
+
             this.eventDispatcher = new SynchronizedEventDispatcher(this);
             this.processRunner = processRunner;
             this.apiClientFactory = apiClientFactory;
@@ -319,6 +324,17 @@ private void SetState(SyncthingState state)
             }
         }
 
+        private string GenerateApiKey()
+        {
+            var random = new Random();
+            var apiKey = new char[apiKeyLength];
+            for (int i = 0; i < apiKeyLength; i++)
+            {
+                apiKey[i] = apiKeyChars[random.Next(apiKeyChars.Length)];
+            }
+            return new string(apiKey);
+        }
+
         private async Task CreateApiClientAsync(CancellationToken cancellationToken)
         {
             logger.Debug("Starting API clients");

From ff69c8309e1964bafea15510e334b022c7964a6b Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Sat, 26 Aug 2017 15:47:08 +0100
Subject: [PATCH 11/29] Upgrade RestEase

Fixes #400
---
 src/SyncTrayzor/SyncTrayzor.csproj | 5 ++---
 src/SyncTrayzor/packages.config    | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/SyncTrayzor/SyncTrayzor.csproj b/src/SyncTrayzor/SyncTrayzor.csproj
index 8c4ccb58..e0fd6c87 100644
--- a/src/SyncTrayzor/SyncTrayzor.csproj
+++ b/src/SyncTrayzor/SyncTrayzor.csproj
@@ -136,9 +136,8 @@
       <HintPath>..\packages\PropertyChanged.Fody.1.52.1\lib\netstandard10\PropertyChanged.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="RestEase, Version=1.3.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\RestEase.1.3.2\lib\net45\RestEase.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="RestEase, Version=1.4.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\RestEase.1.4.3\lib\net45\RestEase.dll</HintPath>
     </Reference>
     <Reference Include="SmartFormat, Version=2.0.0.0, Culture=neutral, PublicKeyToken=568866805651201f, processorArchitecture=MSIL">
       <HintPath>..\packages\SmartFormat.NET.2.0.0.0\lib\net45\SmartFormat.dll</HintPath>
diff --git a/src/SyncTrayzor/packages.config b/src/SyncTrayzor/packages.config
index 2e455d2a..595c9513 100644
--- a/src/SyncTrayzor/packages.config
+++ b/src/SyncTrayzor/packages.config
@@ -14,7 +14,7 @@
   <package id="OxyPlot.Wpf" version="1.0.0" targetFramework="net451" />
   <package id="Pri.LongPath" version="2.0.42" targetFramework="net451" />
   <package id="PropertyChanged.Fody" version="1.52.1" targetFramework="net451" developmentDependency="true" />
-  <package id="RestEase" version="1.3.2" targetFramework="net451" />
+  <package id="RestEase" version="1.4.3" targetFramework="net451" />
   <package id="Rx-Core" version="2.2.5" targetFramework="net451" />
   <package id="Rx-Interfaces" version="2.2.5" targetFramework="net451" />
   <package id="Rx-Linq" version="2.2.5" targetFramework="net451" />

From 4cf0f054c811be4b724257c7b343e1db2a0a9670 Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Sun, 3 Sep 2017 12:21:26 +0100
Subject: [PATCH 12/29] Increase device connected/disconnected debounce time

---
 src/SyncTrayzor/NotifyIcon/ConnectedEventDebouncer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SyncTrayzor/NotifyIcon/ConnectedEventDebouncer.cs b/src/SyncTrayzor/NotifyIcon/ConnectedEventDebouncer.cs
index 18c160b2..f0cced10 100644
--- a/src/SyncTrayzor/NotifyIcon/ConnectedEventDebouncer.cs
+++ b/src/SyncTrayzor/NotifyIcon/ConnectedEventDebouncer.cs
@@ -16,7 +16,7 @@ public interface IConnectedEventDebouncer
 
     public class ConnectedEventDebouncer : IConnectedEventDebouncer
     {
-        private static readonly TimeSpan debounceTime = TimeSpan.FromSeconds(1);
+        private static readonly TimeSpan debounceTime = TimeSpan.FromSeconds(10);
 
         private readonly object syncRoot = new object();
 

From b21cc0658f25ec59a983989bf4dc21baa3050c73 Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Sun, 3 Sep 2017 13:02:58 +0100
Subject: [PATCH 13/29] Add /SyncTrayzorExeConfig installer parameter to
 override SyncTrayzor.exe.config

Fixes #402
---
 README.md            |  8 +++++++-
 installer/common.iss | 16 ++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7d358bac..0ccfa8be 100644
--- a/README.md
+++ b/README.md
@@ -211,4 +211,10 @@ Notes for System Administrators
 -------------------------------
 
 The installer is built using Inno Setup, and has various command-line options, [documented here](http://www.jrsoftware.org/ishelp/index.php?topic=setupcmdline).
-If you pass the `/silent` command-line flag when SyncTrayzor won't be launched when the installer completes: add `/StartSyncTrayzor` to override this (which also caused SyncTrayzor to be launched minimized).
\ No newline at end of file
+If you pass the `/silent` command-line flag when SyncTrayzor won't be launched when the installer completes: add `/StartSyncTrayzor` to override this (which also causes SyncTrayzor to be launched minimized).
+
+There are various parameters inside the file `SyncTrayzor.exe.config` which can be customised by system administrators, including the default SyncTrayzor configuration (used to create the user's SyncTrayzor config file when SyncTrayzor is first launched).
+To override these, pass the flag `/SyncTrayzorExeConfig="Path\To\Customized\SyncTrayzor.exe.config"` to the installer -- the specified `SyncTrayzor.exe.config` will overwrite the default.
+
+Note that the contents / structure of `SyncTrayzor.exe.config` may change between releases.
+Using the wrong version may cause a crash, or incorrect behaviour.
\ No newline at end of file
diff --git a/installer/common.iss b/installer/common.iss
index bd10bde7..9236533c 100644
--- a/installer/common.iss
+++ b/installer/common.iss
@@ -188,6 +188,7 @@ var
   FindRec: TFindRec;
   FolderPath: String;
   FilePath: String;
+  ExeConfig: String;
 begin
   if CurStep = ssInstall then
   begin
@@ -220,6 +221,21 @@ begin
       end;
     end;
   end
+  else if CurStep = ssPostInstall then
+  begin
+    ExeConfig := ExpandConstant('{param:SyncTrayzorExeConfig}');
+    if ExeConfig <> '' then
+    begin
+      if FileExists(ExeConfig) then
+      begin
+        FileCopy(ExeConfig, ExpandConstant('{app}\SyncTrayzor.exe.config'), false);
+      end
+      else
+      begin
+        MsgBox('Could not find SyncTrayzorExeConfig file: ' + ExeConfig + '. Using default.', mbError, MB_OK);
+      end
+    end
+  end
 end;
 
 function PrepareToInstall(var NeedsRestart: Boolean): String;

From 1a5eb498d174ff3c4f13b4e9c6ef6c20035e0973 Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Sun, 3 Sep 2017 13:06:40 +0100
Subject: [PATCH 14/29] Document need for Blend SDK

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 0ccfa8be..5cad1564 100644
--- a/README.md
+++ b/README.md
@@ -203,6 +203,7 @@ Building from Source
 --------------------
 
 You'll need [Visual Studio 2017](https://www.visualstudio.com/en-us/downloads/download-visual-studio-vs.aspx).
+Make sure you install "Blend for Visual Studio SDK for .NET".
 Clone/download the repository, open `src\SyncTrayzor.sln`, and compile.
 You'll also need to [download syncthing.exe](https://github.com/syncthing/syncthing/releases) and place it in the `bin\x86\Debug`, `bin\x64\Debug`, `bin\x86\Release`, or `bin\x64\Release` folder as appropriate.
 

From 87140cc13d6646442192c782d5cf93e33e23cb99 Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Sun, 3 Sep 2017 13:08:57 +0100
Subject: [PATCH 15/29] Remove out-of-date doc

We no longer respect Syncthing's ignores in our filesystem watcher, as Syncthing
stopped providing them as regexes.

Fixes #401
---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 5cad1564..395c7368 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,6 @@ Features include:
     - Syncthing on its own has to poll your folders, in order to see if any files have changed.
     - SyncTrayzor will watch your folders for changes, and alert Syncthing the second anything changes.
     - This means you can increase the polling interval in Syncthing, avoiding the resource usage of high-frequency polling, but still have any changes propagated straight away.
-    - Folder watching respects the ignores configured in Syncthing.
  - Has a tool to help you resolve file conflicts
  - Can pause devices on metered networks, to stop Syncthing transferring data on e.g. a mobile connection or wifi hotspot.
  - Contains translations for many languages

From 88d46e83b8076cd5152c10811de14d5f1fb0d177 Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Sun, 3 Sep 2017 13:21:34 +0100
Subject: [PATCH 16/29] If new folders aren't watched, or don't have
 notifications, new ones shouldn't

Fixes #393
---
 src/SyncTrayzor/Services/ConfigurationApplicator.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/SyncTrayzor/Services/ConfigurationApplicator.cs b/src/SyncTrayzor/Services/ConfigurationApplicator.cs
index 227efcc9..41fb6a67 100644
--- a/src/SyncTrayzor/Services/ConfigurationApplicator.cs
+++ b/src/SyncTrayzor/Services/ConfigurationApplicator.cs
@@ -157,9 +157,13 @@ private void LoadFolders(Configuration configuration)
         {
             var folderIds = this.syncthingManager.Folders.FetchAll().Select(x => x.FolderId).ToList();
 
+            // If all folders are not watched, new folders are not watched too. Likewise notifications.
+            bool areAnyWatched = configuration.Folders.Any(x => x.IsWatched);
+            bool areAnyNotifications = configuration.Folders.Any(x => x.NotificationsEnabled);
+
             foreach (var newKey in folderIds.Except(configuration.Folders.Select(x => x.ID)))
             {
-                configuration.Folders.Add(new FolderConfiguration(newKey, true, true));
+                configuration.Folders.Add(new FolderConfiguration(newKey, areAnyWatched, areAnyNotifications));
             }
 
             configuration.Folders = configuration.Folders.Where(x => folderIds.Contains(x.ID)).ToList();

From 7cf806462e0bd7e49496e14041c37ecfa82b6f45 Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Mon, 7 Aug 2017 08:23:55 +0100
Subject: [PATCH 17/29] WIP

---
 installer/x64/installer-x64.iss | 382 +++++++++++++++++++++++++++++++-
 1 file changed, 381 insertions(+), 1 deletion(-)

diff --git a/installer/x64/installer-x64.iss b/installer/x64/installer-x64.iss
index e69bfa47..052a58b1 100644
--- a/installer/x64/installer-x64.iss
+++ b/installer/x64/installer-x64.iss
@@ -1,4 +1,384 @@
 #define Arch "x64"
 #define AppId "{c004dcef-b848-46a5-9c30-4dbf736396fa}"
 
-#include "../common.iss"
\ No newline at end of file
+// #include "../common.iss"
+
+#define AppExeName "SyncTrayzor.exe"
+#define AppRoot "..\.."
+#define AppSrc AppRoot + "\src\SyncTrayzor"
+#define AppBin AppRoot +"\bin\" + Arch + "\Release"
+#define AppExe AppBin + "\SyncTrayzor.exe"
+#define AppName GetStringFileInfo(AppExe, "ProductName")
+#define AppVersion GetFileVersion(AppExe)
+#define AppPublisher "SyncTrayzor"
+#define AppURL "https://github.com/canton7/SyncTrayzor"
+#define AppDataFolder "SyncTrayzor"
+#define RunRegKey "Software\Microsoft\Windows\CurrentVersion\Run"
+#define DotNetInstallerExe "dotNet451Setup.exe"
+#define DonateUrl = "https://synctrayzor.antonymale.co.uk/donate"
+
+[Setup]
+AppId={{#AppId}
+AppName={#AppName} ({#Arch})
+AppVersion={#AppVersion}
+VersionInfoVersion={#AppVersion}
+;AppVerName={#AppName} {#AppVersion}
+AppPublisher={#AppPublisher}
+AppPublisherURL={#AppURL}
+AppSupportURL={#AppURL}
+AppUpdatesURL={#AppURL}
+DefaultDirName={pf}\{#AppName}
+DefaultGroupName={#AppName}
+AllowNoIcons=yes
+LicenseFile={#AppRoot}\LICENSE.txt
+OutputDir="."
+OutputBaseFilename={#AppName}Setup-{#Arch}
+SetupIconFile={#AppSrc}\Icons\default.ico
+WizardSmallImageFile=..\icon.bmp
+;Compression=lzma2/max
+Compression=None
+SolidCompression=yes
+PrivilegesRequired=admin
+CloseApplications=yes
+RestartApplications=no
+; If we try and close CefSharp.BrowserSubprocess.exe we'll fail - it doesn't respond well
+; However if we close *just* SyncTrayzor, that will take care of shutting down CefSharp and syncthing
+CloseApplicationsFilter=SyncTrayzor.exe
+TouchDate=current
+#if "x64" == Arch
+ArchitecturesInstallIn64BitMode=x64
+ArchitecturesAllowed=x64
+#endif
+
+[Languages]
+Name: "english"; MessagesFile: "compiler:Default.isl"
+
+[CustomMessages]
+InstallingDotNetFramework=Installing .NET Framework. This might take a few minutes...
+DotNetFrameworkFailedToLaunch=Failed to launch .NET Framework Installer with error "%1". Please fix the error then run this installer again.
+DotNetFrameworkFailed1602=.NET Framework installation was cancelled. This installation can continue, but be aware that this application may not run unless the .NET Framework installation is completed successfully.
+DotNetFrameworkFailed1603=A fatal error occurred while installing the .NET Framework. Please fix the error, then run the installer again.
+DotNetFrameworkFailed5100=Your computer does not meet the requirements of the .NET Framework. Please consult the documentation.
+DotNetFrameworkFailedOther=The .NET Framework installer exited with an unexpected status code "%1". Please review any other messages shown by the installer to determine whether the installation completed successfully, and abort this installation and fix the problem if it did not.
+
+[Tasks]
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+
+[Dirs]
+Name: "{userappdata}\{#AppDataFolder}"
+
+[Files]
+; Near the beginning, as it's extracted first and this makes it cheaper
+Source: "..\{#DotNetInstallerExe}"; DestDir: {tmp}; Flags: dontcopy nocompression noencryption
+
+Source: "{#AppBin}\*"; DestDir: "{app}"; Excludes: "*.xml,*.vshost.*,*.config,*.log,FluentValidation.resources.dll,System.Windows.Interactivity.resources.dll,syncthing.exe,data,logs,ffmpegsumo.dll,d3dcompiler_43.dll,d3dcompiler_47.dll,libEGL.dll,libGLESv2.dll,pdf.dll"; Flags: ignoreversion recursesubdirs
+Source: "{#AppBin}\SyncTrayzor.exe.Installer.config"; DestDir: "{app}"; DestName: "SyncTrayzor.exe.config"; Flags: ignoreversion
+Source: "{#AppSrc}\Icons\default.ico"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#AppRoot}\*.md"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#AppRoot}\*.txt"; DestDir: "{app}"; Flags: ignoreversion
+Source: "*.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "syncthing.exe"; DestDir: "{app}"; DestName: "syncthing.exe"; Flags: ignoreversion
+
+[Icons]
+Name: "{group}\{#AppName}"; Filename: "{app}\{#AppExeName}"
+Name: "{group}\{cm:UninstallProgram,{#AppName}}"; Filename: "{uninstallexe}"
+Name: "{commondesktop}\{#AppName}"; Filename: "{app}\{#AppExeName}"; Tasks: desktopicon
+
+[Run]
+Filename: "{app}\{#AppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(AppName, '&', '&&')}}"; Flags: nowait postinstall; Parameters: {code:SyncTrayzorStartFlags}; Check: ShouldStartSyncTrayzor
+
+[Code]
+var
+  GlobalRestartRequired: boolean;
+  UninstallPollPage: TNewNotebookPage;
+  UninstallNextButton: TNewButton;
+
+function DotNetIsMissing(): Boolean;
+var 
+  Exists: Boolean;
+  Release: Cardinal;
+begin
+  Exists := RegQueryDWordValue(HKEY_LOCAL_MACHINE, 'SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full', 'Release', Release);
+  Result := not Exists or (Release < 378758);
+end;
+
+// Adapted from https://blogs.msdn.microsoft.com/davidrickard/2015/07/17/installing-net-framework-4-5-automatically-with-inno-setup/
+function InstallDotNet(): String;
+var
+  StatusText: string;
+  ResultCode: Integer;
+begin
+  StatusText := WizardForm.StatusLabel.Caption;
+  WizardForm.StatusLabel.Caption := CustomMessage('InstallingDotNetFramework');
+  WizardForm.ProgressGauge.Style := npbstMarquee;
+  try
+    ExtractTemporaryFile('{#DotNetInstallerExe}');
+    if not Exec(ExpandConstant('{tmp}\{#DotNetInstallerExe}'), '/passive /norestart /showrmui /showfinalerror', '', SW_SHOW, ewWaitUntilTerminated, ResultCode) then
+    begin
+      Result := FmtMessage(CustomMessage('DotNetFrameworkFailedToLaunch'), [SysErrorMessage(ResultCode)]);
+    end
+    else
+    begin
+      // See https://msdn.microsoft.com/en-us/library/ee942965(v=vs.110).aspx#return_codes
+      case resultCode of
+        0: begin
+          // Successful
+        end;
+        1602 : begin
+          MsgBox(CustomMessage('DotNetFrameworkFailed1602'), mbInformation, MB_OK);
+        end;
+        1603: begin
+          Result := CustomMessage('DotNetFrameworkFailed1603');
+        end;
+        1641: begin
+          GlobalRestartRequired := True;
+        end;
+        3010: begin
+          GlobalRestartRequired := True;
+        end;
+        5100: begin
+          Result := CustomMessage('DotNetFrameworkFailed5100');
+        end;
+        else begin
+          MsgBox(FmtMessage(CustomMessage('DotNetFrameworkFailedOther'), [IntToStr(ResultCode)]), mbError, MB_OK);
+        end;
+      end;
+    end;
+  finally
+    WizardForm.StatusLabel.Caption := StatusText;
+    WizardForm.ProgressGauge.Style := npbstNormal;
+  end;
+end;
+
+procedure BumpInstallCount;
+var
+  FileContents: AnsiString;
+  InstallCount: integer;
+begin
+  { Increment the install count in InstallCount.txt if it exists, or create it with the contents '1' if it doesn't }
+  if LoadStringFromFile(ExpandConstant('{app}\InstallCount.txt'), FileContents) then
+  begin
+    InstallCount := StrTointDef(Trim(string(FileContents)), 0) + 1;
+  end
+  else
+  begin
+    InstallCount := 1;
+  end;
+
+  SaveStringToFile(ExpandConstant('{app}\InstallCount.txt'), IntToStr(InstallCount), False);
+end;
+
+procedure URLLabelOnClick(Sender: TObject);
+var
+	ErrorCode: Integer;
+begin
+	ShellExec('open', '{#DonateUrl}', '', '', SW_SHOWNORMAL, ewNoWait, ErrorCode);
+end;
+
+procedure InitializeWizard;
+var
+  URLLabel: TNewStaticText;
+begin
+  URLLabel := TNewStaticText.Create(WizardForm);
+  URLLabel.Caption := 'Donate';
+  URLLabel.Cursor := crHand;
+  URLLabel.Parent := WizardForm;
+  URLLabel.Font.Style := URLLabel.Font.Style + [fsUnderline];
+	URLLabel.Font.Color := clBlue;
+	URLLabel.Top := WizardForm.ClientHeight - URLLabel.Height - 15;
+  URLLabel.Left := ScaleX(10)
+  URLLabel.OnClick := @URLLabelOnClick;
+end;
+
+procedure CurStepChanged(CurStep: TSetupStep);
+var
+  FindRec: TFindRec;
+  FolderPath: String;
+  FilePath: String;
+begin
+  if CurStep = ssInstall then
+  begin
+    BumpInstallCount();
+
+    { We might be being run from ProcessRunner.exe, *and* we might be trying to update it. Funsies. Let's rename it (which Windows lets us do) }
+    DeleteFile(ExpandConstant('{app}\ProcessRunner.exe.old'));
+    RenameFile(ExpandConstant('{app}\ProcessRunner.exe'), ExpandConstant('{app}\ProcessRunner.exe.old'));
+
+    Log(ExpandConstant('Looking for resource files in {app}\*'));
+    { Remove resource files. This means that out-of-date languages will be removed, which (as a last-ditch resore) will alert maintainers that something's wrong }
+    if FindFirst(ExpandConstant('{app}\*'), FindRec) then
+    begin
+      try
+        repeat
+          if (FindRec.Attributes and FILE_ATTRIBUTE_DIRECTORY <> 0) and (FindRec.Name <> '.') and (FindRec.Name <> '..') then
+          begin
+            FolderPath :=  ExpandConstant('{app}\') + FindRec.Name;
+            FilePath := FolderPath + '\SyncTrayzor.resources.dll';
+            if DeleteFile(FilePath) then
+            begin
+              Log('Deleted ' + FilePath);
+              if DelTree(FolderPath, True, False, False) then
+                Log('Deleted ' + FolderPath);
+            end;
+          end;
+        until not FindNext(FindRec);
+      finally
+        FindClose(FindRec);
+      end;
+    end;
+  end
+end;
+
+procedure CurPageChanged(CurPageID: Integer);
+begin
+
+end;
+
+function PrepareToInstall(var NeedsRestart: Boolean): String;
+begin
+  // 'NeedsRestart' only has an effect if we return a non-empty string, thus aborting the installation.
+  // If the installers indicate that they want a restart, this should be done at the end of installation.
+  // Therefore we set the global 'restartRequired' if a restart is needed, and return this from NeedRestart()
+
+  if DotNetIsMissing() then
+  begin
+    Result := InstallDotNet();
+  end;
+end;
+
+function NeedRestart(): Boolean;
+begin
+  Result := GlobalRestartRequired;
+end;
+
+function ShouldStartSyncTrayzor(): Boolean;
+var
+  flagPassed: Boolean;
+  i: Integer;
+begin
+  // Can't use {param}, as it doesn't match flags with no value
+  flagPassed := False;
+  for i := 0 to ParamCount do begin
+    if ParamStr(i) = '/StartSyncTrayzor' then begin
+      flagPassed := True;
+      break;
+    end;
+  end;
+  Result := (not WizardSilent()) or flagPassed;
+end;
+
+function SyncTrayzorStartFlags(param: String): String;
+begin
+   if WizardSilent() then begin
+      Result := '-minimized'
+   end else begin
+      Result := ''
+   end;
+end;
+
+// See https://stackoverflow.com/a/42550055/1086121
+
+procedure UpdateUninstallWizard;
+begin
+  if UninstallProgressForm.InnerNotebook.ActivePage = UninstallPollPage then
+  begin
+    UninstallProgressForm.PageNameLabel.Caption := 'First uninstall wizard page';
+    UninstallProgressForm.PageDescriptionLabel.Caption :=
+      'Lorem ipsum dolor sit amet, consectetur adipiscing elit.';
+  end;
+
+  UninstallNextButton.Caption := 'Uninstall';
+  // Make the "Uninstall" button break the ShowModal loop
+  UninstallNextButton.ModalResult := mrOK;
+end;
+
+procedure UninstallNextButtonClick(Sender: TObject);
+begin
+  if UninstallProgressForm.InnerNotebook.ActivePage = UninstallPollPage then
+  begin
+    UninstallNextButton.Visible := False;
+  end;
+end;  
+
+procedure InitializeUninstallProgressForm();
+var
+  PageText: TNewStaticText;
+  PageNameLabel: string;
+  PageDescriptionLabel: string;
+  TestCheckBox: TNewCheckBox;
+  CancelButtonEnabled: Boolean;
+  CancelButtonModalResult: Integer;
+begin
+  if not UninstallSilent then
+  begin
+    // Create the poll page and make it active
+    UninstallPollPage := TNewNotebookPage.Create(UninstallProgressForm);
+    UninstallPollPage.Notebook := UninstallProgressForm.InnerNotebook;
+    UninstallPollPage.Parent := UninstallProgressForm.InnerNotebook;
+    UninstallPollPage.Align := alClient;
+
+    PageText := TNewStaticText.Create(UninstallProgressForm);
+    PageText.Parent := UninstallPollPage;
+    PageText.Top := UninstallProgressForm.StatusLabel.Top;
+    PageText.Left := UninstallProgressForm.StatusLabel.Left;
+    PageText.Width := UninstallProgressForm.StatusLabel.Width;
+    PageText.Height := UninstallProgressForm.StatusLabel.Height;
+    PageText.AutoSize := False;
+    PageText.ShowAccelChar := False;
+    PageText.Caption := 'Press Uninstall to proceeed with uninstallation.';
+
+    TestCheckBox := TNewCheckBox.Create(UninstallProgressForm);
+    TestCheckBox.Parent := UninstallPollPage;
+    TestCheckBox.Top = PageText.Top + PageText.Height + 10;
+    TestCheckBox.Left = PageText.Left;
+    TestCheckBox.Caption := 'Test Fooooo';
+
+    UninstallProgressForm.InnerNotebook.ActivePage := UninstallPollPage;
+
+    PageNameLabel := UninstallProgressForm.PageNameLabel.Caption;
+    PageDescriptionLabel := UninstallProgressForm.PageDescriptionLabel.Caption;
+
+    UninstallNextButton := TNewButton.Create(UninstallProgressForm);
+    UninstallNextButton.Parent := UninstallProgressForm;
+    UninstallNextButton.Left :=
+      UninstallProgressForm.CancelButton.Left - UninstallProgressForm.CancelButton.Width -
+      ScaleX(10);
+    UninstallNextButton.Top := UninstallProgressForm.CancelButton.Top;
+    UninstallNextButton.Width := UninstallProgressForm.CancelButton.Width;
+    UninstallNextButton.Height := UninstallProgressForm.CancelButton.Height;
+    UninstallNextButton.OnClick := @UninstallNextButtonClick;
+
+    UninstallProgressForm.CancelButton.TabOrder := UninstallNextButton.TabOrder + 1;
+
+    // Run our wizard pages
+    UpdateUninstallWizard;
+    CancelButtonEnabled := UninstallProgressForm.CancelButton.Enabled
+    UninstallProgressForm.CancelButton.Enabled := True;
+    CancelButtonModalResult := UninstallProgressForm.CancelButton.ModalResult;
+    UninstallProgressForm.CancelButton.ModalResult := mrCancel;
+
+    if UninstallProgressForm.ShowModal = mrCancel then Abort;
+
+    // Restore the standard page payout
+    UninstallProgressForm.CancelButton.Enabled := CancelButtonEnabled;
+    UninstallProgressForm.CancelButton.ModalResult := CancelButtonModalResult;
+
+    UninstallProgressForm.PageNameLabel.Caption := PageNameLabel;
+    UninstallProgressForm.PageDescriptionLabel.Caption := PageDescriptionLabel;
+
+    UninstallProgressForm.InnerNotebook.ActivePage := UninstallProgressForm.InstallingPage;
+  end;
+end;
+
+function InitializeUninstall(): Boolean;
+begin
+  //UninstallPollPage := CreateInputOptionPage(
+
+  Result := true;
+end;
+
+[UninstallDelete]
+Type: files; Name: "{app}\ProcessRunner.exe.old"
+Type: files; Name: "{app}\InstallCount.txt"
+Type: filesandordirs; Name: "{userappdata}\{#AppDataFolder}"
+Type: filesandordirs; Name: "{localappdata}\{#AppDataFolder}"
\ No newline at end of file

From ffef78a98b0660583fc1cb1a73f436726c1aec2b Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Mon, 7 Aug 2017 13:24:43 +0100
Subject: [PATCH 18/29] WIP

---
 installer/x64/installer-x64.iss | 65 +++++++++++++++++++--------------
 1 file changed, 38 insertions(+), 27 deletions(-)

diff --git a/installer/x64/installer-x64.iss b/installer/x64/installer-x64.iss
index 052a58b1..02fc22fa 100644
--- a/installer/x64/installer-x64.iss
+++ b/installer/x64/installer-x64.iss
@@ -292,22 +292,17 @@ begin
   UninstallNextButton.ModalResult := mrOK;
 end;
 
-procedure UninstallNextButtonClick(Sender: TObject);
-begin
-  if UninstallProgressForm.InnerNotebook.ActivePage = UninstallPollPage then
-  begin
-    UninstallNextButton.Visible := False;
-  end;
-end;  
-
 procedure InitializeUninstallProgressForm();
 var
   PageText: TNewStaticText;
   PageNameLabel: string;
   PageDescriptionLabel: string;
-  TestCheckBox: TNewCheckBox;
   CancelButtonEnabled: Boolean;
-  CancelButtonModalResult: Integer;
+  CancelButtonModalResult: Integer;
+  //CouldntMakeItWorkOption: TNewCheckBox;
+  //DidntDoWhatIWantedOption: TNewCheckBox;
+  Checklist: TNewCheckListBox;
+  CommentsBox: TNewMemo;
 begin
   if not UninstallSilent then
   begin
@@ -326,12 +321,38 @@ begin
     PageText.AutoSize := False;
     PageText.ShowAccelChar := False;
     PageText.Caption := 'Press Uninstall to proceeed with uninstallation.';
-
-    TestCheckBox := TNewCheckBox.Create(UninstallProgressForm);
-    TestCheckBox.Parent := UninstallPollPage;
-    TestCheckBox.Top = PageText.Top + PageText.Height + 10;
-    TestCheckBox.Left = PageText.Left;
-    TestCheckBox.Caption := 'Test Fooooo';
+
+    // https://stackoverflow.com/a/44254371/1086121
+
+    {
+    CouldntMakeItWorkOption := TNewCheckBox.Create(UninstallProgressForm);
+    CouldntMakeItWorkOption.Parent := UninstallPollPage;
+    CouldntMakeItWorkOption.Top := PageText.Top + PageText.Height + ScaleX(10);
+    CouldntMakeItWorkOption.Left := PageText.Left;
+    CouldntMakeItWorkOption.Caption := 'I couldn''t get Syncthing to work';
+
+    DidntDoWhatIWantedOption := TNewCheckBox.Create(UninstallProgressForm);
+    DidntDoWhatIWantedOption.Parent := UninstallPollPage;
+    DidntDoWhatIWantedOption.Top := CouldntMakeItWorkOption.Top + CouldntMakeItWorkOption.Height + ScaleX(10);
+    DidntDoWhatIWantedOption.Left := PageText.Left;
+    DidntDoWhatIWantedOption.Caption := 'Syncthing doesn''t do what I wanted';
+    }
+
+    Checklist := TNewCheckListBox.Create(UninstallProgressForm);
+    Checklist.Parent := UninstallPollPage;
+    Checklist.SetBounds(PageText.Left, PageText.Top + PageText.Height + ScaleY(10), PageText.Width, ScaleY(50));
+    Checklist.BorderStyle := bsNone;
+    Checklist.Color := clBtnFace;
+    Checklist.WantTabs := True;
+    Checklist.MinItemHeight := ScaleY(20);
+
+    Checklist.AddCheckBox('Test Caption', '', 0, False, True, False, False, nil);
+    Checklist.AddCheckBox('Another Test Caption', '', 0, False, True, False, False, nil);
+
+    CommentsBox := TNewMemo.Create(UninstallProgressForm);
+    CommentsBox.Parent := UninstallPollPage;
+    CommentsBox.SetBounds(PageText.Left, Checklist.Top + Checklist.Height + ScaleY(10), PageText.Width, ScaleY(50));
+    CommentsBox.ScrollBars := ssVertical;
 
     UninstallProgressForm.InnerNotebook.ActivePage := UninstallPollPage;
 
@@ -340,13 +361,10 @@ begin
 
     UninstallNextButton := TNewButton.Create(UninstallProgressForm);
     UninstallNextButton.Parent := UninstallProgressForm;
-    UninstallNextButton.Left :=
-      UninstallProgressForm.CancelButton.Left - UninstallProgressForm.CancelButton.Width -
-      ScaleX(10);
+    UninstallNextButton.Left := UninstallProgressForm.CancelButton.Left - UninstallProgressForm.CancelButton.Width - ScaleX(10);
     UninstallNextButton.Top := UninstallProgressForm.CancelButton.Top;
     UninstallNextButton.Width := UninstallProgressForm.CancelButton.Width;
     UninstallNextButton.Height := UninstallProgressForm.CancelButton.Height;
-    UninstallNextButton.OnClick := @UninstallNextButtonClick;
 
     UninstallProgressForm.CancelButton.TabOrder := UninstallNextButton.TabOrder + 1;
 
@@ -370,13 +388,6 @@ begin
   end;
 end;
 
-function InitializeUninstall(): Boolean;
-begin
-  //UninstallPollPage := CreateInputOptionPage(
-
-  Result := true;
-end;
-
 [UninstallDelete]
 Type: files; Name: "{app}\ProcessRunner.exe.old"
 Type: files; Name: "{app}\InstallCount.txt"

From 1122a104517e4df48ab0296e097b213888e1468f Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Sun, 3 Sep 2017 20:58:49 +0100
Subject: [PATCH 19/29] That's the form complete?

---
 installer/x64/installer-x64.iss | 57 +++++++++++++++------------------
 1 file changed, 25 insertions(+), 32 deletions(-)

diff --git a/installer/x64/installer-x64.iss b/installer/x64/installer-x64.iss
index 02fc22fa..0215126a 100644
--- a/installer/x64/installer-x64.iss
+++ b/installer/x64/installer-x64.iss
@@ -282,9 +282,8 @@ procedure UpdateUninstallWizard;
 begin
   if UninstallProgressForm.InnerNotebook.ActivePage = UninstallPollPage then
   begin
-    UninstallProgressForm.PageNameLabel.Caption := 'First uninstall wizard page';
-    UninstallProgressForm.PageDescriptionLabel.Caption :=
-      'Lorem ipsum dolor sit amet, consectetur adipiscing elit.';
+    UninstallProgressForm.PageNameLabel.Caption := 'Please Tell Us Why You''re Leaving';
+    UninstallProgressForm.PageDescriptionLabel.Caption := '';
   end;
 
   UninstallNextButton.Caption := 'Uninstall';
@@ -299,9 +298,8 @@ var
   PageDescriptionLabel: string;
   CancelButtonEnabled: Boolean;
   CancelButtonModalResult: Integer;
-  //CouldntMakeItWorkOption: TNewCheckBox;
-  //DidntDoWhatIWantedOption: TNewCheckBox;
   Checklist: TNewCheckListBox;
+  CommentsText: TNewStaticText;
   CommentsBox: TNewMemo;
 begin
   if not UninstallSilent then
@@ -313,45 +311,40 @@ begin
     UninstallPollPage.Align := alClient;
 
     PageText := TNewStaticText.Create(UninstallProgressForm);
-    PageText.Parent := UninstallPollPage;
-    PageText.Top := UninstallProgressForm.StatusLabel.Top;
-    PageText.Left := UninstallProgressForm.StatusLabel.Left;
-    PageText.Width := UninstallProgressForm.StatusLabel.Width;
-    PageText.Height := UninstallProgressForm.StatusLabel.Height;
-    PageText.AutoSize := False;
+    PageText.Parent := UninstallPollPage;
+    PageText.AutoSize := True;
+    PageText.WordWrap := True;
+    PageText.SetBounds(UninstallProgressForm.StatusLabel.Left, UninstallProgressForm.StatusLabel.Top, UninstallProgressForm.StatusLabel.Width, UninstallProgressForm.StatusLabel.Height);
     PageText.ShowAccelChar := False;
-    PageText.Caption := 'Press Uninstall to proceeed with uninstallation.';
-
-    // https://stackoverflow.com/a/44254371/1086121
-
-    {
-    CouldntMakeItWorkOption := TNewCheckBox.Create(UninstallProgressForm);
-    CouldntMakeItWorkOption.Parent := UninstallPollPage;
-    CouldntMakeItWorkOption.Top := PageText.Top + PageText.Height + ScaleX(10);
-    CouldntMakeItWorkOption.Left := PageText.Left;
-    CouldntMakeItWorkOption.Caption := 'I couldn''t get Syncthing to work';
-
-    DidntDoWhatIWantedOption := TNewCheckBox.Create(UninstallProgressForm);
-    DidntDoWhatIWantedOption.Parent := UninstallPollPage;
-    DidntDoWhatIWantedOption.Top := CouldntMakeItWorkOption.Top + CouldntMakeItWorkOption.Height + ScaleX(10);
-    DidntDoWhatIWantedOption.Left := PageText.Left;
-    DidntDoWhatIWantedOption.Caption := 'Syncthing doesn''t do what I wanted';
-    }
+    PageText.Caption := 'Please tell us why you don''t like Syncthing / SyncTrayzor so we can improve things.' + #13#10 +
+    'No personal data will be sent. You can skip this step if you want.';
 
     Checklist := TNewCheckListBox.Create(UninstallProgressForm);
     Checklist.Parent := UninstallPollPage;
-    Checklist.SetBounds(PageText.Left, PageText.Top + PageText.Height + ScaleY(10), PageText.Width, ScaleY(50));
+    Checklist.SetBounds(PageText.Left, PageText.Top + PageText.Height + ScaleY(10), PageText.Width, ScaleY(20) * 5);
     Checklist.BorderStyle := bsNone;
     Checklist.Color := clBtnFace;
     Checklist.WantTabs := True;
     Checklist.MinItemHeight := ScaleY(20);
 
-    Checklist.AddCheckBox('Test Caption', '', 0, False, True, False, False, nil);
-    Checklist.AddCheckBox('Another Test Caption', '', 0, False, True, False, False, nil);
+    Checklist.AddCheckBox('I couldn''t get Syncthing to work', '', 0, False, True, False, False, nil);
+    Checklist.AddCheckBox('Syncthing doesn''t do what I need', '', 0, False, True, False, False, nil);
+    Checklist.AddCheckBox('I prefer Resilio Sync', '', 0, False, True, False, False, nil);
+    Checklist.AddCheckBox('I don''t like SyncTrayzor - going to use another wrapper', '', 0, False, True, False, False, nil);
+    Checklist.AddCheckBox('Other (please expand below)', '', 0, False, True, False, False, nil);
+
+    CommentsText := TNewStaticText.Create(UninstallProgressForm);
+    CommentsText.Parent := UninstallPollPage;
+    CommentsText.AutoSize := True;
+    CommentsText.WordWrap := True;
+    CommentsText.SetBounds(PageText.Left, Checklist.Top + Checklist.Height + ScaleY(10), PageText.Width, ScaleY(15));
+    CommentsText.AutoSize := False;
+    CommentsText.ShowAccelChar := False;
+    CommentsText.Caption := 'Anything else?';
 
     CommentsBox := TNewMemo.Create(UninstallProgressForm);
     CommentsBox.Parent := UninstallPollPage;
-    CommentsBox.SetBounds(PageText.Left, Checklist.Top + Checklist.Height + ScaleY(10), PageText.Width, ScaleY(50));
+    CommentsBox.SetBounds(PageText.Left, CommentsText.Top + CommentsText.Height + ScaleY(5), PageText.Width, ScaleY(60));
     CommentsBox.ScrollBars := ssVertical;
 
     UninstallProgressForm.InnerNotebook.ActivePage := UninstallPollPage;

From c04d00dad1f9508ff0d917a98f15d2a239d3c210 Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Sun, 3 Sep 2017 21:30:00 +0100
Subject: [PATCH 20/29] Get it posting

---
 installer/x64/installer-x64.iss | 62 +++++++++++++++++++++++++++++++--
 1 file changed, 59 insertions(+), 3 deletions(-)

diff --git a/installer/x64/installer-x64.iss b/installer/x64/installer-x64.iss
index 0215126a..6e188155 100644
--- a/installer/x64/installer-x64.iss
+++ b/installer/x64/installer-x64.iss
@@ -15,7 +15,8 @@
 #define AppDataFolder "SyncTrayzor"
 #define RunRegKey "Software\Microsoft\Windows\CurrentVersion\Run"
 #define DotNetInstallerExe "dotNet451Setup.exe"
-#define DonateUrl = "https://synctrayzor.antonymale.co.uk/donate"
+#define DonateUrl "https://synctrayzor.antonymale.co.uk/donate"
+#define SurveyUrl "https://requestb.in/yueovtyu"
 
 [Setup]
 AppId={{#AppId}
@@ -289,6 +290,47 @@ begin
   UninstallNextButton.Caption := 'Uninstall';
   // Make the "Uninstall" button break the ShowModal loop
   UninstallNextButton.ModalResult := mrOK;
+end;
+
+function SerializeBool(value: Boolean): String;
+begin
+  if value then
+  begin
+    Result := 'true';
+  end
+  else
+  begin
+    Result := 'false';
+  end
+end;
+
+function EscapeJsonString(value: String): String;
+var
+  c: Char;
+  i: Integer;
+begin
+  // http://www.jrsoftware.org/ishelp/index.php?topic=isxfunc_charlength
+  i := 1;
+  while i <= Length(value) do
+  begin
+    c := value[i];
+    if c = #10 then begin
+      Result := Result + '\n';
+    end else if c = #13 then begin
+      Result := Result + '\r';
+    end else if c = #9 then begin
+      Result := Result + '\t';
+    end else if Ord(c) < 32 then begin
+      Result := Result + Format('\x%.4x', [Ord(c)]);
+    end else if c = '"' then begin
+      Result := Result + '\"';
+    end else if c = '\' then begin
+      Result := Result + '\\'
+    end else begin
+      Result := Result + c;
+    end;
+    i := i + CharLength(value, i);
+  end;
 end;
 
 procedure InitializeUninstallProgressForm();
@@ -300,7 +342,8 @@ var
   CancelButtonModalResult: Integer;
   Checklist: TNewCheckListBox;
   CommentsText: TNewStaticText;
-  CommentsBox: TNewMemo;
+  CommentsBox: TNewMemo;
+  WinHttpReq: Variant;
 begin
   if not UninstallSilent then
   begin
@@ -368,7 +411,20 @@ begin
     CancelButtonModalResult := UninstallProgressForm.CancelButton.ModalResult;
     UninstallProgressForm.CancelButton.ModalResult := mrCancel;
 
-    if UninstallProgressForm.ShowModal = mrCancel then Abort;
+    if UninstallProgressForm.ShowModal = mrCancel then Abort;
+
+    WinHttpReq := CreateOleObject('WinHttp.WinHttpRequest.5.1');
+    WinHttpReq.Open('POST', '{#SurveyUrl}', false);
+    WinHttpReq.Send('{' +
+      ' "wontWork": '+ SerializeBool(Checklist.Checked[0]) + 
+      ', "notWhatINeed": '+ SerializeBool(Checklist.Checked[1]) +
+      ', "preferResilio": '+ SerializeBool(Checklist.Checked[2]) +
+      ', "dontLikeSyncTrayzor": '+ SerializeBool(Checklist.Checked[3]) +
+      ', "other": '+ SerializeBool(Checklist.Checked[4]) +
+      ', "comments": "' + EscapeJsonString(CommentsBox.Text) + '"' +
+      ' }');
+
+    Abort;
 
     // Restore the standard page payout
     UninstallProgressForm.CancelButton.Enabled := CancelButtonEnabled;

From df3d4a8c8f28ba72c2d7d3e9e54610b3d4d91403 Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Sun, 3 Sep 2017 22:12:37 +0100
Subject: [PATCH 21/29] Create server endpoint

---
 installer/x64/installer-x64.iss | 16 ++++++-----
 server/survey.php               | 51 +++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 7 deletions(-)
 create mode 100644 server/survey.php

diff --git a/installer/x64/installer-x64.iss b/installer/x64/installer-x64.iss
index 6e188155..c4d2b0f8 100644
--- a/installer/x64/installer-x64.iss
+++ b/installer/x64/installer-x64.iss
@@ -16,7 +16,7 @@
 #define RunRegKey "Software\Microsoft\Windows\CurrentVersion\Run"
 #define DotNetInstallerExe "dotNet451Setup.exe"
 #define DonateUrl "https://synctrayzor.antonymale.co.uk/donate"
-#define SurveyUrl "https://requestb.in/yueovtyu"
+#define SurveyUrl "http://localhost:8080/survey.php"
 
 [Setup]
 AppId={{#AppId}
@@ -416,12 +416,14 @@ begin
     WinHttpReq := CreateOleObject('WinHttp.WinHttpRequest.5.1');
     WinHttpReq.Open('POST', '{#SurveyUrl}', false);
     WinHttpReq.Send('{' +
-      ' "wontWork": '+ SerializeBool(Checklist.Checked[0]) + 
-      ', "notWhatINeed": '+ SerializeBool(Checklist.Checked[1]) +
-      ', "preferResilio": '+ SerializeBool(Checklist.Checked[2]) +
-      ', "dontLikeSyncTrayzor": '+ SerializeBool(Checklist.Checked[3]) +
-      ', "other": '+ SerializeBool(Checklist.Checked[4]) +
-      ', "comments": "' + EscapeJsonString(CommentsBox.Text) + '"' +
+      ' "version": "{#AppVersion}", "comment": "' + EscapeJsonString(CommentsBox.Text) + '"' +
+      ', "checklist": {' +
+        ' "wontWork": '+ SerializeBool(Checklist.Checked[0]) + 
+        ', "notWhatINeed": '+ SerializeBool(Checklist.Checked[1]) +
+        ', "preferResilio": '+ SerializeBool(Checklist.Checked[2]) +
+        ', "dontLikeSyncTrayzor": '+ SerializeBool(Checklist.Checked[3]) +
+        ', "other": '+ SerializeBool(Checklist.Checked[4]) +
+      ' }' +
       ' }');
 
     Abort;
diff --git a/server/survey.php b/server/survey.php
new file mode 100644
index 00000000..4c632ab3
--- /dev/null
+++ b/server/survey.php
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * Survey endpoint for SyncTrayzor
+ */
+
+define('DATABASE', 'survey.sqlite');
+
+try 
+{
+	$exists = file_exists(DATABASE);
+
+	$db = new PDO('sqlite:'.DATABASE);
+	$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+	$db->exec('PRAGMA foreign_keys = ON;');
+
+	if (!$exists)
+	{
+		$db->exec("CREATE TABLE IF NOT EXISTS responses (
+			id INTEGER PRIMARY KEY,
+			version TEXT,
+			ip TEXT,
+			comment TEXT
+		);");
+		$db->exec("CREATE TABLE IF NOT EXISTS checklist (
+			id INTEGER PRIMARY KEY,
+			response_id INTEGER REFERENCES responses(id),
+			key TEXT
+		);");
+	}
+
+	$data = json_decode(file_get_contents('php://input'), true);
+	$stmt = $db->prepare("INSERT INTO responses(ip, version, comment) VALUES (:ip, :version, :comment);");
+	$stmt->execute(array('ip' => $_SERVER['REMOTE_ADDR'], 'version' => $data['version'], 'comment' => $data['comment']));
+	$responseId = $db->lastInsertId();
+
+	$stmt = $db->prepare("INSERT INTO CHECKLIST (response_id, key) VALUES (:response_id, :key);");
+
+	foreach ($data['checklist'] as $key => $value)
+	{
+		if ($value)
+		{
+			$stmt->execute(array('response_id' => $responseId, 'key' => $key));
+		}
+	}
+}
+catch (Exception $e)
+{
+	$loggable_error = $e->getMessage() . "\n" . $e->getTraceAsString();
+	file_put_contents("survey_errors.txt", $loggable_error, FILE_APPEND);
+}
\ No newline at end of file

From 6c838d5babe57a8e94e0436c479671acc2ed2143 Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Sun, 3 Sep 2017 22:14:08 +0100
Subject: [PATCH 22/29] Recombine installer files

---
 installer/common.iss            | 170 +++++++++++-
 installer/x64/installer-x64.iss | 444 +-------------------------------
 2 files changed, 170 insertions(+), 444 deletions(-)

diff --git a/installer/common.iss b/installer/common.iss
index 9236533c..2453c607 100644
--- a/installer/common.iss
+++ b/installer/common.iss
@@ -10,7 +10,8 @@
 #define AppDataFolder "SyncTrayzor"
 #define RunRegKey "Software\Microsoft\Windows\CurrentVersion\Run"
 #define DotNetInstallerExe "dotNet451Setup.exe"
-#define DonateUrl = "https://synctrayzor.antonymale.co.uk/donate"
+#define DonateUrl "https://synctrayzor.antonymale.co.uk/donate"
+#define SurveyUrl "https://synctrayzor.antonymale.co.uk/survey.php"
 
 [Setup]
 AppId={{#AppId}
@@ -85,6 +86,8 @@ Filename: "{app}\{#AppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(
 [Code]
 var
   GlobalRestartRequired: boolean;
+  UninstallPollPage: TNewNotebookPage;
+  UninstallNextButton: TNewButton;
 
 function DotNetIsMissing(): Boolean;
 var 
@@ -238,6 +241,11 @@ begin
   end
 end;
 
+procedure CurPageChanged(CurPageID: Integer);
+begin
+
+end;
+
 function PrepareToInstall(var NeedsRestart: Boolean): String;
 begin
   // 'NeedsRestart' only has an effect if we return a non-empty string, thus aborting the installation.
@@ -280,6 +288,166 @@ begin
    end;
 end;
 
+// See https://stackoverflow.com/a/42550055/1086121
+
+procedure UpdateUninstallWizard;
+begin
+  if UninstallProgressForm.InnerNotebook.ActivePage = UninstallPollPage then
+  begin
+    UninstallProgressForm.PageNameLabel.Caption := 'Please Tell Us Why You''re Leaving';
+    UninstallProgressForm.PageDescriptionLabel.Caption := '';
+  end;
+
+  UninstallNextButton.Caption := 'Uninstall';
+  // Make the "Uninstall" button break the ShowModal loop
+  UninstallNextButton.ModalResult := mrOK;
+end;
+
+function SerializeBool(value: Boolean): String;
+begin
+  if value then
+  begin
+    Result := 'true';
+  end
+  else
+  begin
+    Result := 'false';
+  end
+end;
+
+function EscapeJsonString(value: String): String;
+var
+  c: Char;
+  i: Integer;
+begin
+  // http://www.jrsoftware.org/ishelp/index.php?topic=isxfunc_charlength
+  i := 1;
+  while i <= Length(value) do
+  begin
+    c := value[i];
+    if c = #10 then begin
+      Result := Result + '\n';
+    end else if c = #13 then begin
+      Result := Result + '\r';
+    end else if c = #9 then begin
+      Result := Result + '\t';
+    end else if Ord(c) < 32 then begin
+      Result := Result + Format('\x%.4x', [Ord(c)]);
+    end else if c = '"' then begin
+      Result := Result + '\"';
+    end else if c = '\' then begin
+      Result := Result + '\\'
+    end else begin
+      Result := Result + c;
+    end;
+    i := i + CharLength(value, i);
+  end;
+end;
+
+procedure InitializeUninstallProgressForm();
+var
+  PageText: TNewStaticText;
+  PageNameLabel: string;
+  PageDescriptionLabel: string;
+  CancelButtonEnabled: Boolean;
+  CancelButtonModalResult: Integer;
+  Checklist: TNewCheckListBox;
+  CommentsText: TNewStaticText;
+  CommentsBox: TNewMemo;
+  WinHttpReq: Variant;
+begin
+  if not UninstallSilent then
+  begin
+    // Create the poll page and make it active
+    UninstallPollPage := TNewNotebookPage.Create(UninstallProgressForm);
+    UninstallPollPage.Notebook := UninstallProgressForm.InnerNotebook;
+    UninstallPollPage.Parent := UninstallProgressForm.InnerNotebook;
+    UninstallPollPage.Align := alClient;
+
+    PageText := TNewStaticText.Create(UninstallProgressForm);
+    PageText.Parent := UninstallPollPage;
+    PageText.AutoSize := True;
+    PageText.WordWrap := True;
+    PageText.SetBounds(UninstallProgressForm.StatusLabel.Left, UninstallProgressForm.StatusLabel.Top, UninstallProgressForm.StatusLabel.Width, UninstallProgressForm.StatusLabel.Height);
+    PageText.ShowAccelChar := False;
+    PageText.Caption := 'Please tell us why you don''t like Syncthing / SyncTrayzor so we can improve things.' + #13#10 +
+    'No personal data will be sent. You can skip this step if you want.';
+
+    Checklist := TNewCheckListBox.Create(UninstallProgressForm);
+    Checklist.Parent := UninstallPollPage;
+    Checklist.SetBounds(PageText.Left, PageText.Top + PageText.Height + ScaleY(10), PageText.Width, ScaleY(20) * 5);
+    Checklist.BorderStyle := bsNone;
+    Checklist.Color := clBtnFace;
+    Checklist.WantTabs := True;
+    Checklist.MinItemHeight := ScaleY(20);
+
+    Checklist.AddCheckBox('I couldn''t get Syncthing to work', '', 0, False, True, False, False, nil);
+    Checklist.AddCheckBox('Syncthing doesn''t do what I need', '', 0, False, True, False, False, nil);
+    Checklist.AddCheckBox('I prefer Resilio Sync', '', 0, False, True, False, False, nil);
+    Checklist.AddCheckBox('I don''t like SyncTrayzor - going to use another wrapper', '', 0, False, True, False, False, nil);
+    Checklist.AddCheckBox('Other (please expand below)', '', 0, False, True, False, False, nil);
+
+    CommentsText := TNewStaticText.Create(UninstallProgressForm);
+    CommentsText.Parent := UninstallPollPage;
+    CommentsText.AutoSize := True;
+    CommentsText.WordWrap := True;
+    CommentsText.SetBounds(PageText.Left, Checklist.Top + Checklist.Height + ScaleY(10), PageText.Width, ScaleY(15));
+    CommentsText.AutoSize := False;
+    CommentsText.ShowAccelChar := False;
+    CommentsText.Caption := 'Anything else?';
+
+    CommentsBox := TNewMemo.Create(UninstallProgressForm);
+    CommentsBox.Parent := UninstallPollPage;
+    CommentsBox.SetBounds(PageText.Left, CommentsText.Top + CommentsText.Height + ScaleY(5), PageText.Width, ScaleY(60));
+    CommentsBox.ScrollBars := ssVertical;
+
+    UninstallProgressForm.InnerNotebook.ActivePage := UninstallPollPage;
+
+    PageNameLabel := UninstallProgressForm.PageNameLabel.Caption;
+    PageDescriptionLabel := UninstallProgressForm.PageDescriptionLabel.Caption;
+
+    UninstallNextButton := TNewButton.Create(UninstallProgressForm);
+    UninstallNextButton.Parent := UninstallProgressForm;
+    UninstallNextButton.Left := UninstallProgressForm.CancelButton.Left - UninstallProgressForm.CancelButton.Width - ScaleX(10);
+    UninstallNextButton.Top := UninstallProgressForm.CancelButton.Top;
+    UninstallNextButton.Width := UninstallProgressForm.CancelButton.Width;
+    UninstallNextButton.Height := UninstallProgressForm.CancelButton.Height;
+
+    UninstallProgressForm.CancelButton.TabOrder := UninstallNextButton.TabOrder + 1;
+
+    // Run our wizard pages
+    UpdateUninstallWizard;
+    CancelButtonEnabled := UninstallProgressForm.CancelButton.Enabled
+    UninstallProgressForm.CancelButton.Enabled := True;
+    CancelButtonModalResult := UninstallProgressForm.CancelButton.ModalResult;
+    UninstallProgressForm.CancelButton.ModalResult := mrCancel;
+
+    if UninstallProgressForm.ShowModal = mrCancel then Abort;
+
+    WinHttpReq := CreateOleObject('WinHttp.WinHttpRequest.5.1');
+    WinHttpReq.Open('POST', '{#SurveyUrl}', false);
+    WinHttpReq.Send('{' +
+      ' "version": "{#AppVersion}", "comment": "' + EscapeJsonString(CommentsBox.Text) + '"' +
+      ', "checklist": {' +
+        ' "wontWork": '+ SerializeBool(Checklist.Checked[0]) + 
+        ', "notWhatINeed": '+ SerializeBool(Checklist.Checked[1]) +
+        ', "preferResilio": '+ SerializeBool(Checklist.Checked[2]) +
+        ', "dontLikeSyncTrayzor": '+ SerializeBool(Checklist.Checked[3]) +
+        ', "other": '+ SerializeBool(Checklist.Checked[4]) +
+      ' }' +
+      ' }');
+
+    // Restore the standard page payout
+    UninstallProgressForm.CancelButton.Enabled := CancelButtonEnabled;
+    UninstallProgressForm.CancelButton.ModalResult := CancelButtonModalResult;
+
+    UninstallProgressForm.PageNameLabel.Caption := PageNameLabel;
+    UninstallProgressForm.PageDescriptionLabel.Caption := PageDescriptionLabel;
+
+    UninstallProgressForm.InnerNotebook.ActivePage := UninstallProgressForm.InstallingPage;
+  end;
+end;
+
 [UninstallDelete]
 Type: files; Name: "{app}\ProcessRunner.exe.old"
 Type: files; Name: "{app}\InstallCount.txt"
diff --git a/installer/x64/installer-x64.iss b/installer/x64/installer-x64.iss
index c4d2b0f8..e69bfa47 100644
--- a/installer/x64/installer-x64.iss
+++ b/installer/x64/installer-x64.iss
@@ -1,446 +1,4 @@
 #define Arch "x64"
 #define AppId "{c004dcef-b848-46a5-9c30-4dbf736396fa}"
 
-// #include "../common.iss"
-
-#define AppExeName "SyncTrayzor.exe"
-#define AppRoot "..\.."
-#define AppSrc AppRoot + "\src\SyncTrayzor"
-#define AppBin AppRoot +"\bin\" + Arch + "\Release"
-#define AppExe AppBin + "\SyncTrayzor.exe"
-#define AppName GetStringFileInfo(AppExe, "ProductName")
-#define AppVersion GetFileVersion(AppExe)
-#define AppPublisher "SyncTrayzor"
-#define AppURL "https://github.com/canton7/SyncTrayzor"
-#define AppDataFolder "SyncTrayzor"
-#define RunRegKey "Software\Microsoft\Windows\CurrentVersion\Run"
-#define DotNetInstallerExe "dotNet451Setup.exe"
-#define DonateUrl "https://synctrayzor.antonymale.co.uk/donate"
-#define SurveyUrl "http://localhost:8080/survey.php"
-
-[Setup]
-AppId={{#AppId}
-AppName={#AppName} ({#Arch})
-AppVersion={#AppVersion}
-VersionInfoVersion={#AppVersion}
-;AppVerName={#AppName} {#AppVersion}
-AppPublisher={#AppPublisher}
-AppPublisherURL={#AppURL}
-AppSupportURL={#AppURL}
-AppUpdatesURL={#AppURL}
-DefaultDirName={pf}\{#AppName}
-DefaultGroupName={#AppName}
-AllowNoIcons=yes
-LicenseFile={#AppRoot}\LICENSE.txt
-OutputDir="."
-OutputBaseFilename={#AppName}Setup-{#Arch}
-SetupIconFile={#AppSrc}\Icons\default.ico
-WizardSmallImageFile=..\icon.bmp
-;Compression=lzma2/max
-Compression=None
-SolidCompression=yes
-PrivilegesRequired=admin
-CloseApplications=yes
-RestartApplications=no
-; If we try and close CefSharp.BrowserSubprocess.exe we'll fail - it doesn't respond well
-; However if we close *just* SyncTrayzor, that will take care of shutting down CefSharp and syncthing
-CloseApplicationsFilter=SyncTrayzor.exe
-TouchDate=current
-#if "x64" == Arch
-ArchitecturesInstallIn64BitMode=x64
-ArchitecturesAllowed=x64
-#endif
-
-[Languages]
-Name: "english"; MessagesFile: "compiler:Default.isl"
-
-[CustomMessages]
-InstallingDotNetFramework=Installing .NET Framework. This might take a few minutes...
-DotNetFrameworkFailedToLaunch=Failed to launch .NET Framework Installer with error "%1". Please fix the error then run this installer again.
-DotNetFrameworkFailed1602=.NET Framework installation was cancelled. This installation can continue, but be aware that this application may not run unless the .NET Framework installation is completed successfully.
-DotNetFrameworkFailed1603=A fatal error occurred while installing the .NET Framework. Please fix the error, then run the installer again.
-DotNetFrameworkFailed5100=Your computer does not meet the requirements of the .NET Framework. Please consult the documentation.
-DotNetFrameworkFailedOther=The .NET Framework installer exited with an unexpected status code "%1". Please review any other messages shown by the installer to determine whether the installation completed successfully, and abort this installation and fix the problem if it did not.
-
-[Tasks]
-Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
-
-[Dirs]
-Name: "{userappdata}\{#AppDataFolder}"
-
-[Files]
-; Near the beginning, as it's extracted first and this makes it cheaper
-Source: "..\{#DotNetInstallerExe}"; DestDir: {tmp}; Flags: dontcopy nocompression noencryption
-
-Source: "{#AppBin}\*"; DestDir: "{app}"; Excludes: "*.xml,*.vshost.*,*.config,*.log,FluentValidation.resources.dll,System.Windows.Interactivity.resources.dll,syncthing.exe,data,logs,ffmpegsumo.dll,d3dcompiler_43.dll,d3dcompiler_47.dll,libEGL.dll,libGLESv2.dll,pdf.dll"; Flags: ignoreversion recursesubdirs
-Source: "{#AppBin}\SyncTrayzor.exe.Installer.config"; DestDir: "{app}"; DestName: "SyncTrayzor.exe.config"; Flags: ignoreversion
-Source: "{#AppSrc}\Icons\default.ico"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#AppRoot}\*.md"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#AppRoot}\*.txt"; DestDir: "{app}"; Flags: ignoreversion
-Source: "*.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "syncthing.exe"; DestDir: "{app}"; DestName: "syncthing.exe"; Flags: ignoreversion
-
-[Icons]
-Name: "{group}\{#AppName}"; Filename: "{app}\{#AppExeName}"
-Name: "{group}\{cm:UninstallProgram,{#AppName}}"; Filename: "{uninstallexe}"
-Name: "{commondesktop}\{#AppName}"; Filename: "{app}\{#AppExeName}"; Tasks: desktopicon
-
-[Run]
-Filename: "{app}\{#AppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(AppName, '&', '&&')}}"; Flags: nowait postinstall; Parameters: {code:SyncTrayzorStartFlags}; Check: ShouldStartSyncTrayzor
-
-[Code]
-var
-  GlobalRestartRequired: boolean;
-  UninstallPollPage: TNewNotebookPage;
-  UninstallNextButton: TNewButton;
-
-function DotNetIsMissing(): Boolean;
-var 
-  Exists: Boolean;
-  Release: Cardinal;
-begin
-  Exists := RegQueryDWordValue(HKEY_LOCAL_MACHINE, 'SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full', 'Release', Release);
-  Result := not Exists or (Release < 378758);
-end;
-
-// Adapted from https://blogs.msdn.microsoft.com/davidrickard/2015/07/17/installing-net-framework-4-5-automatically-with-inno-setup/
-function InstallDotNet(): String;
-var
-  StatusText: string;
-  ResultCode: Integer;
-begin
-  StatusText := WizardForm.StatusLabel.Caption;
-  WizardForm.StatusLabel.Caption := CustomMessage('InstallingDotNetFramework');
-  WizardForm.ProgressGauge.Style := npbstMarquee;
-  try
-    ExtractTemporaryFile('{#DotNetInstallerExe}');
-    if not Exec(ExpandConstant('{tmp}\{#DotNetInstallerExe}'), '/passive /norestart /showrmui /showfinalerror', '', SW_SHOW, ewWaitUntilTerminated, ResultCode) then
-    begin
-      Result := FmtMessage(CustomMessage('DotNetFrameworkFailedToLaunch'), [SysErrorMessage(ResultCode)]);
-    end
-    else
-    begin
-      // See https://msdn.microsoft.com/en-us/library/ee942965(v=vs.110).aspx#return_codes
-      case resultCode of
-        0: begin
-          // Successful
-        end;
-        1602 : begin
-          MsgBox(CustomMessage('DotNetFrameworkFailed1602'), mbInformation, MB_OK);
-        end;
-        1603: begin
-          Result := CustomMessage('DotNetFrameworkFailed1603');
-        end;
-        1641: begin
-          GlobalRestartRequired := True;
-        end;
-        3010: begin
-          GlobalRestartRequired := True;
-        end;
-        5100: begin
-          Result := CustomMessage('DotNetFrameworkFailed5100');
-        end;
-        else begin
-          MsgBox(FmtMessage(CustomMessage('DotNetFrameworkFailedOther'), [IntToStr(ResultCode)]), mbError, MB_OK);
-        end;
-      end;
-    end;
-  finally
-    WizardForm.StatusLabel.Caption := StatusText;
-    WizardForm.ProgressGauge.Style := npbstNormal;
-  end;
-end;
-
-procedure BumpInstallCount;
-var
-  FileContents: AnsiString;
-  InstallCount: integer;
-begin
-  { Increment the install count in InstallCount.txt if it exists, or create it with the contents '1' if it doesn't }
-  if LoadStringFromFile(ExpandConstant('{app}\InstallCount.txt'), FileContents) then
-  begin
-    InstallCount := StrTointDef(Trim(string(FileContents)), 0) + 1;
-  end
-  else
-  begin
-    InstallCount := 1;
-  end;
-
-  SaveStringToFile(ExpandConstant('{app}\InstallCount.txt'), IntToStr(InstallCount), False);
-end;
-
-procedure URLLabelOnClick(Sender: TObject);
-var
-	ErrorCode: Integer;
-begin
-	ShellExec('open', '{#DonateUrl}', '', '', SW_SHOWNORMAL, ewNoWait, ErrorCode);
-end;
-
-procedure InitializeWizard;
-var
-  URLLabel: TNewStaticText;
-begin
-  URLLabel := TNewStaticText.Create(WizardForm);
-  URLLabel.Caption := 'Donate';
-  URLLabel.Cursor := crHand;
-  URLLabel.Parent := WizardForm;
-  URLLabel.Font.Style := URLLabel.Font.Style + [fsUnderline];
-	URLLabel.Font.Color := clBlue;
-	URLLabel.Top := WizardForm.ClientHeight - URLLabel.Height - 15;
-  URLLabel.Left := ScaleX(10)
-  URLLabel.OnClick := @URLLabelOnClick;
-end;
-
-procedure CurStepChanged(CurStep: TSetupStep);
-var
-  FindRec: TFindRec;
-  FolderPath: String;
-  FilePath: String;
-begin
-  if CurStep = ssInstall then
-  begin
-    BumpInstallCount();
-
-    { We might be being run from ProcessRunner.exe, *and* we might be trying to update it. Funsies. Let's rename it (which Windows lets us do) }
-    DeleteFile(ExpandConstant('{app}\ProcessRunner.exe.old'));
-    RenameFile(ExpandConstant('{app}\ProcessRunner.exe'), ExpandConstant('{app}\ProcessRunner.exe.old'));
-
-    Log(ExpandConstant('Looking for resource files in {app}\*'));
-    { Remove resource files. This means that out-of-date languages will be removed, which (as a last-ditch resore) will alert maintainers that something's wrong }
-    if FindFirst(ExpandConstant('{app}\*'), FindRec) then
-    begin
-      try
-        repeat
-          if (FindRec.Attributes and FILE_ATTRIBUTE_DIRECTORY <> 0) and (FindRec.Name <> '.') and (FindRec.Name <> '..') then
-          begin
-            FolderPath :=  ExpandConstant('{app}\') + FindRec.Name;
-            FilePath := FolderPath + '\SyncTrayzor.resources.dll';
-            if DeleteFile(FilePath) then
-            begin
-              Log('Deleted ' + FilePath);
-              if DelTree(FolderPath, True, False, False) then
-                Log('Deleted ' + FolderPath);
-            end;
-          end;
-        until not FindNext(FindRec);
-      finally
-        FindClose(FindRec);
-      end;
-    end;
-  end
-end;
-
-procedure CurPageChanged(CurPageID: Integer);
-begin
-
-end;
-
-function PrepareToInstall(var NeedsRestart: Boolean): String;
-begin
-  // 'NeedsRestart' only has an effect if we return a non-empty string, thus aborting the installation.
-  // If the installers indicate that they want a restart, this should be done at the end of installation.
-  // Therefore we set the global 'restartRequired' if a restart is needed, and return this from NeedRestart()
-
-  if DotNetIsMissing() then
-  begin
-    Result := InstallDotNet();
-  end;
-end;
-
-function NeedRestart(): Boolean;
-begin
-  Result := GlobalRestartRequired;
-end;
-
-function ShouldStartSyncTrayzor(): Boolean;
-var
-  flagPassed: Boolean;
-  i: Integer;
-begin
-  // Can't use {param}, as it doesn't match flags with no value
-  flagPassed := False;
-  for i := 0 to ParamCount do begin
-    if ParamStr(i) = '/StartSyncTrayzor' then begin
-      flagPassed := True;
-      break;
-    end;
-  end;
-  Result := (not WizardSilent()) or flagPassed;
-end;
-
-function SyncTrayzorStartFlags(param: String): String;
-begin
-   if WizardSilent() then begin
-      Result := '-minimized'
-   end else begin
-      Result := ''
-   end;
-end;
-
-// See https://stackoverflow.com/a/42550055/1086121
-
-procedure UpdateUninstallWizard;
-begin
-  if UninstallProgressForm.InnerNotebook.ActivePage = UninstallPollPage then
-  begin
-    UninstallProgressForm.PageNameLabel.Caption := 'Please Tell Us Why You''re Leaving';
-    UninstallProgressForm.PageDescriptionLabel.Caption := '';
-  end;
-
-  UninstallNextButton.Caption := 'Uninstall';
-  // Make the "Uninstall" button break the ShowModal loop
-  UninstallNextButton.ModalResult := mrOK;
-end;
-
-function SerializeBool(value: Boolean): String;
-begin
-  if value then
-  begin
-    Result := 'true';
-  end
-  else
-  begin
-    Result := 'false';
-  end
-end;
-
-function EscapeJsonString(value: String): String;
-var
-  c: Char;
-  i: Integer;
-begin
-  // http://www.jrsoftware.org/ishelp/index.php?topic=isxfunc_charlength
-  i := 1;
-  while i <= Length(value) do
-  begin
-    c := value[i];
-    if c = #10 then begin
-      Result := Result + '\n';
-    end else if c = #13 then begin
-      Result := Result + '\r';
-    end else if c = #9 then begin
-      Result := Result + '\t';
-    end else if Ord(c) < 32 then begin
-      Result := Result + Format('\x%.4x', [Ord(c)]);
-    end else if c = '"' then begin
-      Result := Result + '\"';
-    end else if c = '\' then begin
-      Result := Result + '\\'
-    end else begin
-      Result := Result + c;
-    end;
-    i := i + CharLength(value, i);
-  end;
-end;
-
-procedure InitializeUninstallProgressForm();
-var
-  PageText: TNewStaticText;
-  PageNameLabel: string;
-  PageDescriptionLabel: string;
-  CancelButtonEnabled: Boolean;
-  CancelButtonModalResult: Integer;
-  Checklist: TNewCheckListBox;
-  CommentsText: TNewStaticText;
-  CommentsBox: TNewMemo;
-  WinHttpReq: Variant;
-begin
-  if not UninstallSilent then
-  begin
-    // Create the poll page and make it active
-    UninstallPollPage := TNewNotebookPage.Create(UninstallProgressForm);
-    UninstallPollPage.Notebook := UninstallProgressForm.InnerNotebook;
-    UninstallPollPage.Parent := UninstallProgressForm.InnerNotebook;
-    UninstallPollPage.Align := alClient;
-
-    PageText := TNewStaticText.Create(UninstallProgressForm);
-    PageText.Parent := UninstallPollPage;
-    PageText.AutoSize := True;
-    PageText.WordWrap := True;
-    PageText.SetBounds(UninstallProgressForm.StatusLabel.Left, UninstallProgressForm.StatusLabel.Top, UninstallProgressForm.StatusLabel.Width, UninstallProgressForm.StatusLabel.Height);
-    PageText.ShowAccelChar := False;
-    PageText.Caption := 'Please tell us why you don''t like Syncthing / SyncTrayzor so we can improve things.' + #13#10 +
-    'No personal data will be sent. You can skip this step if you want.';
-
-    Checklist := TNewCheckListBox.Create(UninstallProgressForm);
-    Checklist.Parent := UninstallPollPage;
-    Checklist.SetBounds(PageText.Left, PageText.Top + PageText.Height + ScaleY(10), PageText.Width, ScaleY(20) * 5);
-    Checklist.BorderStyle := bsNone;
-    Checklist.Color := clBtnFace;
-    Checklist.WantTabs := True;
-    Checklist.MinItemHeight := ScaleY(20);
-
-    Checklist.AddCheckBox('I couldn''t get Syncthing to work', '', 0, False, True, False, False, nil);
-    Checklist.AddCheckBox('Syncthing doesn''t do what I need', '', 0, False, True, False, False, nil);
-    Checklist.AddCheckBox('I prefer Resilio Sync', '', 0, False, True, False, False, nil);
-    Checklist.AddCheckBox('I don''t like SyncTrayzor - going to use another wrapper', '', 0, False, True, False, False, nil);
-    Checklist.AddCheckBox('Other (please expand below)', '', 0, False, True, False, False, nil);
-
-    CommentsText := TNewStaticText.Create(UninstallProgressForm);
-    CommentsText.Parent := UninstallPollPage;
-    CommentsText.AutoSize := True;
-    CommentsText.WordWrap := True;
-    CommentsText.SetBounds(PageText.Left, Checklist.Top + Checklist.Height + ScaleY(10), PageText.Width, ScaleY(15));
-    CommentsText.AutoSize := False;
-    CommentsText.ShowAccelChar := False;
-    CommentsText.Caption := 'Anything else?';
-
-    CommentsBox := TNewMemo.Create(UninstallProgressForm);
-    CommentsBox.Parent := UninstallPollPage;
-    CommentsBox.SetBounds(PageText.Left, CommentsText.Top + CommentsText.Height + ScaleY(5), PageText.Width, ScaleY(60));
-    CommentsBox.ScrollBars := ssVertical;
-
-    UninstallProgressForm.InnerNotebook.ActivePage := UninstallPollPage;
-
-    PageNameLabel := UninstallProgressForm.PageNameLabel.Caption;
-    PageDescriptionLabel := UninstallProgressForm.PageDescriptionLabel.Caption;
-
-    UninstallNextButton := TNewButton.Create(UninstallProgressForm);
-    UninstallNextButton.Parent := UninstallProgressForm;
-    UninstallNextButton.Left := UninstallProgressForm.CancelButton.Left - UninstallProgressForm.CancelButton.Width - ScaleX(10);
-    UninstallNextButton.Top := UninstallProgressForm.CancelButton.Top;
-    UninstallNextButton.Width := UninstallProgressForm.CancelButton.Width;
-    UninstallNextButton.Height := UninstallProgressForm.CancelButton.Height;
-
-    UninstallProgressForm.CancelButton.TabOrder := UninstallNextButton.TabOrder + 1;
-
-    // Run our wizard pages
-    UpdateUninstallWizard;
-    CancelButtonEnabled := UninstallProgressForm.CancelButton.Enabled
-    UninstallProgressForm.CancelButton.Enabled := True;
-    CancelButtonModalResult := UninstallProgressForm.CancelButton.ModalResult;
-    UninstallProgressForm.CancelButton.ModalResult := mrCancel;
-
-    if UninstallProgressForm.ShowModal = mrCancel then Abort;
-
-    WinHttpReq := CreateOleObject('WinHttp.WinHttpRequest.5.1');
-    WinHttpReq.Open('POST', '{#SurveyUrl}', false);
-    WinHttpReq.Send('{' +
-      ' "version": "{#AppVersion}", "comment": "' + EscapeJsonString(CommentsBox.Text) + '"' +
-      ', "checklist": {' +
-        ' "wontWork": '+ SerializeBool(Checklist.Checked[0]) + 
-        ', "notWhatINeed": '+ SerializeBool(Checklist.Checked[1]) +
-        ', "preferResilio": '+ SerializeBool(Checklist.Checked[2]) +
-        ', "dontLikeSyncTrayzor": '+ SerializeBool(Checklist.Checked[3]) +
-        ', "other": '+ SerializeBool(Checklist.Checked[4]) +
-      ' }' +
-      ' }');
-
-    Abort;
-
-    // Restore the standard page payout
-    UninstallProgressForm.CancelButton.Enabled := CancelButtonEnabled;
-    UninstallProgressForm.CancelButton.ModalResult := CancelButtonModalResult;
-
-    UninstallProgressForm.PageNameLabel.Caption := PageNameLabel;
-    UninstallProgressForm.PageDescriptionLabel.Caption := PageDescriptionLabel;
-
-    UninstallProgressForm.InnerNotebook.ActivePage := UninstallProgressForm.InstallingPage;
-  end;
-end;
-
-[UninstallDelete]
-Type: files; Name: "{app}\ProcessRunner.exe.old"
-Type: files; Name: "{app}\InstallCount.txt"
-Type: filesandordirs; Name: "{userappdata}\{#AppDataFolder}"
-Type: filesandordirs; Name: "{localappdata}\{#AppDataFolder}"
\ No newline at end of file
+#include "../common.iss"
\ No newline at end of file

From b3a69df42806f94e7b3e1dd902602f7f7b53813c Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Mon, 4 Sep 2017 08:25:58 +0100
Subject: [PATCH 23/29] Record response date

---
 server/survey.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/server/survey.php b/server/survey.php
index 4c632ab3..f65cd9fc 100644
--- a/server/survey.php
+++ b/server/survey.php
@@ -18,20 +18,24 @@
 	{
 		$db->exec("CREATE TABLE IF NOT EXISTS responses (
 			id INTEGER PRIMARY KEY,
-			version TEXT,
-			ip TEXT,
+			date TEXT NOT NULL,
+			version TEXT NOT NULL,
+			ip TEXT NOT NULL,
 			comment TEXT
 		);");
 		$db->exec("CREATE TABLE IF NOT EXISTS checklist (
 			id INTEGER PRIMARY KEY,
-			response_id INTEGER REFERENCES responses(id),
-			key TEXT
+			response_id INTEGER NOT NULL REFERENCES responses(id),
+			key TEXT NOT NULL
 		);");
 	}
 
 	$data = json_decode(file_get_contents('php://input'), true);
-	$stmt = $db->prepare("INSERT INTO responses(ip, version, comment) VALUES (:ip, :version, :comment);");
-	$stmt->execute(array('ip' => $_SERVER['REMOTE_ADDR'], 'version' => $data['version'], 'comment' => $data['comment']));
+	$stmt = $db->prepare("INSERT INTO responses(date, ip, version, comment) VALUES (CURRENT_TIMESTAMP, :ip, :version, :comment);");
+	$stmt->execute(array(
+		'ip' => $_SERVER['REMOTE_ADDR'],
+		'version' => $data['version'],
+		'comment' => $data['comment']));
 	$responseId = $db->lastInsertId();
 
 	$stmt = $db->prepare("INSERT INTO CHECKLIST (response_id, key) VALUES (:response_id, :key);");

From 8d21cafe3e346194854ac13ced00af4d70e00dbd Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Mon, 4 Sep 2017 08:27:57 +0100
Subject: [PATCH 24/29] Only send survey if they actually input anything

---
 installer/common.iss | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/installer/common.iss b/installer/common.iss
index 2453c607..9332dae6 100644
--- a/installer/common.iss
+++ b/installer/common.iss
@@ -424,18 +424,20 @@ begin
 
     if UninstallProgressForm.ShowModal = mrCancel then Abort;
 
-    WinHttpReq := CreateOleObject('WinHttp.WinHttpRequest.5.1');
-    WinHttpReq.Open('POST', '{#SurveyUrl}', false);
-    WinHttpReq.Send('{' +
-      ' "version": "{#AppVersion}", "comment": "' + EscapeJsonString(CommentsBox.Text) + '"' +
-      ', "checklist": {' +
-        ' "wontWork": '+ SerializeBool(Checklist.Checked[0]) + 
-        ', "notWhatINeed": '+ SerializeBool(Checklist.Checked[1]) +
-        ', "preferResilio": '+ SerializeBool(Checklist.Checked[2]) +
-        ', "dontLikeSyncTrayzor": '+ SerializeBool(Checklist.Checked[3]) +
-        ', "other": '+ SerializeBool(Checklist.Checked[4]) +
-      ' }' +
-      ' }');
+    if Checklist.Checked[0] or Checklist.Checked[1] or Checklist.Checked[2] or Checklist.Checked[3] or Checklist.Checked[4] or (CommentsBox.Text <> '') then begin
+      WinHttpReq := CreateOleObject('WinHttp.WinHttpRequest.5.1');
+      WinHttpReq.Open('POST', '{#SurveyUrl}', false);
+      WinHttpReq.Send('{' +
+        ' "version": "{#AppVersion}", "comment": "' + EscapeJsonString(CommentsBox.Text) + '"' +
+        ', "checklist": {' +
+          ' "wontWork": '+ SerializeBool(Checklist.Checked[0]) + 
+          ', "notWhatINeed": '+ SerializeBool(Checklist.Checked[1]) +
+          ', "preferResilio": '+ SerializeBool(Checklist.Checked[2]) +
+          ', "dontLikeSyncTrayzor": '+ SerializeBool(Checklist.Checked[3]) +
+          ', "other": '+ SerializeBool(Checklist.Checked[4]) +
+        ' }' +
+        ' }');
+    end;
 
     // Restore the standard page payout
     UninstallProgressForm.CancelButton.Enabled := CancelButtonEnabled;

From b04cf3d258714f74faaa3bde5a8d4ded515af73d Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Mon, 4 Sep 2017 08:34:35 +0100
Subject: [PATCH 25/29] Tweak poll wording

---
 installer/common.iss | 46 +++++++++++++++++++++-----------------------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/installer/common.iss b/installer/common.iss
index 9332dae6..95c92689 100644
--- a/installer/common.iss
+++ b/installer/common.iss
@@ -288,29 +288,11 @@ begin
    end;
 end;
 
-// See https://stackoverflow.com/a/42550055/1086121
-
-procedure UpdateUninstallWizard;
-begin
-  if UninstallProgressForm.InnerNotebook.ActivePage = UninstallPollPage then
-  begin
-    UninstallProgressForm.PageNameLabel.Caption := 'Please Tell Us Why You''re Leaving';
-    UninstallProgressForm.PageDescriptionLabel.Caption := '';
-  end;
-
-  UninstallNextButton.Caption := 'Uninstall';
-  // Make the "Uninstall" button break the ShowModal loop
-  UninstallNextButton.ModalResult := mrOK;
-end;
-
 function SerializeBool(value: Boolean): String;
 begin
-  if value then
-  begin
+  if value then begin
     Result := 'true';
-  end
-  else
-  begin
+  end else begin
     Result := 'false';
   end
 end;
@@ -344,6 +326,21 @@ begin
   end;
 end;
 
+// See https://stackoverflow.com/a/42550055/1086121
+
+procedure UpdateUninstallWizard;
+begin
+  if UninstallProgressForm.InnerNotebook.ActivePage = UninstallPollPage then
+  begin
+    UninstallProgressForm.PageNameLabel.Caption := 'Please Tell Us Why You''re Leaving';
+    UninstallProgressForm.PageDescriptionLabel.Caption := '';
+  end;
+
+  UninstallNextButton.Caption := 'Uninstall';
+  // Make the "Uninstall" button break the ShowModal loop
+  UninstallNextButton.ModalResult := mrOK;
+end;
+
 procedure InitializeUninstallProgressForm();
 var
   PageText: TNewStaticText;
@@ -370,7 +367,7 @@ begin
     PageText.WordWrap := True;
     PageText.SetBounds(UninstallProgressForm.StatusLabel.Left, UninstallProgressForm.StatusLabel.Top, UninstallProgressForm.StatusLabel.Width, UninstallProgressForm.StatusLabel.Height);
     PageText.ShowAccelChar := False;
-    PageText.Caption := 'Please tell us why you don''t like Syncthing / SyncTrayzor so we can improve things.' + #13#10 +
+    PageText.Caption := 'Sorry you''re leaving! Please tell us what you didn''t like so we can improve it.' + #13#10 +
     'No personal data will be sent. You can skip this step if you want.';
 
     Checklist := TNewCheckListBox.Create(UninstallProgressForm);
@@ -384,7 +381,7 @@ begin
     Checklist.AddCheckBox('I couldn''t get Syncthing to work', '', 0, False, True, False, False, nil);
     Checklist.AddCheckBox('Syncthing doesn''t do what I need', '', 0, False, True, False, False, nil);
     Checklist.AddCheckBox('I prefer Resilio Sync', '', 0, False, True, False, False, nil);
-    Checklist.AddCheckBox('I don''t like SyncTrayzor - going to use another wrapper', '', 0, False, True, False, False, nil);
+    Checklist.AddCheckBox('I don''t like SyncTrayzor - I''m going to use another wrapper', '', 0, False, True, False, False, nil);
     Checklist.AddCheckBox('Other (please expand below)', '', 0, False, True, False, False, nil);
 
     CommentsText := TNewStaticText.Create(UninstallProgressForm);
@@ -394,7 +391,7 @@ begin
     CommentsText.SetBounds(PageText.Left, Checklist.Top + Checklist.Height + ScaleY(10), PageText.Width, ScaleY(15));
     CommentsText.AutoSize := False;
     CommentsText.ShowAccelChar := False;
-    CommentsText.Caption := 'Anything else?';
+    CommentsText.Caption := 'More Details / Complaints:';
 
     CommentsBox := TNewMemo.Create(UninstallProgressForm);
     CommentsBox.Parent := UninstallPollPage;
@@ -428,7 +425,8 @@ begin
       WinHttpReq := CreateOleObject('WinHttp.WinHttpRequest.5.1');
       WinHttpReq.Open('POST', '{#SurveyUrl}', false);
       WinHttpReq.Send('{' +
-        ' "version": "{#AppVersion}", "comment": "' + EscapeJsonString(CommentsBox.Text) + '"' +
+        ' "version": "{#AppVersion}"' +
+        ', "comment": "' + EscapeJsonString(CommentsBox.Text) + '"' +
         ', "checklist": {' +
           ' "wontWork": '+ SerializeBool(Checklist.Checked[0]) + 
           ', "notWhatINeed": '+ SerializeBool(Checklist.Checked[1]) +

From 23370e34612c42516f5ff6c3279f85fdf52b2e34 Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Mon, 4 Sep 2017 12:26:20 +0100
Subject: [PATCH 26/29] Reword 'resilio sync' poll option

---
 installer/common.iss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/installer/common.iss b/installer/common.iss
index 95c92689..df49fbee 100644
--- a/installer/common.iss
+++ b/installer/common.iss
@@ -380,7 +380,7 @@ begin
 
     Checklist.AddCheckBox('I couldn''t get Syncthing to work', '', 0, False, True, False, False, nil);
     Checklist.AddCheckBox('Syncthing doesn''t do what I need', '', 0, False, True, False, False, nil);
-    Checklist.AddCheckBox('I prefer Resilio Sync', '', 0, False, True, False, False, nil);
+    Checklist.AddCheckBox('I prefer another sync tool (please say which below)', '', 0, False, True, False, False, nil);
     Checklist.AddCheckBox('I don''t like SyncTrayzor - I''m going to use another wrapper', '', 0, False, True, False, False, nil);
     Checklist.AddCheckBox('Other (please expand below)', '', 0, False, True, False, False, nil);
 
@@ -430,7 +430,7 @@ begin
         ', "checklist": {' +
           ' "wontWork": '+ SerializeBool(Checklist.Checked[0]) + 
           ', "notWhatINeed": '+ SerializeBool(Checklist.Checked[1]) +
-          ', "preferResilio": '+ SerializeBool(Checklist.Checked[2]) +
+          ', "preferAnotherSyncTool": '+ SerializeBool(Checklist.Checked[2]) +
           ', "dontLikeSyncTrayzor": '+ SerializeBool(Checklist.Checked[3]) +
           ', "other": '+ SerializeBool(Checklist.Checked[4]) +
         ' }' +

From 1a5cac752dd252dbfb756029651ec43cca261937 Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Mon, 4 Sep 2017 12:52:58 +0100
Subject: [PATCH 27/29] Set timezone and error handler in survey.php

---
 server/survey.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/server/survey.php b/server/survey.php
index f65cd9fc..4eb43637 100644
--- a/server/survey.php
+++ b/server/survey.php
@@ -4,6 +4,14 @@
  * Survey endpoint for SyncTrayzor
  */
 
+set_error_handler('error_handler');
+date_default_timezone_set('UCT');
+
+function error_handler($severity, $message, $filename, $lineno)
+{
+   throw new ErrorException($message, 0, $severity, $filename, $lineno);
+}
+
 define('DATABASE', 'survey.sqlite');
 
 try 

From 66fae8afc73ec5eda6e879a005d2d004e12a9b3d Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Mon, 4 Sep 2017 12:50:34 +0100
Subject: [PATCH 28/29] Update changelog

---
 CHANGELOG.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7a771a56..114f0e17 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,21 @@
 Changelog
 =========
 
+v1.1.17
+-------
+
+ - Don't store Syncthing's API key in config, and don't log it
+ - Fix filesystem notifications when the file contained non-ASCII characters (#400)
+ - Don't show device connected/disconnected notifications if a device is reconnecting a lot
+ - Don't watch / raise notifications about new folders if no existing folders are watched / have notifications (#393)
+ - Don't write to the disk as much by default (#370)
+ - Fix crash on the settings screen
+ - Be more reslient to weird registry permissions, fixing crash (#378)
+ - Fix crash when calculating data transfer stats (#380)
+ - Be more reslient when trying to find a free port for Syncthing to use (#381)
+ - Add installer command-line flags (for system administrators) (#371, #402)
+ - Add an exit poll to the uninstaller
+
 v1.1.16
 -------
 

From 2a286d1d567b62fd2cfa8e8c463599682718e161 Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Mon, 4 Sep 2017 12:52:28 +0100
Subject: [PATCH 29/29] Update version_check.php

---
 server/version_check.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/server/version_check.php b/server/version_check.php
index 0588f132..f7b84cca 100644
--- a/server/version_check.php
+++ b/server/version_check.php
@@ -65,7 +65,7 @@ function get_with_wildcard($src, $value, $default = null)
 }
 
 $versions = [
-   '1.1.16' => [
+   '1.1.17' => [
       'installed' => [
          'direct_download_url' => [
             'x64' => 'https://github.com/canton7/SyncTrayzor/releases/download/v{version}/SyncTrayzorSetup-x64.exe',
@@ -81,11 +81,12 @@ function get_with_wildcard($src, $value, $default = null)
       'sha1sum_download_url' => 'https://github.com/canton7/SyncTrayzor/releases/download/v{version}/sha1sum.txt.asc',
       'sha512sum_download_url' => 'https://github.com/canton7/SyncTrayzor/releases/download/v{version}/sha512sum.txt.asc',
       'release_page_url' => 'https://github.com/canton7/SyncTrayzor/releases/tag/v{version}',
-      'release_notes' => "- Fix some crashes on startup\n- Fix bug where 'show logs' link on the crash screen would cause another crash\n- Reduce how often SyncTrayzor checks for updates",
+      'release_notes' => "- Don't store Syncthing's API key in config, and don't log it\n- Fix filesystem notifications when the file contained non-ASCII characters\n- Don't show device connected/disconnected notifications if a device is reconnecting a lot\n- Don't watch / raise notifications about new folders if no existing folders are watched / have notifications\n- Don't write to the disk as much by default\n- Fix crash on the settings screen\n- Be more reslient to weird registry permissions, fixing crash\n- Fix crash when calculating data transfer stats\n- Be more reslient when trying to find a free port for Syncthing to use",
    ]
 ];
 
 $upgrades = [
+   '1.1.16' => ['to' => 'latest', 'formatter' => '5'],
    '1.1.15' => ['to' => 'latest', 'formatter' => '5'],
    '1.1.14' => ['to' => 'latest', 'formatter' => '5'],
    '1.1.13' => ['to' => 'latest', 'formatter' => '5'],