caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge pull request #1396 from avereha/fix-crash

Browse source 
fix crashes
This commit is contained in:
Milos Kozak 2022-03-01 09:05:21 +01:00 committed by GitHub
parent 9ed7b6dd9f 5664805903
commit ff12472062
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
View file

@ -122,7 +122,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
createFakeTBRWhenNoActivePod() createFakeTBRWhenNoActivePod()
.subscribeOn(aapsSchedulers.io) .subscribeOn(aapsSchedulers.io)
.doOnError { aapsLogger.warn(LTag.PUMP, "Error on createFakeTBRWhenNoActivePod=$it") } .doOnError { aapsLogger.warn(LTag.PUMP, "Error on createFakeTBRWhenNoActivePod=$it") }
.blockingAwait() .blockingSubscribe()
handler.postDelayed(statusChecker, STATUS_CHECK_INTERVAL_MS) handler.postDelayed(statusChecker, STATUS_CHECK_INTERVAL_MS)
} }
} }
@ -249,7 +249,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
omnipodManager.connect(it).ignoreElements() omnipodManager.connect(it).ignoreElements()
.doOnError { aapsLogger.info(LTag.PUMPCOMM, "connect error=$it") } .doOnError { aapsLogger.info(LTag.PUMPCOMM, "connect error=$it") }
.doOnComplete { podStateManager.incrementSuccessfulConnectionAttemptsAfterRetries() } .doOnComplete { podStateManager.incrementSuccessfulConnectionAttemptsAfterRetries() }
.blockingAwait() .blockingSubscribe()
} }
} finally { } finally {
synchronized(this) { synchronized(this) {
@ -293,7 +293,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
.doOnError { .doOnError {
aapsLogger.error(LTag.PUMP, "Error in getPumpStatus", it) aapsLogger.error(LTag.PUMP, "Error in getPumpStatus", it)
} }
.blockingAwait() .blockingSubscribe()
} }
private fun getPodStatus(): Completable = Completable.concat( private fun getPodStatus(): Completable = Completable.concat(
@ -687,7 +687,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
aapsLogger.debug(LTag.PUMP, "waitForBolusDeliveryToComplete errorGettingStatus=$errorGettingStatus") aapsLogger.debug(LTag.PUMP, "waitForBolusDeliveryToComplete errorGettingStatus=$errorGettingStatus")
Thread.sleep(BOLUS_RETRY_INTERVAL_MS) // retry every 2 sec Thread.sleep(BOLUS_RETRY_INTERVAL_MS) // retry every 2 sec
} }
.blockingAwait() .blockingSubscribe()
} }
if (errorGettingStatus != null) { if (errorGettingStatus != null) {
// requestedBolusAmount will be updated later, via pumpSync // requestedBolusAmount will be updated later, via pumpSync
@ -727,7 +727,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
aapsLogger.debug(LTag.PUMP, "waitForBolusDeliveryToComplete errorGettingStatus=$errorGettingStatus") aapsLogger.debug(LTag.PUMP, "waitForBolusDeliveryToComplete errorGettingStatus=$errorGettingStatus")
Thread.sleep(BOLUS_RETRY_INTERVAL_MS) // retry every 3 sec Thread.sleep(BOLUS_RETRY_INTERVAL_MS) // retry every 3 sec
} }
.blockingAwait() .blockingSubscribe()
if (errorGettingStatus != null) { if (errorGettingStatus != null) {
continue continue
} }