Fix face detector settings not being applied on first run (expo#2308)

prakashbask · Oct 10, 2018 · 5655751 · 5655751
1 parent 6928377
commit 5655751
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/android/src/main/java/expo/modules/camera/ExpoCameraView.java b/android/src/main/java/expo/modules/camera/ExpoCameraView.java
@@ -66,6 +66,7 @@ public class ExpoCameraView extends CameraView implements LifecycleEventListener
   // Scanning-related properties
   private BarCodeScanner mBarCodeScanner;
   private FaceDetector mFaceDetector;
+  private Map<String, Object> mPendingFaceDetectorSettings;
   private boolean mShouldDetectFaces = false;
   private boolean mShouldScanBarCodes = false;
 
@@ -270,6 +271,10 @@ public void onHostResume() {
           FaceDetectorProvider faceDetectorProvider = mModuleRegistry.getModule(FaceDetectorProvider.class);
           if (faceDetectorProvider != null) {
             mFaceDetector = faceDetectorProvider.createFaceDetectorWithContext(getContext());
+            if (mPendingFaceDetectorSettings != null) {
+              mFaceDetector.setSettings(mPendingFaceDetectorSettings);
+              mPendingFaceDetectorSettings = null;
+            }
           }
         }
       }
@@ -308,7 +313,9 @@ public void setShouldDetectFaces(boolean shouldDetectFaces) {
   }
 
   public void setFaceDetectorSettings(Map<String, Object> settings) {
-    if (mFaceDetector != null) {
+    if (mFaceDetector == null) {
+      mPendingFaceDetectorSettings = settings;
+    } else {
       mFaceDetector.setSettings(settings);
     }
   }