Memory leak on TintedImageBehavior fix (#1625)

CommunityToolkit · Feb 14, 2024 · cc62c6f · cc62c6f
1 parent de4eecc
commit cc62c6f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/...tyToolkit.Maui/Behaviors/PlatformBehaviors/IconTintColor/IconTintColorBehavior.android.cs b/...tyToolkit.Maui/Behaviors/PlatformBehaviors/IconTintColor/IconTintColorBehavior.android.cs
@@ -16,6 +16,7 @@ protected override void OnAttachedTo(View bindable, AView platformView)
 	{
 		ApplyTintColor(bindable, platformView);
 
+		bindable.PropertyChanged += OnElementPropertyChanged;
 		this.PropertyChanged += (s, e) =>
 		{
 			if (e.PropertyName == TintColorProperty.PropertyName)
@@ -26,13 +27,15 @@ protected override void OnAttachedTo(View bindable, AView platformView)
 	}
 
 	/// <inheritdoc/>
-	protected override void OnDetachedFrom(View bindable, AView platformView) =>
+	protected override void OnDetachedFrom(View bindable, AView platformView)
+	{
 		ClearTintColor(bindable, platformView);
+		bindable.PropertyChanged -= OnElementPropertyChanged;
+	}
 
 	void ApplyTintColor(View element, AView control)
 	{
 		var color = TintColor;
-		element.PropertyChanged += OnElementPropertyChanged;
 
 		switch (control)
 		{
@@ -98,7 +101,6 @@ void OnElementPropertyChanged(object? sender, PropertyChangedEventArgs args)
 
 	void ClearTintColor(View element, AView control)
 	{
-		element.PropertyChanged -= OnElementPropertyChanged;
 		switch (control)
 		{
 			case ImageView image:

diff --git a/...ityToolkit.Maui/Behaviors/PlatformBehaviors/IconTintColor/IconTintColorBehavior.macios.cs b/...ityToolkit.Maui/Behaviors/PlatformBehaviors/IconTintColor/IconTintColorBehavior.macios.cs
@@ -39,12 +39,14 @@ void OnElementPropertyChanged(object? sender, PropertyChangedEventArgs e)
 	}
 
 	/// <inheritdoc/>
-	protected override void OnDetachedFrom(View bindable, UIView platformView) =>
+	protected override void OnDetachedFrom(View bindable, UIView platformView)
+	{
+		bindable.PropertyChanged -= OnElementPropertyChanged;
 		ClearTintColor(platformView, bindable);
+	}
 
 	void ClearTintColor(UIView platformView, View element)
 	{
-		element.PropertyChanged -= OnElementPropertyChanged;
 		switch (platformView)
 		{
 			case UIImageView imageView: