caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

fix Tidepool crash

Browse source
This commit is contained in:
Milos Kozak 2019-07-29 23:20:44 +02:00
parent 304cee21ee
commit 2fbc9be152
2 changed files with 36 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/TidepoolPlugin.kt
View file

@ -5,7 +5,6 @@ import android.text.Spanned
import info.nightscout.androidaps.Constants import info.nightscout.androidaps.Constants
import info.nightscout.androidaps.MainApp import info.nightscout.androidaps.MainApp
import info.nightscout.androidaps.R import info.nightscout.androidaps.R
import info.nightscout.androidaps.db.BgReading
import info.nightscout.androidaps.events.EventNetworkChange import info.nightscout.androidaps.events.EventNetworkChange
import info.nightscout.androidaps.events.EventNewBG import info.nightscout.androidaps.events.EventNewBG
import info.nightscout.androidaps.events.EventPreferenceChange import info.nightscout.androidaps.events.EventPreferenceChange
@ -56,7 +55,9 @@ object TidepoolPlugin : PluginBase(PluginDescription()
disposable += RxBus disposable += RxBus
.toObservable(EventTidepoolDoUpload::class.java) .toObservable(EventTidepoolDoUpload::class.java)
.observeOn(Schedulers.io()) .observeOn(Schedulers.io())
.subscribe({ doUpload() }, {}) .subscribe({ doUpload() }, {
log.error(it.message)
})
disposable += RxBus disposable += RxBus
.toObservable(EventTidepoolResetData::class.java) .toObservable(EventTidepoolResetData::class.java)
.observeOn(Schedulers.io()) .observeOn(Schedulers.io())
@ -68,7 +69,9 @@ object TidepoolPlugin : PluginBase(PluginDescription()
SP.putLong(R.string.key_tidepool_last_end, 0) SP.putLong(R.string.key_tidepool_last_end, 0)
TidepoolUploader.doLogin() TidepoolUploader.doLogin()
} }
}, {}) }, {
log.error(it.message)
})
disposable += RxBus disposable += RxBus
.toObservable(EventTidepoolStatus::class.java) .toObservable(EventTidepoolStatus::class.java)
.observeOn(Schedulers.io()) .observeOn(Schedulers.io())
@ -78,7 +81,7 @@ object TidepoolPlugin : PluginBase(PluginDescription()
.observeOn(Schedulers.io()) .observeOn(Schedulers.io())
.filter { it.bgReading != null } // better would be optional in API level >24 .filter { it.bgReading != null } // better would be optional in API level >24
.map { it.bgReading } .map { it.bgReading }
.subscribe { bgReading -> .subscribe({ bgReading ->
if (bgReading!!.date < TidepoolUploader.getLastEnd()) if (bgReading!!.date < TidepoolUploader.getLastEnd())
TidepoolUploader.setLastEnd(bgReading.date) TidepoolUploader.setLastEnd(bgReading.date)
if (isEnabled(PluginType.GENERAL) if (isEnabled(PluginType.GENERAL)
@ -86,7 +89,9 @@ object TidepoolPlugin : PluginBase(PluginDescription()
&& (!SP.getBoolean(R.string.key_tidepool_only_while_unmetered, false) || NetworkChangeReceiver.isWifiConnected()) && (!SP.getBoolean(R.string.key_tidepool_only_while_unmetered, false) || NetworkChangeReceiver.isWifiConnected())
&& RateLimit.rateLimit("tidepool-new-data-upload", T.mins(4).secs().toInt())) && RateLimit.rateLimit("tidepool-new-data-upload", T.mins(4).secs().toInt()))
doUpload() doUpload()
} }, {
log.error(it.message)
})
disposable += RxBus disposable += RxBus
.toObservable(EventPreferenceChange::class.java) .toObservable(EventPreferenceChange::class.java)
.observeOn(Schedulers.io()) .observeOn(Schedulers.io())
@ -96,11 +101,15 @@ object TidepoolPlugin : PluginBase(PluginDescription()
|| event.isChanged(R.string.key_tidepool_password) || event.isChanged(R.string.key_tidepool_password)
) )
TidepoolUploader.resetInstance() TidepoolUploader.resetInstance()
}, {}) }, {
log.error(it.message)
})
disposable += RxBus disposable += RxBus
.toObservable(EventNetworkChange::class.java) .toObservable(EventNetworkChange::class.java)
.observeOn(Schedulers.io()) .observeOn(Schedulers.io())
.subscribe({}, {}) // TODO start upload on wifi connect .subscribe({}, {
log.error(it.message)
}) // TODO start upload on wifi connect
} }
@ -109,11 +118,12 @@ object TidepoolPlugin : PluginBase(PluginDescription()
super.onStop() super.onStop()
} }
private fun doUpload() { private fun doUpload() =
if (TidepoolUploader.connectionStatus == TidepoolUploader.ConnectionStatus.DISCONNECTED) when (TidepoolUploader.connectionStatus) {
TidepoolUploader.doLogin(true) TidepoolUploader.ConnectionStatus.FAILED -> {}
else TidepoolUploader.ConnectionStatus.CONNECTING -> {}
TidepoolUploader.doUpload() TidepoolUploader.ConnectionStatus.DISCONNECTED -> TidepoolUploader.doLogin(true)
TidepoolUploader.ConnectionStatus.CONNECTED -> TidepoolUploader.doUpload()
} }
@Synchronized @Synchronized

10
app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/TidepoolUploader.kt
View file

@ -98,7 +98,7 @@ object TidepoolUploader {
startSession(session!!, doUpload) startSession(session!!, doUpload)
}, { }, {
connectionStatus = TidepoolUploader.ConnectionStatus.FAILED connectionStatus = TidepoolUploader.ConnectionStatus.FAILED
loginFailed() releaseWakeLock()
})) }))
return return
} else { } else {
@ -126,10 +126,6 @@ object TidepoolUploader {
} }
private fun loginFailed() {
releaseWakeLock()
}
private fun startSession(session: Session, doUpload: Boolean = false) { private fun startSession(session: Session, doUpload: Boolean = false) {
extendWakeLock(30000) extendWakeLock(30000)
if (session.authReply?.userid != null) { if (session.authReply?.userid != null) {
@ -204,7 +200,8 @@ object TidepoolUploader {
val body = RequestBody.create(MediaType.parse("application/json"), chunk) val body = RequestBody.create(MediaType.parse("application/json"), chunk)
RxBus.send(EventTidepoolStatus(("Uploading"))) RxBus.send(EventTidepoolStatus(("Uploading")))
val call = session.service!!.doUpload(session.token!!, session.datasetReply!!.getUploadId()!!, body) if (session.service != null && session.token != null && session.datasetReply != null) {
val call = session.service.doUpload(session.token!!, session.datasetReply!!.getUploadId()!!, body)
call.enqueue(TidepoolCallback<UploadReplyMessage>(session, "Data Upload", { call.enqueue(TidepoolCallback<UploadReplyMessage>(session, "Data Upload", {
setLastEnd(session.end) setLastEnd(session.end)
RxBus.send(EventTidepoolStatus(("Upload completed OK"))) RxBus.send(EventTidepoolStatus(("Upload completed OK")))
@ -218,6 +215,7 @@ object TidepoolUploader {
} }
} }
} }
}
private fun unploadNext() { private fun unploadNext() {
if (getLastEnd() < DateUtil.now() - T.mins(1).msecs()) { if (getLastEnd() < DateUtil.now() - T.mins(1).msecs()) {