Merge branch 'release/1.0.23'

bobekos · Apr 17, 2019 · a22bf7a · a22bf7a
2 parents 3ede7de + 023560f
commit a22bf7a
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -25,7 +25,7 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.1.0-alpha01'
+    implementation 'androidx.appcompat:appcompat:1.1.0-alpha04'
 
     testImplementation 'junit:junit:4.12'
 

diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.0-alpha02'
+        classpath 'com.android.tools.build:gradle:3.4.0-rc03'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Oct 27 00:18:43 CEST 2018
+#Thu Jan 31 11:20:46 CET 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
diff --git a/scanner/build.gradle b/scanner/build.gradle
@@ -9,8 +9,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 28
-        versionCode 22
-        versionName "1.0.22"
+        versionCode 23
+        versionName "1.0.23"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -28,8 +28,8 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'androidx.appcompat:appcompat:1.1.0-alpha01'
-    implementation 'androidx.media:media:1.1.0-alpha01'
+    implementation 'androidx.appcompat:appcompat:1.1.0-alpha04'
+    implementation 'androidx.media:media:1.1.0-alpha04'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
 
     testImplementation 'junit:junit:4.12'

diff --git a/scanner/src/main/java/com/bobekos/bobek/scanner/scanner/BarcodeScanner.kt b/scanner/src/main/java/com/bobekos/bobek/scanner/scanner/BarcodeScanner.kt
@@ -49,15 +49,19 @@ internal class BarcodeScanner(
                     emitter.onError(NullPointerException("Context is null"))
                 } else if (!barcodeDetector.isOperational) {
                     emitter.onError(DetectorNotReadyException())
-                } else {
+                } else if (!emitter.isDisposed) {
                     camera.init(barcodeDetector).getCameraSource()?.start(holder)
                     camera.setParametersFromConfig()
 
                     val tracker = BarcodeTracker(emitter)
                     val processor = MultiProcessor.Builder(BarcodeTrackerFactory(tracker)).build()
                     barcodeDetector.setProcessor(processor)
 
-                    updateDisposable = updateSubject.subscribe({ camera.setParametersFromConfig() }, {})
+                    updateDisposable = updateSubject.subscribe({
+                        if (!emitter.isDisposed) {
+                            camera.setParametersFromConfig()
+                        }
+                    }, {})
 
                     emitter.setCancellable {
                         processor.release()