Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Project/ph1 net8 merge #555

Merged
merged 3 commits into from
Jul 15, 2024
+7 −35
Merged

Project/ph1 net8 merge #555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c6a2708
Added possibility to call ReloadMapping from inheritants (#551)
pavel-leonenko May 31, 2024
ef82b6d
Removed excess finalizers (according to https://vkontech.com/the-disp…
pavel-leonenko Jun 21, 2024
eb4f4b0
Merge branch 'project/PH1' into project/PH1-net8
Jul 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Softeq.XToolkit.Bindings.Droid/Bindable/BindableRecyclerViewAdapter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ protected override void Dispose(bool disposing)
_subscription?.Dispose();
}

private void ReloadMapping()
protected void ReloadMapping()
{
_flatMapping.Clear();

Expand Down
2 changes: 1 addition & 1 deletion Softeq.XToolkit.Common/Commands/IAsyncCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public interface IAsyncCommand : ICommand
/// If the command does not require data to be passed, this object can be set to null.
/// </param>
/// <returns>The Task to execute.</returns>
Task ExecuteAsync(object parameter);
Task ExecuteAsync(object? parameter);
}

/// <summary>
Expand Down
22 changes: 4 additions & 18 deletions Softeq.XToolkit.PushNotifications.Droid/Services/DroidPushNotificationsConsumer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,6 @@ public DroidPushNotificationsConsumer(
});
}

~DroidPushNotificationsConsumer()
{
Dispose(false);
}

/// <inheritdoc />
public bool TryHandleNotification(RemoteMessage message)
{
Expand Down Expand Up @@ -101,8 +96,10 @@ public Task OnUnregisterFromPushNotifications()

public void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);
Execute.BeginOnUIThread(() =>
{
ProcessLifecycleOwner.Get().Lifecycle.RemoveObserver(_lifecycleObserver);
});
}

private void OnMessageReceivedInternal(PushNotificationModel parsedNotification, bool inForeground)
Expand All @@ -116,16 +113,5 @@ private void OnMessageReceivedInternal(PushNotificationModel parsedNotification,
_pushNotificationsHandler.HandlePushNotificationReceived(parsedNotification, inForeground);
}
}

private void Dispose(bool isDisposing)
{
if (isDisposing)
{
Execute.BeginOnUIThread(() =>
{
ProcessLifecycleOwner.Get().Lifecycle.RemoveObserver(_lifecycleObserver);
});
}
}
}
}
16 changes: 1 addition & 15 deletions Softeq.XToolkit.WhiteLabel.Essentials/ImagePicker/ImagePickerResult.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,21 +49,7 @@ public string? Extension

public void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);
}

~ImagePickerResult()
{
Dispose(false);
}

protected void Dispose(bool disposing)
{
if (disposing)
{
ImageObject?.Dispose();
}
ImageObject?.Dispose();
}

/// <summary>
Expand Down
Loading