Glunovo: catch SecurityException
This commit is contained in:
Milos Kozak
parent
1b3bb6ecdd
commit
e920b6bc2d
1 changed files with 67 additions and 63 deletions
|
|
@ -89,80 +89,84 @@ class GlunovoPlugin @Inject constructor(
|
|||
private fun handleNewData() {
|
||||
if (!isEnabled()) return
|
||||
|
||||
context.contentResolver.query(contentUri, null, null, null, null)?.let { cr ->
|
||||
val glucoseValues = mutableListOf<CgmSourceTransaction.TransactionGlucoseValue>()
|
||||
val calibrations = mutableListOf<CgmSourceTransaction.Calibration>()
|
||||
cr.moveToFirst()
|
||||
try {
|
||||
context.contentResolver.query(contentUri, null, null, null, null)?.let { cr ->
|
||||
val glucoseValues = mutableListOf<CgmSourceTransaction.TransactionGlucoseValue>()
|
||||
val calibrations = mutableListOf<CgmSourceTransaction.Calibration>()
|
||||
cr.moveToFirst()
|
||||
|
||||
while (!cr.isAfterLast) {
|
||||
val timestamp = cr.getLong(0)
|
||||
val value = cr.getDouble(1) //value in mmol/l...
|
||||
val curr = cr.getDouble(2)
|
||||
while (!cr.isAfterLast) {
|
||||
val timestamp = cr.getLong(0)
|
||||
val value = cr.getDouble(1) //value in mmol/l...
|
||||
val curr = cr.getDouble(2)
|
||||
|
||||
// bypass already processed
|
||||
if (timestamp < sp.getLong(R.string.key_last_processed_glunovo_timestamp, 0L)) {
|
||||
cr.moveToNext()
|
||||
continue
|
||||
}
|
||||
// bypass already processed
|
||||
if (timestamp < sp.getLong(R.string.key_last_processed_glunovo_timestamp, 0L)) {
|
||||
cr.moveToNext()
|
||||
continue
|
||||
}
|
||||
|
||||
if (timestamp > dateUtil.now() || timestamp == 0L) {
|
||||
aapsLogger.error(LTag.BGSOURCE, "Error in received data date/time $timestamp")
|
||||
cr.moveToNext()
|
||||
continue
|
||||
}
|
||||
if (timestamp > dateUtil.now() || timestamp == 0L) {
|
||||
aapsLogger.error(LTag.BGSOURCE, "Error in received data date/time $timestamp")
|
||||
cr.moveToNext()
|
||||
continue
|
||||
}
|
||||
|
||||
if (value < 2 || value > 25) {
|
||||
aapsLogger.error(LTag.BGSOURCE, "Error in received data value (value out of bounds) $value")
|
||||
cr.moveToNext()
|
||||
continue
|
||||
}
|
||||
if (value < 2 || value > 25) {
|
||||
aapsLogger.error(LTag.BGSOURCE, "Error in received data value (value out of bounds) $value")
|
||||
cr.moveToNext()
|
||||
continue
|
||||
}
|
||||
|
||||
if (curr != 0.0)
|
||||
glucoseValues += CgmSourceTransaction.TransactionGlucoseValue(
|
||||
timestamp = timestamp,
|
||||
value = value * Constants.MMOLL_TO_MGDL,
|
||||
raw = 0.0,
|
||||
noise = null,
|
||||
trendArrow = GlucoseValue.TrendArrow.NONE,
|
||||
sourceSensor = GlucoseValue.SourceSensor.GLUNOVO_NATIVE
|
||||
)
|
||||
else
|
||||
calibrations.add(
|
||||
CgmSourceTransaction.Calibration(
|
||||
if (curr != 0.0)
|
||||
glucoseValues += CgmSourceTransaction.TransactionGlucoseValue(
|
||||
timestamp = timestamp,
|
||||
value = value,
|
||||
glucoseUnit = TherapyEvent.GlucoseUnit.MMOL
|
||||
value = value * Constants.MMOLL_TO_MGDL,
|
||||
raw = 0.0,
|
||||
noise = null,
|
||||
trendArrow = GlucoseValue.TrendArrow.NONE,
|
||||
sourceSensor = GlucoseValue.SourceSensor.GLUNOVO_NATIVE
|
||||
)
|
||||
)
|
||||
sp.putLong(R.string.key_last_processed_glunovo_timestamp, timestamp)
|
||||
cr.moveToNext()
|
||||
}
|
||||
cr.close()
|
||||
else
|
||||
calibrations.add(
|
||||
CgmSourceTransaction.Calibration(
|
||||
timestamp = timestamp,
|
||||
value = value,
|
||||
glucoseUnit = TherapyEvent.GlucoseUnit.MMOL
|
||||
)
|
||||
)
|
||||
sp.putLong(R.string.key_last_processed_glunovo_timestamp, timestamp)
|
||||
cr.moveToNext()
|
||||
}
|
||||
cr.close()
|
||||
|
||||
if (glucoseValues.isNotEmpty() || calibrations.isNotEmpty())
|
||||
repository.runTransactionForResult(CgmSourceTransaction(glucoseValues, calibrations, null))
|
||||
.doOnError {
|
||||
aapsLogger.error(LTag.DATABASE, "Error while saving values from Glunovo App", it)
|
||||
}
|
||||
.blockingGet()
|
||||
.also { savedValues ->
|
||||
savedValues.inserted.forEach {
|
||||
xDripBroadcast.send(it)
|
||||
aapsLogger.debug(LTag.DATABASE, "Inserted bg $it")
|
||||
if (glucoseValues.isNotEmpty() || calibrations.isNotEmpty())
|
||||
repository.runTransactionForResult(CgmSourceTransaction(glucoseValues, calibrations, null))
|
||||
.doOnError {
|
||||
aapsLogger.error(LTag.DATABASE, "Error while saving values from Glunovo App", it)
|
||||
}
|
||||
savedValues.calibrationsInserted.forEach { calibration ->
|
||||
calibration.glucose?.let { glucosevalue ->
|
||||
uel.log(
|
||||
UserEntry.Action.CALIBRATION,
|
||||
UserEntry.Sources.Dexcom,
|
||||
ValueWithUnit.Timestamp(calibration.timestamp),
|
||||
ValueWithUnit.TherapyEventType(calibration.type),
|
||||
ValueWithUnit.fromGlucoseUnit(glucosevalue, calibration.glucoseUnit.toString)
|
||||
)
|
||||
.blockingGet()
|
||||
.also { savedValues ->
|
||||
savedValues.inserted.forEach {
|
||||
xDripBroadcast.send(it)
|
||||
aapsLogger.debug(LTag.DATABASE, "Inserted bg $it")
|
||||
}
|
||||
savedValues.calibrationsInserted.forEach { calibration ->
|
||||
calibration.glucose?.let { glucosevalue ->
|
||||
uel.log(
|
||||
UserEntry.Action.CALIBRATION,
|
||||
UserEntry.Sources.Dexcom,
|
||||
ValueWithUnit.Timestamp(calibration.timestamp),
|
||||
ValueWithUnit.TherapyEventType(calibration.type),
|
||||
ValueWithUnit.fromGlucoseUnit(glucosevalue, calibration.glucoseUnit.toString)
|
||||
)
|
||||
}
|
||||
aapsLogger.debug(LTag.DATABASE, "Inserted calibration $calibration")
|
||||
}
|
||||
aapsLogger.debug(LTag.DATABASE, "Inserted calibration $calibration")
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (e: SecurityException) {
|
||||
aapsLogger.error(e.localizedMessage)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue