michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1245 from Bond-009/updateevent

Browse Source 
Remove unused event
This commit is contained in:
Anthony Lavado 2019-04-18 14:16:48 -04:00 committed by GitHub
commit 7bea62adbf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs
View File

@ -83,8 +83,6 @@ namespace Emby.Server.Implementations.Activity
_deviceManager.CameraImageUploaded += OnCameraImageUploaded; _deviceManager.CameraImageUploaded += OnCameraImageUploaded;
_appHost.ApplicationUpdated += OnApplicationUpdated;
return Task.CompletedTask; return Task.CompletedTask;
} }
@ -275,16 +273,6 @@ namespace Emby.Server.Implementations.Activity
}); });
} }
private void OnApplicationUpdated(object sender, GenericEventArgs<PackageVersionInfo> e)
{
CreateLogEntry(new ActivityLogEntry
{
Name = string.Format(_localization.GetLocalizedString("MessageApplicationUpdatedTo"), e.Argument.versionStr),
Type = NotificationType.ApplicationUpdateInstalled.ToString(),
Overview = e.Argument.description
});
}
private void OnUserPolicyUpdated(object sender, GenericEventArgs<User> e) private void OnUserPolicyUpdated(object sender, GenericEventArgs<User> e)
{ {
CreateLogEntry(new ActivityLogEntry CreateLogEntry(new ActivityLogEntry
@ -460,8 +448,6 @@ namespace Emby.Server.Implementations.Activity
_userManager.UserLockedOut -= OnUserLockedOut; _userManager.UserLockedOut -= OnUserLockedOut;
_deviceManager.CameraImageUploaded -= OnCameraImageUploaded; _deviceManager.CameraImageUploaded -= OnCameraImageUploaded;
_appHost.ApplicationUpdated -= OnApplicationUpdated;
} }
/// <summary> /// <summary>

21
Emby.Server.Implementations/ApplicationHost.cs
View File

@ -154,11 +154,6 @@ namespace Emby.Server.Implementations
/// </summary> /// </summary>
public event EventHandler HasPendingRestartChanged; public event EventHandler HasPendingRestartChanged;
/// <summary>
/// Occurs when [application updated].
/// </summary>
public event EventHandler<GenericEventArgs<PackageVersionInfo>> ApplicationUpdated;
/// <summary> /// <summary>
/// Gets a value indicating whether this instance has changes that require the entire application to restart. /// Gets a value indicating whether this instance has changes that require the entire application to restart.
/// </summary> /// </summary>
@ -1392,9 +1387,9 @@ namespace Emby.Server.Implementations
public async Task<SystemInfo> GetSystemInfo(CancellationToken cancellationToken) public async Task<SystemInfo> GetSystemInfo(CancellationToken cancellationToken)
{ {
var localAddress = await GetLocalApiUrl(cancellationToken).ConfigureAwait(false); var localAddress = await GetLocalApiUrl(cancellationToken).ConfigureAwait(false);
string wanAddress; string wanAddress;
if (string.IsNullOrEmpty(ServerConfigurationManager.Configuration.WanDdns)) if (string.IsNullOrEmpty(ServerConfigurationManager.Configuration.WanDdns))
{ {
wanAddress = await GetWanApiUrlFromExternal(cancellationToken).ConfigureAwait(false); wanAddress = await GetWanApiUrlFromExternal(cancellationToken).ConfigureAwait(false);
@ -1451,10 +1446,10 @@ namespace Emby.Server.Implementations
public async Task<PublicSystemInfo> GetPublicSystemInfo(CancellationToken cancellationToken) public async Task<PublicSystemInfo> GetPublicSystemInfo(CancellationToken cancellationToken)
{ {
var localAddress = await GetLocalApiUrl(cancellationToken).ConfigureAwait(false); var localAddress = await GetLocalApiUrl(cancellationToken).ConfigureAwait(false);
string wanAddress; string wanAddress;
if (string.IsNullOrEmpty(ServerConfigurationManager.Configuration.WanDdns)) if (string.IsNullOrEmpty(ServerConfigurationManager.Configuration.WanDdns))
{ {
wanAddress = await GetWanApiUrlFromExternal(cancellationToken).ConfigureAwait(false); wanAddress = await GetWanApiUrlFromExternal(cancellationToken).ConfigureAwait(false);
@ -1570,9 +1565,9 @@ namespace Emby.Server.Implementations
} }
return string.Format("http://{0}:{1}", return string.Format("http://{0}:{1}",
host, host,
ServerConfigurationManager.Configuration.PublicPort.ToString(CultureInfo.InvariantCulture)); ServerConfigurationManager.Configuration.PublicPort.ToString(CultureInfo.InvariantCulture));
} }
public Task<List<IpAddressInfo>> GetLocalIpAddresses(CancellationToken cancellationToken) public Task<List<IpAddressInfo>> GetLocalIpAddresses(CancellationToken cancellationToken)
{ {
return GetLocalIpAddressesInternal(true, 0, cancellationToken); return GetLocalIpAddressesInternal(true, 0, cancellationToken);

5
MediaBrowser.Common/IApplicationHost.cs
View File

@ -25,11 +25,6 @@ namespace MediaBrowser.Common
/// <value>The device identifier.</value> /// <value>The device identifier.</value>
string SystemId { get; } string SystemId { get; }
/// <summary>
/// Occurs when [application updated].
/// </summary>
event EventHandler<GenericEventArgs<PackageVersionInfo>> ApplicationUpdated;
/// <summary> /// <summary>
/// Gets or sets a value indicating whether this instance has pending kernel reload. /// Gets or sets a value indicating whether this instance has pending kernel reload.
/// </summary> /// </summary>