Merge in abstractions in Desktop projects.

Author: bitbound

Desktop.Linux/Program.cs

@@ -44,12 +44,7 @@ public static async Task Main(string[] args)
 
         services.AddSingleton<IOrganizationIdProvider, OrganizationIdProvider>();
         services.AddSingleton<IEmbeddedServerDataProvider, EmbeddedServerDataProvider>();
-
-        services.AddRemoteControlLinux(
-            config =>
-            {
-                config.AddBrandingProvider<BrandingProvider>();
-            });
+        services.AddRemoteControlLinux();
 
         services.AddLogging(builder =>
         {

Desktop.Linux/Services/AppStartup.cs

@@ -4,6 +4,7 @@
 using Remotely.Desktop.UI.Services;
 using Remotely.Shared.Models;
 using Microsoft.Extensions.Logging;
+using Desktop.Shared.Services;
 
 namespace Remotely.Desktop.Linux.Services;
 

Desktop.Linux/Startup/IServiceCollectionExtensions.cs

@@ -17,11 +17,9 @@ public static class IServiceCollectionExtensions
     /// </summary>
     /// <param name="services"></param>
     /// <param name="clientConfig"></param>
-    public static void AddRemoteControlLinux(
-        this IServiceCollection services,
-        Action<IRemoteControlClientBuilder> clientConfig)
+    public static void AddRemoteControlLinux(this IServiceCollection services)
     {
-        services.AddRemoteControlXplat(clientConfig);
+        services.AddRemoteControlXplat();
         services.AddRemoteControlUi();
 
         services.AddSingleton<IAppStartup, AppStartup>();

Desktop.Shared/Abstractions/IBrandingProvider.cs

@@ -10,6 +10,13 @@
 
 namespace Desktop.Shared.Services;
 
+public interface IBrandingProvider
+{
+    BrandingInfo CurrentBranding { get; }
+    Task Initialize();
+    void SetBrandingInfo(BrandingInfo brandingInfo);
+}
+
 public class BrandingProvider : IBrandingProvider
 {
     private readonly IAppState _appState;
@@ -56,9 +63,9 @@ public async Task Initialize()
             };
         }
 
-        if (_brandingInfo.Icon?.Any() != true)
+        if (_brandingInfo.Icon is not { Length: > 0 })
         {
-            using var mrs = typeof(BrandingProvider).Assembly.GetManifestResourceStream("Desktop.Shared.Assets.Remotely_Icon.png");
+            using var mrs = typeof(BrandingProvider).Assembly.GetManifestResourceStream("Remotely.Desktop.Shared.Assets.Remotely_Icon.png");
             using var ms = new MemoryStream();
             mrs!.CopyTo(ms);
 
@@ -87,21 +94,24 @@ private async Task<Result<BrandingInfo>> TryGetBrandingInfo()
 
                 var result = _embeddedDataSearcher.TryGetEmbeddedData(filePath);
 
-                if (!result.IsSuccess)
-                {
-                    return result.HadException ?
-                        Result.Fail<BrandingInfo>(result.Exception) :
-                        Result.Fail<BrandingInfo>(result.Reason);
-                }
-
-                if (!string.IsNullOrWhiteSpace(result.Value.OrganizationId))
+                if (result.IsSuccess)
                 {
-                    _orgIdProvider.OrganizationId = result.Value.OrganizationId;
+                    if (!string.IsNullOrWhiteSpace(result.Value.OrganizationId))
+                    {
+                        _orgIdProvider.OrganizationId = result.Value.OrganizationId;
+                    }
+
+                    if (result.Value.ServerUrl is not null)
+                    {
+                        _appState.Host = result.Value.ServerUrl.AbsoluteUri;
+                    }
                 }
 
-                if (result.Value.ServerUrl is not null)
+                if (string.IsNullOrWhiteSpace(_appState.Host))
                 {
-                    _appState.Host = result.Value.ServerUrl.AbsoluteUri;
+                    return result.HadException ?
+                        Result.Fail<BrandingInfo>(result.Exception) :
+                        Result.Fail<BrandingInfo>(result.Reason);
                 }
             }
 

Desktop.Shared/Services/BrandingProvider.cs

@@ -5,19 +5,15 @@
 using Microsoft.Extensions.Logging;
 using Bitbound.SimpleMessenger;
 using Desktop.Shared.Services;
+using Remotely.Desktop.Shared.Abstractions;
 
 namespace Remotely.Desktop.Shared.Startup;
 
 public static class IServiceCollectionExtensions
 {
     internal static void AddRemoteControlXplat(
-        this IServiceCollection services,
-        Action<IRemoteControlClientBuilder> clientConfig)
+        this IServiceCollection services)
     {
-        var builder = new RemoteControlClientBuilder(services);
-        clientConfig.Invoke(builder);
-        builder.Validate();
-
         services.AddLogging(builder =>
         {
             builder.AddConsole().AddDebug();
@@ -31,6 +27,7 @@ internal static void AddRemoteControlXplat(
         services.AddSingleton(s => WeakReferenceMessenger.Default);
         services.AddSingleton<IDesktopEnvironment, DesktopEnvironment>();
         services.AddSingleton<IDtoMessageHandler, DtoMessageHandler>();
+        services.AddSingleton<IBrandingProvider, BrandingProvider>();
         services.AddSingleton<IAppState, AppState>();
         services.AddSingleton<IViewerFactory, ViewerFactory>();
         services.AddTransient<IScreenCaster, ScreenCaster>();

Desktop.Shared/Startup/IServiceCollectionExtensions.cs

@@ -3,6 +3,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using System.IO;
+using Desktop.Shared.Services;
 
 namespace Remotely.Desktop.UI.Services;
 

Desktop.Shared/Startup/RemoteControlClientBuilder.cs

@@ -8,6 +8,7 @@
 using Remotely.Shared.Entities;
 using System.IO;
 using System.Reflection;
+using Desktop.Shared.Services;
 
 namespace Remotely.Desktop.UI.ViewModels;
 
@@ -66,7 +67,7 @@ private void ApplyBrandingImpl()
 
                 ProductName = _brandingInfo.Product;
 
-                if (_brandingInfo.Icon?.Any() == true)
+                if (_brandingInfo.Icon is { Length: > 0 })
                 {
                     using var imageStream = new MemoryStream(_brandingInfo.Icon);
                     Icon = new Bitmap(imageStream);

Desktop.UI/Services/ViewModelFactory.cs

@@ -8,6 +8,7 @@
 using Remotely.Desktop.Shared.Reactive;
 using Microsoft.Extensions.DependencyInjection;
 using Remotely.Shared.Models;
+using Desktop.Shared.Services;
 
 namespace Remotely.Desktop.UI.ViewModels;