Merge pull request #505 from emoacht/develop

Develop

Author: emoacht

Source/Installer/Product.wxs

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-	<Product Id="*" Name="Monitorian" Manufacturer="emoacht" Version="4.4.9"
+	<Product Id="*" Name="Monitorian" Manufacturer="emoacht" Version="4.4.11"
 			 Language="1033" Codepage="1252" UpgradeCode="{81A4D148-75D3-462E-938D-8C208FB48E3C}">
 		<Package Id="*" InstallerVersion="500" Compressed="yes"
 				 InstallScope="perMachine" InstallPrivileges="elevated"

Source/Monitorian.Core/Models/Watcher/BrightnessConnector.cs

@@ -36,7 +36,7 @@ private enum Result
 			None = 0,
 
 			/// <summary>
-			/// Rrequest is OK.
+			/// Request is OK.
 			/// </summary>
 			OK,
 
@@ -85,7 +85,7 @@ private static bool TryFindReport(Windows.Foundation.Collections.ValueSet messag
 		/// <summary>
 		/// Interval in seconds
 		/// </summary>
-		public float Interval { get; set; } = 0.1F;
+		public float Interval { get; set; } = 0.5F;
 
 		#endregion
 
@@ -131,13 +131,13 @@ public BrightnessConnector()
 		/// <param name="onBrightnessChanged">Action to be invoked when brightness changed</param>
 		/// <param name="onError">Action to be invoked when error occurred</param>
 		/// <param name="onContinue">Action to be invoked when continuation of AppService is determined</param>
-		public virtual async Task InitiateAsync(Action<int> onBrightnessChanged, Action<string> onError, Func<bool> onContinue)
+		public virtual Task InitiateAsync(Action<int> onBrightnessChanged, Action<string> onError, Func<bool> onContinue)
 		{
 			this._onBrightnessChanged = onBrightnessChanged ?? throw new ArgumentNullException(nameof(onBrightnessChanged));
 			this._onError = onError ?? throw new ArgumentNullException(nameof(onError));
 			this._onContinue = onContinue ?? throw new ArgumentNullException(nameof(onContinue));
 
-			await ConnectAsync(true);
+			return ConnectAsync(true);
 		}
 
 		private AppService.AppServiceConnection _appServiceConnection;
@@ -169,11 +169,14 @@ public virtual async Task<bool> OpenAsync()
 					_appServiceConnection.ServiceClosed += OnAppServiceConnectionServiceClosed;
 					return true;
 
-				default:
+				case not AppService.AppServiceConnectionStatus.AppUnavailable:
+					// AppServiceConnectionStatus.AppUnavailable means temporarily unavailable and
+					// thus it is excluded because AppServiceConnection can be available later.
 					// https://learn.microsoft.com/en-us/uwp/api/windows.applicationmodel.appservice.appserviceconnectionstatus
-					if (status is not AppService.AppServiceConnectionStatus.AppUnavailable)
-						_isAvailable = false;
+					_isAvailable = false;
+					goto default;
 
+				default:
 					_onError?.Invoke($"Failed: {status}");
 					return false;
 			}
@@ -235,17 +238,13 @@ private void OnAppServiceConnectionRequestReceived(AppService.AppServiceConnecti
 
 		private async void OnAppServiceConnectionServiceClosed(AppService.AppServiceConnection sender, AppService.AppServiceClosedEventArgs args)
 		{
-			// AppService closes when around 25 seconds has elapsed after it opened.
+			// AppService closes after 25 seconds has elapsed. It is explained as that AppService
+			// is executed as background task.
 			Debug.WriteLine("ServiceClosed");
 			ReleaseAppServiceConnection();
 
-			if (_isMultiple)
-			{
-				await Task.Delay(TimeSpan.FromSeconds(Interval));
-
-				if (_onContinue.Invoke())
-					await ConnectAsync(true);
-			}
+			if (_onContinue.Invoke())
+				await ConnectAsync(_isMultiple);
 		}
 
 		private void ReleaseAppServiceConnection()

Source/Monitorian.Core/Properties/AssemblyInfo.cs

@@ -33,8 +33,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.4.9.0")]
-[assembly: AssemblyFileVersion("4.4.9.0")]
+[assembly: AssemblyVersion("4.4.11.0")]
+[assembly: AssemblyFileVersion("4.4.11.0")]
 [assembly: NeutralResourcesLanguage("en-US")]
 
 // For unit test

Source/Monitorian/Properties/AssemblyInfo.cs

@@ -51,7 +51,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.4.9.0")]
-[assembly: AssemblyFileVersion("4.4.9.0")]
+[assembly: AssemblyVersion("4.4.11.0")]
+[assembly: AssemblyFileVersion("4.4.11.0")]
 [assembly: Guid("a4cc5362-9b08-465b-ad64-5cfabc72a4c7")]
 [assembly: NeutralResourcesLanguage("en-US")]