Merge pull request #1393 from juliansteenbakker/hotfix/hot-reload

fix: hot reload

@@ -440,12 +440,14 @@ class MobileScanner(
     /**
     /**
      * Pause barcode scanning.
      * Pause barcode scanning.
      */
      */
-    fun pause() {
+    fun pause(force: Boolean = false) {
+        if (!force) {
             if (isPaused) {
             if (isPaused) {
                 throw AlreadyPaused()
                 throw AlreadyPaused()
             } else if (isStopped()) {
             } else if (isStopped()) {
                 throw AlreadyStopped()
                 throw AlreadyStopped()
             }
             }
+        }
 
 
         pauseCamera()
         pauseCamera()
     }
     }
@@ -453,10 +455,12 @@ class MobileScanner(
     /**
     /**
      * Stop barcode scanning.
      * Stop barcode scanning.
      */
      */
-    fun stop() {
+    fun stop(force: Boolean = false) {
+        if (!force) {
             if (!isPaused && isStopped()) {
             if (!isPaused && isStopped()) {
                 throw AlreadyStopped()
                 throw AlreadyStopped()
             }
             }
+        }
 
 
         releaseCamera()
         releaseCamera()
     }
     }

@@ -118,8 +118,8 @@ class MobileScannerHandler(
                     }
                     }
                 })
                 })
             "start" -> start(call, result)
             "start" -> start(call, result)
-            "pause" -> pause(result)
-            "stop" -> stop(result)
+            "pause" -> pause(call, result)
+            "stop" -> stop(call, result)
             "toggleTorch" -> toggleTorch(result)
             "toggleTorch" -> toggleTorch(result)
             "analyzeImage" -> analyzeImage(call, result)
             "analyzeImage" -> analyzeImage(call, result)
             "setScale" -> setScale(call, result)
             "setScale" -> setScale(call, result)
@@ -214,9 +214,10 @@ class MobileScannerHandler(
         )
         )
     }
     }
 
 
-    private fun pause(result: MethodChannel.Result) {
+    private fun pause(call: MethodCall, result: MethodChannel.Result) {
+        val force: Boolean = call.argument<Boolean>("force") ?: false
         try {
         try {
-            mobileScanner!!.pause()
+            mobileScanner!!.pause(force)
             result.success(null)
             result.success(null)
         } catch (e: Exception) {
         } catch (e: Exception) {
             when (e) {
             when (e) {
@@ -226,9 +227,10 @@ class MobileScannerHandler(
         }
         }
     }
     }
 
 
-    private fun stop(result: MethodChannel.Result) {
+    private fun stop(call: MethodCall, result: MethodChannel.Result) {
+        val force: Boolean = call.argument<Boolean>("force") ?: false
         try {
         try {
-            mobileScanner!!.stop()
+            mobileScanner!!.stop(force)
             result.success(null)
             result.success(null)
         } catch (e: AlreadyStopped) {
         } catch (e: AlreadyStopped) {
             result.success(null)
             result.success(null)

@@ -59,6 +59,7 @@
       ignoresPersistentStateOnLaunch = "NO"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       debugServiceExtension = "internal"
+      enableGPUValidationMode = "1"
       allowLocationSimulation = "YES">
       allowLocationSimulation = "YES">
       <BuildableProductRunnable
       <BuildableProductRunnable
          runnableDebuggingMode = "0">
          runnableDebuggingMode = "0">

@@ -303,18 +303,20 @@ public class MobileScanner: NSObject, AVCaptureVideoDataOutputSampleBufferDelega
     }
     }
 
 
     /// Pause scanning for barcodes
     /// Pause scanning for barcodes
-    func pause() throws {
+    func pause(force: Bool = false) throws {
+        if (!force) {
             if (paused) {
             if (paused) {
                 throw MobileScannerError.alreadyPaused
                 throw MobileScannerError.alreadyPaused
             } else if (stopped) {
             } else if (stopped) {
                 throw MobileScannerError.alreadyStopped
                 throw MobileScannerError.alreadyStopped
             }
             }
+        }
         releaseCamera()
         releaseCamera()
     }
     }
 
 
     /// Stop scanning for barcodes
     /// Stop scanning for barcodes
-    func stop() throws {
-        if (!paused && stopped) {
+    func stop(force: Bool = false) throws {
+        if (!paused && stopped && !force) {
             throw MobileScannerError.alreadyStopped
             throw MobileScannerError.alreadyStopped
         }
         }
         releaseCamera()
         releaseCamera()
@@ -343,7 +345,9 @@ public class MobileScanner: NSObject, AVCaptureVideoDataOutputSampleBufferDelega
     }
     }
 
 
     private func releaseTexture() {
     private func releaseTexture() {
+        if (textureId != nil) {
             registry?.unregisterTexture(textureId)
             registry?.unregisterTexture(textureId)
+        }
         textureId = nil
         textureId = nil
         scanner = nil
         scanner = nil
     }
     }

@@ -106,9 +106,9 @@ public class MobileScannerPlugin: NSObject, FlutterPlugin {
         case "start":
         case "start":
             start(call, result)
             start(call, result)
         case "pause":
         case "pause":
-            pause(result)
+            pause(call, result)
         case "stop":
         case "stop":
-            stop(result)
+            stop(call, result)
         case "toggleTorch":
         case "toggleTorch":
             toggleTorch(result)
             toggleTorch(result)
         case "analyzeImage":
         case "analyzeImage":
@@ -170,17 +170,19 @@ public class MobileScannerPlugin: NSObject, FlutterPlugin {
     }
     }
     
     
     /// Stops the mobileScanner without closing the texture.
     /// Stops the mobileScanner without closing the texture.
-    private func pause(_ result: @escaping FlutterResult) {
+    private func pause(_ call: FlutterMethodCall, _ result: @escaping FlutterResult) {
+        let force = (call.arguments as? Bool) ?? false
         do {
         do {
-            try mobileScanner.pause()
+            try mobileScanner.pause(force: force)
         } catch {}
         } catch {}
         result(nil)
         result(nil)
     }
     }
 
 
     /// Stops the mobileScanner and closes the texture.
     /// Stops the mobileScanner and closes the texture.
-    private func stop(_ result: @escaping FlutterResult) {
+    private func stop(_ call: FlutterMethodCall, _ result: @escaping FlutterResult) {
+        let force = (call.arguments as? Bool) ?? false
         do {
         do {
-            try mobileScanner.stop()
+            try mobileScanner.stop(force: force)
         } catch {}
         } catch {}
         result(nil)
         result(nil)
     }
     }

@@ -292,26 +292,26 @@ class MethodChannelMobileScanner extends MobileScannerPlatform {
   }
   }
 
 
   @override
   @override
-  Future<void> stop() async {
-    if (_textureId == null) {
+  Future<void> stop({bool force = false}) async {
+    if (_textureId == null && !force) {
       return;
       return;
     }
     }
 
 
     _textureId = null;
     _textureId = null;
     _pausing = false;
     _pausing = false;
 
 
-    await methodChannel.invokeMethod<void>('stop');
+    await methodChannel.invokeMethod<void>('stop', {'force': force});
   }
   }
 
 
   @override
   @override
-  Future<void> pause() async {
+  Future<void> pause({bool force = false}) async {
     if (_pausing) {
     if (_pausing) {
       return;
       return;
     }
     }
 
 
     _pausing = true;
     _pausing = true;
 
 
-    await methodChannel.invokeMethod<void>('pause');
+    await methodChannel.invokeMethod<void>('pause', {'force': force});
   }
   }
 
 
   @override
   @override

 import 'dart:async';
 import 'dart:async';
 
 
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/material.dart';
+import 'package:mobile_scanner/src/method_channel/mobile_scanner_method_channel.dart';
 import 'package:mobile_scanner/src/mobile_scanner_controller.dart';
 import 'package:mobile_scanner/src/mobile_scanner_controller.dart';
 import 'package:mobile_scanner/src/mobile_scanner_exception.dart';
 import 'package:mobile_scanner/src/mobile_scanner_exception.dart';
 import 'package:mobile_scanner/src/mobile_scanner_platform_interface.dart';
 import 'package:mobile_scanner/src/mobile_scanner_platform_interface.dart';
@@ -257,19 +259,22 @@ class _MobileScannerState extends State<MobileScanner>
   StreamSubscription? _subscription;
   StreamSubscription? _subscription;
 
 
   Future<void> initMobileScanner() async {
   Future<void> initMobileScanner() async {
-    // TODO: This will be fixed in another PR
     // If debug mode is enabled, stop the controller first before starting it.
     // If debug mode is enabled, stop the controller first before starting it.
     // If a hot-restart is initiated, the controller won't be stopped, and because
     // If a hot-restart is initiated, the controller won't be stopped, and because
     // there is no way of knowing if a hot-restart has happened, we must assume
     // there is no way of knowing if a hot-restart has happened, we must assume
-    // every start is a hot-restart.
-    // if (kDebugMode) {
-    //   try {
-    //     await controller.stop();
-    //   } catch (e) {
-    //     // Don't do anything if the controller is already stopped.
-    //     debugPrint('$e');
-    //   }
-    // }
+    // every start is a hot-restart. Related issue:
+    // https://github.com/flutter/flutter/issues/10437
+    if (kDebugMode) {
+      if (MobileScannerPlatform.instance
+          case final MethodChannelMobileScanner implementation) {
+        try {
+          await implementation.stop(force: true);
+        } catch (e) {
+          // Don't do anything if the controller is already stopped.
+          debugPrint('$e');
+        }
+      }
+    }
 
 
     if (widget.controller == null) {
     if (widget.controller == null) {
       WidgetsBinding.instance.addObserver(this);
       WidgetsBinding.instance.addObserver(this);

@@ -76,9 +76,9 @@ public class MobileScannerPlugin: NSObject, FlutterPlugin, FlutterStreamHandler,
         case "resetScale":
         case "resetScale":
             resetScale(call, result)
             resetScale(call, result)
         case "pause":
         case "pause":
-            pause(result)
+            pause(call, result)
         case "stop":
         case "stop":
-            stop(result)
+            stop(call, result)
         case "updateScanWindow":
         case "updateScanWindow":
             updateScanWindow(call, result)
             updateScanWindow(call, result)
         case "analyzeImage":
         case "analyzeImage":
@@ -448,19 +448,24 @@ public class MobileScannerPlugin: NSObject, FlutterPlugin, FlutterStreamHandler,
         result(nil)
         result(nil)
     }
     }
 
 
-    func pause(_ result: FlutterResult) {
+    func pause(_ call: FlutterMethodCall, _ result: FlutterResult) {
+        let force = (call.arguments as? Bool) ?? false
+        if (!force) {
             if (paused || stopped) {
             if (paused || stopped) {
                 result(nil)
                 result(nil)
 
 
                 return
                 return
             }
             }
+        }
+
         releaseCamera()
         releaseCamera()
 
 
         result(nil)
         result(nil)
     }
     }
 
 
-    func stop(_ result: FlutterResult) {
-        if (!paused && stopped) {
+    func stop(_ call: FlutterMethodCall, _ result: FlutterResult) {
+        let force = (call.arguments as? Bool) ?? false
+        if (!paused && stopped && !force) {
             result(nil)
             result(nil)
 
 
             return
             return
@@ -491,6 +496,10 @@ public class MobileScannerPlugin: NSObject, FlutterPlugin, FlutterStreamHandler,
     }
     }
 
 
     private func releaseTexture() {
     private func releaseTexture() {
+        if (textureId == nil) {
+            return
+        }
+
         registry.unregisterTexture(textureId)
         registry.unregisterTexture(textureId)
         textureId = nil
         textureId = nil
     }
     }