Merge pull request #318 from gini/bugfix/dont-show-qr-code-hint-when-…

…importing-doc Don't show the QR code hint popup after importing a document
gini · Jun 22, 2021 · 99d486d · 99d486d
2 parents e062dfa + 320f272
commit 99d486d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/ginivision/src/main/java/net/gini/android/vision/camera/CameraFragmentImpl.java b/ginivision/src/main/java/net/gini/android/vision/camera/CameraFragmentImpl.java
@@ -338,7 +338,7 @@ DEFAULT_ANIMATION_DURATION, getHideQRCodeDetectedPopupDelayMs(),
                 new Function0<Unit>() {
                     @Override
                     public Unit invoke() {
-                        closeUploadHintPopUp(true);
+                        closeUploadHintPopUp();
                         return null;
                     }
                 });
@@ -844,7 +844,7 @@ private void setInputHandlers() {
         mCameraPreviewShade.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(final View v) {
-                closeUploadHintPopUp(true);
+                closeUploadHintPopUp();
                 closeQRCodeScannerHintPopUp();
             }
         });
@@ -868,7 +868,8 @@ public void onClick(final View v) {
         mImportButtonContainer.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(final View view) {
-                closeUploadHintPopUp(false);
+                mUploadHintPopup.setIsLastPopup(true);
+                closeUploadHintPopUp();
                 showFileChooser();
             }
         });
@@ -1040,7 +1041,7 @@ private void handleAnalysisError() {
         showError(activity.getString(R.string.gv_document_analysis_error), 3000);
     }
 
-    private void closeUploadHintPopUp(final boolean showQRCodeScannerHint) {
+    private void closeUploadHintPopUp() {
         if (!mUploadHintPopup.isShown()) {
             return;
         }
@@ -1049,7 +1050,7 @@ private void closeUploadHintPopUp(final boolean showQRCodeScannerHint) {
             public void onAnimationEnd(final View view) {
                 final Context context = view.getContext();
                 saveUploadHintPopUpShown(context);
-                if (showQRCodeScannerHint && shouldShowQRCodeScannerHintPopup()) {
+                if (shouldShowQRCodeScannerHintPopup()) {
                     showQRCodeScannerHintPopUp();
                 }
             }
@@ -1103,7 +1104,9 @@ private boolean shouldShowQRCodeScannerHintPopup() {
         if (activity == null) {
             return false;
         }
-        if (!isQRCodeScanningEnabled(mGiniVisionFeatureConfiguration) || mInterfaceHidden) {
+        if (!isQRCodeScanningEnabled(mGiniVisionFeatureConfiguration)
+                || mInterfaceHidden
+                || mUploadHintPopup.isLastPopup()) {
             return false;
         }
         final Context context = mFragment.getActivity();

diff --git a/ginivision/src/main/java/net/gini/android/vision/internal/camera/view/HintPopup.kt b/ginivision/src/main/java/net/gini/android/vision/internal/camera/view/HintPopup.kt
@@ -23,6 +23,9 @@ internal class HintPopup(
     var isShown = false
         private set
 
+    var isLastPopup = false
+        @JvmName("setIsLastPopup") set
+
     init {
         closeButton.setOnClickListener {
             onCloseClicked()