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
+
1
12
### 3.4.0 (2016-10-16)
2
13
3
14
Changes:
15
+
4
16
* Beep on scan is now controlled only by the media volume, and still plays
5
17
even if the device is in "silent mode", as long as the media volume is not muted.
6
18
* The 150ms delay after scanning is removed.
7
19
8
20
Fixes:
21
+
9
22
* An issue where the beep sometimes played twice is fixed (#221 ).
10
23
* Fix rare crash (#209 )
11
24
* Fix orientation lock issue (#181 )
Original file line number Diff line number Diff line change @@ -26,7 +26,7 @@ repositories {
26
26
}
27
27
28
28
dependencies {
29
- compile 'com.journeyapps:zxing-android-embedded:3.4 .0'
29
+ compile 'com.journeyapps:zxing-android-embedded:3.5 .0'
30
30
compile 'com.android.support:appcompat-v7:23.1.0' // Version 23+ is required
31
31
}
32
32
Original file line number Diff line number Diff line change 1
1
buildscript {
2
2
repositories {
3
3
jcenter()
4
- maven { url ' https://jitpack.io' } // for sdk-manager-plugin
5
4
}
6
5
7
6
dependencies {
@@ -16,7 +15,7 @@ subprojects {
16
15
mavenLocal()
17
16
}
18
17
19
- version = ' 3.4 .0'
18
+ version = ' 3.5 .0'
20
19
group = ' com.journeyapps'
21
20
22
21
ext. androidBuildTools = ' 25.0.2'
Original file line number Diff line number Diff line change @@ -7,8 +7,8 @@ android {
7
7
defaultConfig {
8
8
minSdkVersion 13
9
9
targetSdkVersion project. androidTargetSdk
10
- versionCode 340
11
- versionName " 3.4 .0"
10
+ versionCode 350
11
+ versionName " 3.5 .0"
12
12
}
13
13
14
14
def validConfig
Original file line number Diff line number Diff line change @@ -664,6 +664,7 @@ public void pauseAndWait() {
664
664
long startTime = System .nanoTime ();
665
665
while (instance != null && !instance .isCameraClosed ()) {
666
666
if (System .nanoTime () - startTime > 2000000000 ) {
667
+ // Don't wait for longer than 2 seconds
667
668
break ;
668
669
}
669
670
try {
You can’t perform that action at this time.
0 commit comments