v3.5.0

journeyapps · Mar 20, 2017 · 29848b2 · 29848b2
1 parent 9ec92a5
commit 29848b2
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 5 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,11 +1,24 @@
+### 3.5.0 (2017-03-20)
+
+* Allow changing the REQUEST_CODE value (#234).
+* Add support for inverted scans (#235).
+* Use zxing:core 3.3.0 by default (#265).
+
+Fixes:
+
+* Fix memory leak when using scan timeout (#283).
+* Better handling of various camera errors (#241, #268, #270)
+
 ### 3.4.0 (2016-10-16)
 
 Changes:
+
 * Beep on scan is now controlled only by the media volume, and still plays
   even if the device is in "silent mode", as long as the media volume is not muted.
 * The 150ms delay after scanning is removed.
 
 Fixes:
+
 * An issue where the beep sometimes played twice is fixed (#221).
 * Fix rare crash (#209)
 * Fix orientation lock issue (#181)

diff --git a/README.md b/README.md
@@ -26,7 +26,7 @@ repositories {
 }
 
 dependencies {
-    compile 'com.journeyapps:zxing-android-embedded:3.4.0'
+    compile 'com.journeyapps:zxing-android-embedded:3.5.0'
     compile 'com.android.support:appcompat-v7:23.1.0'   // Version 23+ is required
 }
 

diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,6 @@
 buildscript {
     repositories {
         jcenter()
-        maven { url 'https://jitpack.io' }  // for sdk-manager-plugin
     }
 
     dependencies {
@@ -16,7 +15,7 @@ subprojects {
         mavenLocal()
     }
 
-    version = '3.4.0'
+    version = '3.5.0'
     group = 'com.journeyapps'
 
     ext.androidBuildTools = '25.0.2'

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 13
         targetSdkVersion project.androidTargetSdk
-        versionCode 340
-        versionName "3.4.0"
+        versionCode 350
+        versionName "3.5.0"
     }
 
     def validConfig

diff --git a/zxing-android-embedded/src/com/journeyapps/barcodescanner/CameraPreview.java b/zxing-android-embedded/src/com/journeyapps/barcodescanner/CameraPreview.java
@@ -664,6 +664,7 @@ public void pauseAndWait() {
         long startTime = System.nanoTime();
         while(instance != null && !instance.isCameraClosed()) {
             if(System.nanoTime() - startTime > 2000000000) {
+                // Don't wait for longer than 2 seconds
                 break;
             }
             try {