Merge remote-tracking branch 'origin/master' into HEAD

1 files changed, 11 insertions, 35 deletions

diff --git a/MediaBrowser.Controller/IServerApplicationHost.cs b/MediaBrowser.Controller/IServerApplicationHost.cs
index 6a65a8e47..8f8cf75a6 100644
--- a/MediaBrowser.Controller/IServerApplicationHost.cs
+++ b/MediaBrowser.Controller/IServerApplicationHost.cs
@@ -1,6 +1,7 @@
+#nullable disable
+
 #pragma warning disable CS1591
 
-using System;
 using System.Collections.Generic;
 using System.Net;
 using MediaBrowser.Common;
@@ -14,8 +15,6 @@ namespace MediaBrowser.Controller
     /// </summary>
     public interface IServerApplicationHost : IApplicationHost
     {
-        event EventHandler HasUpdateAvailableChanged;
-
         bool CoreStartupHasCompleted { get; }
 
         bool CanLaunchWebBrowser { get; }
@@ -38,61 +37,47 @@ namespace MediaBrowser.Controller
         bool ListenWithHttps { get; }
 
         /// <summary>
-        /// Gets a value indicating whether this instance has update available.
-        /// </summary>
-        /// <value><c>true</c> if this instance has update available; otherwise, <c>false</c>.</value>
-        bool HasUpdateAvailable { get; }
-
-        /// <summary>
         /// Gets the name of the friendly.
         /// </summary>
         /// <value>The name of the friendly.</value>
         string FriendlyName { get; }
 
         /// <summary>
-        /// Gets the configured published server url.
-        /// </summary>
-        string PublishedServerUrl { get; }
-
-        /// <summary>
         /// Gets the system info.
         /// </summary>
-        /// <param name="source">The originator of the request.</param>
+        /// <param name="request">The HTTP request.</param>
         /// <returns>SystemInfo.</returns>
-        SystemInfo GetSystemInfo(IPAddress source);
+        SystemInfo GetSystemInfo(HttpRequest request);
 
-        PublicSystemInfo GetPublicSystemInfo(IPAddress address);
+        PublicSystemInfo GetPublicSystemInfo(HttpRequest request);
 
         /// <summary>
         /// Gets a URL specific for the request.
         /// </summary>
         /// <param name="request">The <see cref="HttpRequest"/> instance.</param>
-        /// <param name="port">Optional port number.</param>
         /// <returns>An accessible URL.</returns>
-        string GetSmartApiUrl(HttpRequest request, int? port = null);
+        string GetSmartApiUrl(HttpRequest request);
 
         /// <summary>
         /// Gets a URL specific for the request.
         /// </summary>
         /// <param name="remoteAddr">The remote <see cref="IPAddress"/> of the connection.</param>
-        /// <param name="port">Optional port number.</param>
         /// <returns>An accessible URL.</returns>
-        string GetSmartApiUrl(IPAddress remoteAddr, int? port = null);
+        string GetSmartApiUrl(IPAddress remoteAddr);
 
         /// <summary>
         /// Gets a URL specific for the request.
         /// </summary>
         /// <param name="hostname">The hostname used in the connection.</param>
-        /// <param name="port">Optional port number.</param>
         /// <returns>An accessible URL.</returns>
-        string GetSmartApiUrl(string hostname, int? port = null);
+        string GetSmartApiUrl(string hostname);
 
         /// <summary>
-        /// Gets a localhost URL that can be used to access the API using the loop-back IP address.
-        /// over HTTP (not HTTPS).
+        /// Gets an URL that can be used to access the API over LAN.
         /// </summary>
+        /// <param name="allowHttps">A value indicating whether to allow HTTPS.</param>
         /// <returns>The API URL.</returns>
-        string GetLoopbackHttpApiUrl();
+        string GetApiUrlForLocalAccess(bool allowHttps = true);
 
         /// <summary>
         /// Gets a local (LAN) URL that can be used to access the API.
@@ -110,15 +95,6 @@ namespace MediaBrowser.Controller
         /// <returns>The API URL.</returns>
         string GetLocalApiUrl(string hostname, string scheme = null, int? port = null);
 
-        /// <summary>
-        /// Open a URL in an external browser window.
-        /// </summary>
-        /// <param name="url">The URL to open.</param>
-        /// <exception cref="NotSupportedException"><see cref="CanLaunchWebBrowser"/> is false.</exception>
-        void LaunchUrl(string url);
-
-        IEnumerable<WakeOnLanInfo> GetWakeOnLanInfo();
-
         string ExpandVirtualPath(string path);
 
         string ReverseVirtualPath(string path);