diff --git a/Desktop.Linux/Desktop.Linux.csproj b/Desktop.Linux/Desktop.Linux.csproj
index 4bf8414ab..18e52e65e 100644
--- a/Desktop.Linux/Desktop.Linux.csproj
+++ b/Desktop.Linux/Desktop.Linux.csproj
@@ -55,8 +55,8 @@
-
+
diff --git a/Desktop.Linux/Program.cs b/Desktop.Linux/Program.cs
index b0cdd9899..91fe7af76 100644
--- a/Desktop.Linux/Program.cs
+++ b/Desktop.Linux/Program.cs
@@ -11,6 +11,7 @@
using System.Diagnostics;
using Immense.RemoteControl.Desktop.Startup;
using Remotely.Shared.Utilities;
+using Immense.RemoteControl.Desktop.Shared.Startup;
var version = typeof(Program).Assembly.GetName().Version?.ToString() ?? "0.0.0";
var logger = new FileLogger("Remotely_Desktop", version, "Program.cs");
@@ -62,6 +63,18 @@
orgIdProvider.OrganizationId = orgId;
}
+var result = await provider.UseRemoteControlClient(
+ args,
+ "The remote control client for Remotely.",
+ serverUrl);
+
+if (!result.IsSuccess)
+{
+ logger.LogError(result.Exception, "Failed to remote control client.");
+ Environment.Exit(1);
+}
+
+
Console.WriteLine("Press Ctrl + C to exit.");
var shutdownService = provider.GetRequiredService();
diff --git a/Desktop.Win/Program.cs b/Desktop.Win/Program.cs
index e09e4e1dc..9c821ec58 100644
--- a/Desktop.Win/Program.cs
+++ b/Desktop.Win/Program.cs
@@ -63,7 +63,10 @@
orgIdProvider.OrganizationId = orgId;
}
-var result = await provider.UseRemoteControlClient(args, serverUrl);
+var result = await provider.UseRemoteControlClient(
+ args,
+ "The remote control client for Remotely.",
+ serverUrl);
if (!result.IsSuccess)
{
diff --git a/Remotely.sln b/Remotely.sln
index edbdd4547..5f27f839b 100644
--- a/Remotely.sln
+++ b/Remotely.sln
@@ -71,7 +71,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Immense.RemoteControl.Serve
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Immense.RemoteControl.Shared", "submodules\Immense.RemoteControl\Immense.RemoteControl.Shared\Immense.RemoteControl.Shared.csproj", "{FEF0D431-EB2F-4C08-A125-8DF59AFDA525}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Immense.RemoteControl.Desktop", "..\immybot\submodules\RemoteControl\Immense.RemoteControl.Desktop\Immense.RemoteControl.Desktop.csproj", "{605F98CC-D1DE-4B34-B42D-5738EC4CB0D9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Immense.RemoteControl.Desktop", "submodules\Immense.RemoteControl\Immense.RemoteControl.Desktop\Immense.RemoteControl.Desktop.csproj", "{034984DC-4B47-42E9-8648-F258C40C7926}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -263,18 +263,18 @@ Global
{FEF0D431-EB2F-4C08-A125-8DF59AFDA525}.Release|x64.Build.0 = Release|Any CPU
{FEF0D431-EB2F-4C08-A125-8DF59AFDA525}.Release|x86.ActiveCfg = Release|Any CPU
{FEF0D431-EB2F-4C08-A125-8DF59AFDA525}.Release|x86.Build.0 = Release|Any CPU
- {605F98CC-D1DE-4B34-B42D-5738EC4CB0D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {605F98CC-D1DE-4B34-B42D-5738EC4CB0D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {605F98CC-D1DE-4B34-B42D-5738EC4CB0D9}.Debug|x64.ActiveCfg = Debug|Any CPU
- {605F98CC-D1DE-4B34-B42D-5738EC4CB0D9}.Debug|x64.Build.0 = Debug|Any CPU
- {605F98CC-D1DE-4B34-B42D-5738EC4CB0D9}.Debug|x86.ActiveCfg = Debug|Any CPU
- {605F98CC-D1DE-4B34-B42D-5738EC4CB0D9}.Debug|x86.Build.0 = Debug|Any CPU
- {605F98CC-D1DE-4B34-B42D-5738EC4CB0D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {605F98CC-D1DE-4B34-B42D-5738EC4CB0D9}.Release|Any CPU.Build.0 = Release|Any CPU
- {605F98CC-D1DE-4B34-B42D-5738EC4CB0D9}.Release|x64.ActiveCfg = Release|Any CPU
- {605F98CC-D1DE-4B34-B42D-5738EC4CB0D9}.Release|x64.Build.0 = Release|Any CPU
- {605F98CC-D1DE-4B34-B42D-5738EC4CB0D9}.Release|x86.ActiveCfg = Release|Any CPU
- {605F98CC-D1DE-4B34-B42D-5738EC4CB0D9}.Release|x86.Build.0 = Release|Any CPU
+ {034984DC-4B47-42E9-8648-F258C40C7926}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {034984DC-4B47-42E9-8648-F258C40C7926}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {034984DC-4B47-42E9-8648-F258C40C7926}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {034984DC-4B47-42E9-8648-F258C40C7926}.Debug|x64.Build.0 = Debug|Any CPU
+ {034984DC-4B47-42E9-8648-F258C40C7926}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {034984DC-4B47-42E9-8648-F258C40C7926}.Debug|x86.Build.0 = Debug|Any CPU
+ {034984DC-4B47-42E9-8648-F258C40C7926}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {034984DC-4B47-42E9-8648-F258C40C7926}.Release|Any CPU.Build.0 = Release|Any CPU
+ {034984DC-4B47-42E9-8648-F258C40C7926}.Release|x64.ActiveCfg = Release|Any CPU
+ {034984DC-4B47-42E9-8648-F258C40C7926}.Release|x64.Build.0 = Release|Any CPU
+ {034984DC-4B47-42E9-8648-F258C40C7926}.Release|x86.ActiveCfg = Release|Any CPU
+ {034984DC-4B47-42E9-8648-F258C40C7926}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -289,7 +289,7 @@ Global
{7FA4456D-8695-4990-B20A-B897CF9DF0EF} = {48C738FB-359E-43DB-B338-FD7CB1CCF6A8}
{8CBED18D-64A8-44C0-8433-EE14E93B472A} = {48C738FB-359E-43DB-B338-FD7CB1CCF6A8}
{FEF0D431-EB2F-4C08-A125-8DF59AFDA525} = {48C738FB-359E-43DB-B338-FD7CB1CCF6A8}
- {605F98CC-D1DE-4B34-B42D-5738EC4CB0D9} = {48C738FB-359E-43DB-B338-FD7CB1CCF6A8}
+ {034984DC-4B47-42E9-8648-F258C40C7926} = {48C738FB-359E-43DB-B338-FD7CB1CCF6A8}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {EAE10B28-119B-437C-9E68-06F0EE3F968A}
diff --git a/Server/Services/RcImplementations/ViewerPageDataProvider.cs b/Server/Services/RcImplementations/ViewerPageDataProvider.cs
index e8ce62fb0..fe1dd004d 100644
--- a/Server/Services/RcImplementations/ViewerPageDataProvider.cs
+++ b/Server/Services/RcImplementations/ViewerPageDataProvider.cs
@@ -1,10 +1,12 @@
using Immense.RemoteControl.Server.Abstractions;
+using Immense.RemoteControl.Server.Areas.RemoteControl.Pages;
using Immense.RemoteControl.Server.Models;
using Microsoft.AspNetCore.Mvc.RazorPages;
using Org.BouncyCastle.Ocsp;
using Remotely.Shared.Enums;
using Remotely.Shared.Models;
using System;
+using System.Threading.Tasks;
namespace Remotely.Server.Services.RcImplementations
{
@@ -19,43 +21,66 @@ public ViewerPageDataProvider(IDataService dataService, IApplicationConfig appCo
_appConfig = appConfig;
}
- public string GetUserDisplayName(PageModel pageModel)
+ public Task GetUserDisplayName(PageModel pageModel)
{
if (string.IsNullOrWhiteSpace(pageModel?.User?.Identity?.Name))
{
- return string.Empty;
+ return Task.FromResult(string.Empty);
}
var user = _dataService.GetUserByNameWithOrg(pageModel.User.Identity.Name);
if (user is null)
{
- return string.Empty;
+ return Task.FromResult(string.Empty);
}
- return user.UserOptions?.DisplayName ?? user.UserName ?? string.Empty;
+ var displayName = user.UserOptions?.DisplayName ?? user.UserName ?? string.Empty;
+ return Task.FromResult(displayName);
}
- public ViewerPageTheme GetTheme(PageModel pageModel)
+ public Task GetTheme(PageModel pageModel)
{
if (pageModel.User.Identity.IsAuthenticated)
{
var user = _dataService.GetUserByNameWithOrg(pageModel.User.Identity.Name);
- return user.UserOptions.Theme switch
+ var userTheme = user.UserOptions.Theme switch
{
Theme.Light => ViewerPageTheme.Light,
Theme.Dark => ViewerPageTheme.Dark,
_ => ViewerPageTheme.Dark
};
+ return Task.FromResult(userTheme);
}
- return _appConfig.Theme switch
+ var appTheme = _appConfig.Theme switch
{
Theme.Light => ViewerPageTheme.Light,
Theme.Dark => ViewerPageTheme.Dark,
_ => ViewerPageTheme.Dark
};
+ return Task.FromResult(appTheme);
+ }
+
+ public Task GetPageTitle(PageModel pageModel)
+ {
+ return Task.FromResult("Remotely Remote Control");
+ }
+
+ public Task GetProductName(PageModel pageModel)
+ {
+ return Task.FromResult("Remotely");
+ }
+
+ public Task GetProductSubtitle(PageModel pageModel)
+ {
+ return Task.FromResult("Remote Control");
+ }
+
+ public Task GetPageDescription(ViewerModel viewerModel)
+ {
+ return Task.FromResult("Open-source remote support tools.");
}
}
}
diff --git a/submodules/Immense.RemoteControl b/submodules/Immense.RemoteControl
index dced66ccf..9b6b6510c 160000
--- a/submodules/Immense.RemoteControl
+++ b/submodules/Immense.RemoteControl
@@ -1 +1 @@
-Subproject commit dced66ccf956d3d2f84da1fb1045919eecf6024d
+Subproject commit 9b6b6510c3426acf2d3c3afa749a4d3042191b51