Merge pull request #171 from getbouncer/awushensky/fix_display_bug

Fix display bug
getbouncer · Aug 12, 2020 · ebbcb97 · ebbcb97
2 parents eaf1c72 + aa7d7bd
commit ebbcb97
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/cardscan-ui/src/main/java/com/getbouncer/cardscan/ui/CardScanActivity.kt b/cardscan-ui/src/main/java/com/getbouncer/cardscan/ui/CardScanActivity.kt
@@ -213,7 +213,7 @@ class CardScanActivity :
             enableEnterCardManually: Boolean = false,
             enableExpiryExtraction: Boolean = false,
             enableNameExtraction: Boolean = false,
-            displayCardPan: Boolean = false,
+            displayCardPan: Boolean = true,
             displayCardholderName: Boolean = false,
             displayCardScanLogo: Boolean = true,
             enableDebug: Boolean = Config.isDebug
@@ -257,7 +257,7 @@ class CardScanActivity :
             enableEnterCardManually: Boolean = false,
             enableExpiryExtraction: Boolean = false,
             enableNameExtraction: Boolean = false,
-            displayCardPan: Boolean = false,
+            displayCardPan: Boolean = true,
             displayCardholderName: Boolean = false,
             displayCardScanLogo: Boolean = true,
             enableDebug: Boolean = Config.isDebug
@@ -311,7 +311,7 @@ class CardScanActivity :
     }
 
     private val displayCardPan: Boolean by lazy {
-        intent.getBooleanExtra(PARAM_DISPLAY_CARD_PAN, false)
+        intent.getBooleanExtra(PARAM_DISPLAY_CARD_PAN, true)
     }
 
     private val displayCardholderName: Boolean by lazy {
@@ -323,11 +323,11 @@ class CardScanActivity :
     }
 
     private val enableNameExtraction: Boolean by lazy {
-        intent.getBooleanExtra(PARAM_ENABLE_NAME_EXTRACTION, true)
+        intent.getBooleanExtra(PARAM_ENABLE_NAME_EXTRACTION, false)
     }
 
     private val enableExpiryExtraction: Boolean by lazy {
-        intent.getBooleanExtra(PARAM_ENABLE_EXPIRY_EXTRACTION, true)
+        intent.getBooleanExtra(PARAM_ENABLE_EXPIRY_EXTRACTION, false)
     }
 
     private var mainLoopIsProducingResults = AtomicBoolean(false)
@@ -592,7 +592,7 @@ class CardScanActivity :
         }
 
         val willRunNameAndExpiry = (result.analyzerResult.isExpiryExtractionAvailable && enableExpiryExtraction) ||
-            (result.analyzerResult.isNameExtractionAvailable && result.analyzerResult.isNameExtractionAvailable)
+            (result.analyzerResult.isNameExtractionAvailable && enableNameExtraction)
 
         when (result.state) {
             is MainLoopState.Initial -> setStateNotFound()