caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

better handle danapump flag

Browse source
This commit is contained in:
Milos Kozak 2020-05-14 20:50:45 +02:00
parent 5b999370aa
commit e6f1e20e84
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt
View file

@ -70,7 +70,6 @@ class BLEComm @Inject internal constructor(
set(newValue) { set(newValue) {
bleEncryption.setEnhancedEncryption(newValue) bleEncryption.setEnhancedEncryption(newValue)
field = newValue field = newValue
danaPump.v3RSPump = newValue
} }
private var isEasyMode: Boolean = false private var isEasyMode: Boolean = false
private var isUnitUD: Boolean = false private var isUnitUD: Boolean = false
@ -437,6 +436,7 @@ class BLEComm @Inject internal constructor(
if (decryptedBuffer.size == 4 && decryptedBuffer[2] == 'O'.toByte() && decryptedBuffer[3] == 'K'.toByte()) { if (decryptedBuffer.size == 4 && decryptedBuffer[2] == 'O'.toByte() && decryptedBuffer[3] == 'K'.toByte()) {
aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK (OK)" + " " + DanaRS_Packet.toHexString(decryptedBuffer)) aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK (OK)" + " " + DanaRS_Packet.toHexString(decryptedBuffer))
v3Encryption = false v3Encryption = false
danaPump.v3RSPump = false
// Grab pairing key from preferences if exists // Grab pairing key from preferences if exists
val pairingKey = sp.getString(resourceHelper.gs(R.string.key_danars_pairingkey) + danaRSPlugin.mDeviceName, "") val pairingKey = sp.getString(resourceHelper.gs(R.string.key_danars_pairingkey) + danaRSPlugin.mDeviceName, "")
aapsLogger.debug(LTag.PUMPBTCOMM, "Using stored pairing key: $pairingKey") aapsLogger.debug(LTag.PUMPBTCOMM, "Using stored pairing key: $pairingKey")
@ -450,6 +450,7 @@ class BLEComm @Inject internal constructor(
} else if (decryptedBuffer.size == 9 && decryptedBuffer[2] == 'O'.toByte() && decryptedBuffer[3] == 'K'.toByte()) { } else if (decryptedBuffer.size == 9 && decryptedBuffer[2] == 'O'.toByte() && decryptedBuffer[3] == 'K'.toByte()) {
// v3 2nd layer encryption // v3 2nd layer encryption
v3Encryption = true v3Encryption = true
danaPump.v3RSPump = true
rxBus.send(EventNewNotification(Notification(Notification.UNSUPPORTED_FIRMWARE, resourceHelper.gs(R.string.unsupportedfirmware), Notification.URGENT))) rxBus.send(EventNewNotification(Notification(Notification.UNSUPPORTED_FIRMWARE, resourceHelper.gs(R.string.unsupportedfirmware), Notification.URGENT)))
disconnect("Wrong firmware") disconnect("Wrong firmware")
/* /*