mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-22 13:48:52 +01:00
Check if emitter is already disposed
This commit is contained in:
@@ -52,13 +52,22 @@ class ChangelogManagerImpl @Inject constructor(
|
|||||||
|
|
||||||
return Single
|
return Single
|
||||||
.create<Response> { emitter ->
|
.create<Response> { emitter ->
|
||||||
|
call?.enqueue(object : Callback {
|
||||||
|
override fun onResponse(call: Call, response: Response) {
|
||||||
|
if (!emitter.isDisposed) {
|
||||||
|
emitter.onSuccess(response)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onFailure(call: Call, e: IOException) {
|
||||||
|
if (!emitter.isDisposed) {
|
||||||
|
emitter.onError(e)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
emitter.setCancellable {
|
emitter.setCancellable {
|
||||||
call?.cancel()
|
call?.cancel()
|
||||||
}
|
}
|
||||||
call?.enqueue(object : Callback {
|
|
||||||
override fun onResponse(call: Call, response: Response) = emitter.onSuccess(response)
|
|
||||||
override fun onFailure(call: Call, e: IOException) = emitter.onError(e)
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
.map { response -> response.body?.string()?.let(adapter::fromJson) }
|
.map { response -> response.body?.string()?.let(adapter::fromJson) }
|
||||||
.map { response ->
|
.map { response ->
|
||||||
|
|||||||
@@ -49,7 +49,6 @@ import io.reactivex.rxkotlin.plusAssign
|
|||||||
import io.reactivex.rxkotlin.withLatestFrom
|
import io.reactivex.rxkotlin.withLatestFrom
|
||||||
import io.reactivex.schedulers.Schedulers
|
import io.reactivex.schedulers.Schedulers
|
||||||
import io.realm.Realm
|
import io.realm.Realm
|
||||||
import timber.log.Timber
|
|
||||||
import java.util.*
|
import java.util.*
|
||||||
import java.util.concurrent.TimeUnit
|
import java.util.concurrent.TimeUnit
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
@@ -160,7 +159,7 @@ class MainViewModel @Inject constructor(
|
|||||||
.subscribe({ changelog ->
|
.subscribe({ changelog ->
|
||||||
changelogManager.markChangelogSeen()
|
changelogManager.markChangelogSeen()
|
||||||
view.showChangelog(changelog)
|
view.showChangelog(changelog)
|
||||||
}, Timber::w)
|
}, {}) // Ignore error
|
||||||
} else {
|
} else {
|
||||||
changelogManager.markChangelogSeen()
|
changelogManager.markChangelogSeen()
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user