File tree Expand file tree Collapse file tree 5 files changed +18
-5
lines changed
zxing-android-embedded/src/com/journeyapps/barcodescanner Expand file tree Collapse file tree 5 files changed +18
-5
lines changed Original file line number Diff line number Diff line change 1+ ### 3.5.0 (2017-03-20)
2+
3+ * Allow changing the REQUEST_CODE value (#234 ).
4+ * Add support for inverted scans (#235 ).
5+ * Use zxing: core 3.3.0 by default (#265 ).
6+
7+ Fixes:
8+
9+ * Fix memory leak when using scan timeout (#283 ).
10+ * Better handling of various camera errors (#241 , #268 , #270 )
11+
112### 3.4.0 (2016-10-16)
213
314Changes:
15+
416* Beep on scan is now controlled only by the media volume, and still plays
517 even if the device is in "silent mode", as long as the media volume is not muted.
618* The 150ms delay after scanning is removed.
719
820Fixes:
21+
922* An issue where the beep sometimes played twice is fixed (#221 ).
1023* Fix rare crash (#209 )
1124* Fix orientation lock issue (#181 )
Original file line number Diff line number Diff line change @@ -26,7 +26,7 @@ repositories {
2626}
2727
2828dependencies {
29- compile 'com.journeyapps:zxing-android-embedded:3.4 .0'
29+ compile 'com.journeyapps:zxing-android-embedded:3.5 .0'
3030 compile 'com.android.support:appcompat-v7:23.1.0' // Version 23+ is required
3131}
3232
Original file line number Diff line number Diff line change 11buildscript {
22 repositories {
33 jcenter()
4- maven { url ' https://jitpack.io' } // for sdk-manager-plugin
54 }
65
76 dependencies {
@@ -16,7 +15,7 @@ subprojects {
1615 mavenLocal()
1716 }
1817
19- version = ' 3.4 .0'
18+ version = ' 3.5 .0'
2019 group = ' com.journeyapps'
2120
2221 ext. androidBuildTools = ' 25.0.2'
Original file line number Diff line number Diff line change @@ -7,8 +7,8 @@ android {
77 defaultConfig {
88 minSdkVersion 13
99 targetSdkVersion project. androidTargetSdk
10- versionCode 340
11- versionName " 3.4 .0"
10+ versionCode 350
11+ versionName " 3.5 .0"
1212 }
1313
1414 def validConfig
Original file line number Diff line number Diff line change @@ -664,6 +664,7 @@ public void pauseAndWait() {
664664 long startTime = System .nanoTime ();
665665 while (instance != null && !instance .isCameraClosed ()) {
666666 if (System .nanoTime () - startTime > 2000000000 ) {
667+ // Don't wait for longer than 2 seconds
667668 break ;
668669 }
669670 try {
You can’t perform that action at this time.
0 commit comments