Merge pull request #307 from timkim/master

Fix for iOS reverse camera button crash and Android plugin install
phonegap · Sep 5, 2016 · d775cc7 · d775cc7
2 parents 2af6324 + 5e58c0a
commit d775cc7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/plugin.xml b/plugin.xml
@@ -88,7 +88,7 @@
             <uses-permission android:name="android.permission.CAMERA" />
             <uses-permission android:name="android.permission.FLASHLIGHT" />
             <!-- Not required to allow users to work around this -->
-            <uses-feature android:name="android.hardware.camera" android:required="false" />
+            <uses-feature android:name="android.hardware.camera" android:required="true" />
         </config-file>
 
         <framework src="src/android/barcodescanner.gradle" custom="true" type="gradleReference"/>

diff --git a/src/ios/CDVBarcodeScanner.mm b/src/ios/CDVBarcodeScanner.mm
@@ -407,11 +407,12 @@ - (void)barcodeScanCancelled {
 - (void)flipCamera {
     self.isFlipped = YES;
     self.isFrontCamera = !self.isFrontCamera;
-    [self barcodeScanDone];
-    if (self.isFlipped) {
-      self.isFlipped = NO;
-    }
+    [self barcodeScanDone:^{
+        if (self.isFlipped) {
+            self.isFlipped = NO;
+        }
     [self performSelector:@selector(scanBarcode) withObject:nil afterDelay:0.1];
+    }];
 }
 
 //--------------------------------------------------------------------------