Navaron Bracke

fix result(nil) being called after catch block

@@ -163,12 +163,12 @@ public class MobileScannerPlugin: NSObject, FlutterPlugin { @@ -163,12 +163,12 @@ public class MobileScannerPlugin: NSObject, FlutterPlugin {
163 private func toggleTorch(_ call: FlutterMethodCall, _ result: @escaping FlutterResult) { 163 private func toggleTorch(_ call: FlutterMethodCall, _ result: @escaping FlutterResult) {
164 do { 164 do {
165 try mobileScanner.toggleTorch(call.arguments as? Int == 1 ? .on : .off) 165 try mobileScanner.toggleTorch(call.arguments as? Int == 1 ? .on : .off)
  166 + result(nil)
166 } catch { 167 } catch {
167 result(FlutterError(code: "MobileScanner", 168 result(FlutterError(code: "MobileScanner",
168 message: "Called toggleTorch() while stopped!", 169 message: "Called toggleTorch() while stopped!",
169 details: nil)) 170 details: nil))
170 } 171 }
171 - result(nil)  
172 } 172 }
173 173
174 /// Toggles the zoomScale 174 /// Toggles the zoomScale
@@ -182,6 +182,7 @@ public class MobileScannerPlugin: NSObject, FlutterPlugin { @@ -182,6 +182,7 @@ public class MobileScannerPlugin: NSObject, FlutterPlugin {
182 } 182 }
183 do { 183 do {
184 try mobileScanner.setScale(scale!) 184 try mobileScanner.setScale(scale!)
  185 + result(nil)
185 } catch MobileScannerError.zoomWhenStopped { 186 } catch MobileScannerError.zoomWhenStopped {
186 result(FlutterError(code: "MobileScanner", 187 result(FlutterError(code: "MobileScanner",
187 message: "Called setScale() while stopped!", 188 message: "Called setScale() while stopped!",
@@ -195,13 +196,13 @@ public class MobileScannerPlugin: NSObject, FlutterPlugin { @@ -195,13 +196,13 @@ public class MobileScannerPlugin: NSObject, FlutterPlugin {
195 message: "Error while zooming.", 196 message: "Error while zooming.",
196 details: nil)) 197 details: nil))
197 } 198 }
198 - result(nil)  
199 } 199 }
200 200
201 /// Reset the zoomScale 201 /// Reset the zoomScale
202 private func resetScale(_ call: FlutterMethodCall, _ result: @escaping FlutterResult) { 202 private func resetScale(_ call: FlutterMethodCall, _ result: @escaping FlutterResult) {
203 do { 203 do {
204 try mobileScanner.resetScale() 204 try mobileScanner.resetScale()
  205 + result(nil)
205 } catch MobileScannerError.zoomWhenStopped { 206 } catch MobileScannerError.zoomWhenStopped {
206 result(FlutterError(code: "MobileScanner", 207 result(FlutterError(code: "MobileScanner",
207 message: "Called resetScale() while stopped!", 208 message: "Called resetScale() while stopped!",
@@ -215,7 +216,6 @@ public class MobileScannerPlugin: NSObject, FlutterPlugin { @@ -215,7 +216,6 @@ public class MobileScannerPlugin: NSObject, FlutterPlugin {
215 message: "Error while zooming.", 216 message: "Error while zooming.",
216 details: nil)) 217 details: nil))
217 } 218 }
218 - result(nil)  
219 } 219 }
220 220
221 /// Toggles the torch 221 /// Toggles the torch