Merge pull request #148 from janmarektelc/bugfix-118-release-camera-r…

…esources Camera resources relese
Redth · Sep 12, 2024 · 57eef38 · 57eef38
2 parents 631825a + 19af047
commit 57eef38
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 5 deletions.
diff --git a/ZXing.Net.MAUI.Controls/Controls/CameraBarcodeReaderView.cs b/ZXing.Net.MAUI.Controls/Controls/CameraBarcodeReaderView.cs
@@ -15,7 +15,12 @@ public partial class CameraBarcodeReaderView : View, ICameraBarcodeReaderView
 		public event EventHandler<BarcodeDetectionEventArgs> BarcodesDetected;
 		public event EventHandler<CameraFrameBufferEventArgs> FrameReady;
 
-		void ICameraBarcodeReaderView.BarcodesDetected(BarcodeDetectionEventArgs e) => BarcodesDetected?.Invoke(this, e);
+        public CameraBarcodeReaderView()
+        {
+			Unloaded += (s, e) => Cleanup();    
+        }
+
+        void ICameraBarcodeReaderView.BarcodesDetected(BarcodeDetectionEventArgs e) => BarcodesDetected?.Invoke(this, e);
 		void ICameraFrameAnalyzer.FrameReady(ZXing.Net.Maui.CameraFrameBufferEventArgs e) => FrameReady?.Invoke(this, e);
 
 		public static readonly BindableProperty OptionsProperty =
@@ -65,5 +70,8 @@ public void Focus(Point point)
 
 		CameraBarcodeReaderViewHandler StrongHandler
 			=> Handler as CameraBarcodeReaderViewHandler;
-	}
+
+        private void Cleanup() 
+			=> Handler?.DisconnectHandler();
+    }
 }
diff --git a/ZXing.Net.MAUI.Controls/Controls/CameraView.cs b/ZXing.Net.MAUI.Controls/Controls/CameraView.cs
@@ -9,7 +9,12 @@ public partial class CameraView : View, ICameraView
 	{
 		public event EventHandler<CameraFrameBufferEventArgs> FrameReady;
 
-		void ICameraFrameAnalyzer.FrameReady(CameraFrameBufferEventArgs e)
+        public CameraView()
+        {
+			Unloaded += (s, e) => Cleanup();
+        }
+
+        void ICameraFrameAnalyzer.FrameReady(CameraFrameBufferEventArgs e)
 			=> FrameReady?.Invoke(this, e);
 
 		public static readonly BindableProperty IsTorchOnProperty =
@@ -38,5 +43,8 @@ public void Focus(Point point)
 
 		CameraViewHandler StrongHandler 
 			=> Handler as CameraViewHandler;
-	}
+
+        private void Cleanup()
+			=> Handler?.DisconnectHandler();
+    }
 }
diff --git a/ZXing.Net.MAUI/CameraBarcodeReaderViewHandler.cs b/ZXing.Net.MAUI/CameraBarcodeReaderViewHandler.cs
@@ -67,6 +67,7 @@ protected override void DisconnectHandler(NativePlatformCameraPreviewView native
                 cameraManager.FrameReady -= CameraManager_FrameReady;
 
                 cameraManager.Disconnect();
+                cameraManager.Dispose();
             }
 
             base.DisconnectHandler(nativeView);

diff --git a/ZXing.Net.MAUI/CameraViewHandler.cs b/ZXing.Net.MAUI/CameraViewHandler.cs
@@ -63,7 +63,8 @@ protected override void DisconnectHandler(NativePlatformCameraPreviewView native
 			{
 				cameraManager.FrameReady -= CameraManager_FrameReady;
 
-				cameraManager.Disconnect();
+			  cameraManager.Disconnect();
+			  cameraManager.Dispose();
 			}
 
 			base.DisconnectHandler(nativeView);

diff --git a/ZXing.Net.MAUI/Platforms/Android/CameraManager.android.cs b/ZXing.Net.MAUI/Platforms/Android/CameraManager.android.cs
@@ -127,6 +127,8 @@ public void AutoFocus()
 
 		public void Dispose()
 		{
+			cameraProvider?.Shutdown();
+
 			cameraExecutor?.Shutdown();
 			cameraExecutor?.Dispose();
 		}