Merge pull request #81 from getbouncer/awushensky/fix_crash_on_flash_…

…not_supported Fix crash on flash not supported
getbouncer · Jan 8, 2020 · 61d83b5 · 61d83b5
2 parents 9f9e25e + d6cb4fa
commit 61d83b5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -20,8 +20,8 @@ We publish our library in the jcenter repository, so for most gradle configurati
 
 ```gradle
 dependencies {
-    implementation 'com.getbouncer:cardscan-base:1.0.5121'
-    implementation 'com.getbouncer:cardscan:1.0.5121'
+    implementation 'com.getbouncer:cardscan-base:1.0.5122'
+    implementation 'com.getbouncer:cardscan:1.0.5122'
 }
 ```
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -7,7 +7,7 @@ android {
         minSdkVersion 19
         targetSdkVersion 28
         versionCode 4015
-        versionName "1.0.5121"
+        versionName "1.0.5122"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

diff --git a/cardscan-base/src/main/java/com/getbouncer/cardscan/base/ScanBaseActivity.java b/cardscan-base/src/main/java/com/getbouncer/cardscan/base/ScanBaseActivity.java
@@ -506,7 +506,7 @@ public void onPreviewFrame(byte[] bytes, Camera camera) {
     public void onClick(View view) {
         if (mCamera != null && mFlashlightId == view.getId()) {
             Camera.Parameters parameters = mCamera.getParameters();
-            if (parameters.getFlashMode().equals(Camera.Parameters.FLASH_MODE_TORCH)) {
+            if (Camera.Parameters.FLASH_MODE_TORCH.equals(parameters.getFlashMode())) {
                 parameters.setFlashMode(Camera.Parameters.FLASH_MODE_OFF);
             } else {
                 parameters.setFlashMode(Camera.Parameters.FLASH_MODE_TORCH);

diff --git a/gradle.properties b/gradle.properties
@@ -13,4 +13,4 @@ org.gradle.jvmargs=-Xmx1536m
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-version=1.0.5121
+version=1.0.5122