From d3eafa6d6fbb16355d6f44112c31c5b6491672db Mon Sep 17 00:00:00 2001
From: "husaynhakeem@gmail.com" <husaynhakeem@gmail.com>
Date: Tue, 26 Jun 2018 22:27:11 -0700
Subject: [PATCH] Accept null data in Frames

---
 .idea/misc.xml                                | 69 -------------------
 app/build.gradle                              |  2 +-
 .../io/facedetector/FaceDetector.kt           | 20 +++---
 .../io/facedetector/models/models.kt          |  2 +-
 4 files changed, 13 insertions(+), 80 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 1d10905..ad3cd02 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,74 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="MarkdownProjectSettings">
-    <PreviewSettings splitEditorLayout="SPLIT" splitEditorPreview="PREVIEW" useGrayscaleRendering="false" zoomFactor="1.0" maxImageWidth="0" showGitHubPageIfSynced="false" allowBrowsingInPreview="false" synchronizePreviewPosition="true" highlightPreviewType="NONE" highlightFadeOut="5" highlightOnTyping="true" synchronizeSourcePosition="true" verticallyAlignSourceAndPreviewSyncPosition="true" showSearchHighlightsInPreview="false" showSelectionInPreview="true">
-      <PanelProvider>
-        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.panel" providerName="Default - Swing" />
-      </PanelProvider>
-    </PreviewSettings>
-    <ParserSettings gitHubSyntaxChange="false">
-      <PegdownExtensions>
-        <option name="ABBREVIATIONS" value="false" />
-        <option name="ANCHORLINKS" value="true" />
-        <option name="ASIDE" value="false" />
-        <option name="ATXHEADERSPACE" value="true" />
-        <option name="AUTOLINKS" value="true" />
-        <option name="DEFINITIONS" value="false" />
-        <option name="DEFINITION_BREAK_DOUBLE_BLANK_LINE" value="false" />
-        <option name="FENCED_CODE_BLOCKS" value="true" />
-        <option name="FOOTNOTES" value="false" />
-        <option name="HARDWRAPS" value="false" />
-        <option name="HTML_DEEP_PARSER" value="false" />
-        <option name="INSERTED" value="false" />
-        <option name="QUOTES" value="false" />
-        <option name="RELAXEDHRULES" value="true" />
-        <option name="SMARTS" value="false" />
-        <option name="STRIKETHROUGH" value="true" />
-        <option name="SUBSCRIPT" value="false" />
-        <option name="SUPERSCRIPT" value="false" />
-        <option name="SUPPRESS_HTML_BLOCKS" value="false" />
-        <option name="SUPPRESS_INLINE_HTML" value="false" />
-        <option name="TABLES" value="true" />
-        <option name="TASKLISTITEMS" value="true" />
-        <option name="TOC" value="false" />
-        <option name="WIKILINKS" value="true" />
-      </PegdownExtensions>
-      <ParserOptions>
-        <option name="COMMONMARK_LISTS" value="true" />
-        <option name="DUMMY" value="false" />
-        <option name="EMOJI_SHORTCUTS" value="true" />
-        <option name="FLEXMARK_FRONT_MATTER" value="false" />
-        <option name="GFM_LOOSE_BLANK_LINE_AFTER_ITEM_PARA" value="false" />
-        <option name="GFM_TABLE_RENDERING" value="true" />
-        <option name="GITBOOK_URL_ENCODING" value="false" />
-        <option name="GITHUB_EMOJI_URL" value="false" />
-        <option name="GITHUB_LISTS" value="false" />
-        <option name="GITHUB_WIKI_LINKS" value="true" />
-        <option name="JEKYLL_FRONT_MATTER" value="false" />
-        <option name="SIM_TOC_BLANK_LINE_SPACER" value="true" />
-      </ParserOptions>
-    </ParserSettings>
-    <HtmlSettings headerTopEnabled="false" headerBottomEnabled="false" bodyTopEnabled="false" bodyBottomEnabled="false" embedUrlContent="false" addPageHeader="true">
-      <GeneratorProvider>
-        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.generator" providerName="Default Swing HTML Generator" />
-      </GeneratorProvider>
-      <headerTop />
-      <headerBottom />
-      <bodyTop />
-      <bodyBottom />
-    </HtmlSettings>
-    <CssSettings previewScheme="UI_SCHEME" cssUri="" isCssUriEnabled="false" isCssTextEnabled="false" isDynamicPageWidth="true">
-      <StylesheetProvider>
-        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.css" providerName="Default Swing Stylesheet" />
-      </StylesheetProvider>
-      <ScriptProviders />
-      <cssText />
-    </CssSettings>
-    <HtmlExportSettings updateOnSave="false" parentDir="$ProjectFileDir$" targetDir="$ProjectFileDir$" cssDir="" scriptDir="" plainHtml="false" imageDir="" copyLinkedImages="false" imageUniquifyType="0" targetExt="" useTargetExt="false" noCssNoScripts="false" linkToExportedHtml="true" exportOnSettingsChange="true" regenerateOnProjectOpen="false" />
-    <LinkMapSettings>
-      <textMaps />
-    </LinkMapSettings>
-  </component>
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
diff --git a/app/build.gradle b/app/build.gradle
index d775200..02c8243 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -30,7 +30,7 @@ dependencies {
     implementation "com.otaliastudios:cameraview:1.5.1"
 
     // Android face detector
-    implementation 'com.github.husaynhakeem:android-face-detector:v1.0'
+    implementation 'com.github.husaynhakeem:android-face-detector:v1.1'
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/facedetector/src/main/java/husaynhakeem/io/facedetector/FaceDetector.kt b/facedetector/src/main/java/husaynhakeem/io/facedetector/FaceDetector.kt
index aa66705..5a3deb0 100644
--- a/facedetector/src/main/java/husaynhakeem/io/facedetector/FaceDetector.kt
+++ b/facedetector/src/main/java/husaynhakeem/io/facedetector/FaceDetector.kt
@@ -32,18 +32,20 @@ class FaceDetector(private val faceBoundsOverlay: FaceBoundsOverlay) {
     }
 
     private fun detectFacesIn(frame: Frame) {
-        firebaseFaceDetectorWrapper.process(
-                image = convertFrameToImage(frame),
-                onSuccess = {
-                    faceBoundsOverlay.updateFaces(convertToListOfFaceBounds(it))
-                },
-                onError = {
-                    Toast.makeText(faceBoundsOverlay.context, "Error processing images: $it", Toast.LENGTH_LONG).show()
-                })
+        frame.data?.let {
+            firebaseFaceDetectorWrapper.process(
+                    image = convertFrameToImage(frame),
+                    onSuccess = {
+                        faceBoundsOverlay.updateFaces(convertToListOfFaceBounds(it))
+                    },
+                    onError = {
+                        Toast.makeText(faceBoundsOverlay.context, "Error processing images: $it", Toast.LENGTH_LONG).show()
+                    })
+        }
     }
 
     private fun convertFrameToImage(frame: Frame) =
-            FirebaseVisionImage.fromByteArray(frame.data, extractFrameMetadata(frame))
+            FirebaseVisionImage.fromByteArray(frame.data!!, extractFrameMetadata(frame))
 
     private fun extractFrameMetadata(frame: Frame): FirebaseVisionImageMetadata =
             FirebaseVisionImageMetadata.Builder()
diff --git a/facedetector/src/main/java/husaynhakeem/io/facedetector/models/models.kt b/facedetector/src/main/java/husaynhakeem/io/facedetector/models/models.kt
index 9314ebf..3e3d94f 100644
--- a/facedetector/src/main/java/husaynhakeem/io/facedetector/models/models.kt
+++ b/facedetector/src/main/java/husaynhakeem/io/facedetector/models/models.kt
@@ -6,7 +6,7 @@ import android.graphics.Rect
 data class FaceBounds(val id: Int, val box: Rect)
 
 data class Frame(
-        val data: ByteArray,
+        val data: ByteArray?,
         val rotation: Int,
         val size: Size,
         val format: Int,