From ffde47d53198f94fcc14bb5fc76874b49c785450 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 31 May 2021 18:03:57 +0200
Subject: [PATCH] fix Dana 5 BLE comm

---
 .../androidaps/danars/comm/DanaRS_Packet.java | 248 ------------------
 .../androidaps/danars/comm/DanaRS_Packet.kt   | 157 +++++++++++
 .../androidaps/danars/services/BLEComm.kt     |  77 +++---
 .../jniLibs/arm64-v8a/libBleEncryption.so     | Bin 22776 -> 22776 bytes
 .../jniLibs/armeabi-v7a/libBleEncryption.so   | Bin 26548 -> 26548 bytes
 .../src/main/jniLibs/x86/libBleEncryption.so  | Bin 22432 -> 22432 bytes
 .../main/jniLibs/x86_64/libBleEncryption.so   | Bin 23056 -> 23056 bytes
 .../danars/comm/DanaRsMessageHashTableTest.kt |   2 +-
 8 files changed, 195 insertions(+), 289 deletions(-)
 delete mode 100644 danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet.java
 create mode 100644 danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet.kt

diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet.java b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet.java
deleted file mode 100644
index ff99f0d891..0000000000
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet.java
+++ /dev/null
@@ -1,248 +0,0 @@
-package info.nightscout.androidaps.danars.comm;
-
-import android.annotation.TargetApi;
-import android.os.Build;
-
-import org.joda.time.DateTime;
-
-import java.nio.charset.StandardCharsets;
-
-import javax.inject.Inject;
-
-import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.danars.encryption.BleEncryption;
-import info.nightscout.androidaps.logging.AAPSLogger;
-import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.utils.DateUtil;
-
-public class DanaRS_Packet {
-
-    @Inject AAPSLogger aapsLogger;
-    @Inject DateUtil dateUtil;
-
-    protected HasAndroidInjector injector;
-
-    private static final int TYPE_START = 0;
-    private static final int OPCODE_START = 1;
-    public static final int DATA_START = 2;
-
-    private boolean received;
-    public boolean failed;
-    protected int type = BleEncryption.DANAR_PACKET__TYPE_RESPONSE; // most of the messages, should be changed for others
-    protected int opCode;
-
-    public DanaRS_Packet(HasAndroidInjector injector) {
-        received = false;
-        failed = false;
-        this.injector = injector;
-        injector.androidInjector().inject(this);
-    }
-
-    public boolean success() {
-        return !failed;
-    }
-    public void setReceived() {
-        received = true;
-    }
-
-    public boolean isReceived() {
-        return received;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public int getOpCode() {
-        return opCode;
-    }
-
-    public int getCommand() {
-        return ((type & 0xFF) << 8) + (opCode & 0xFF);
-    }
-
-    public byte[] getRequestParams() {
-        return null;
-    }
-
-    // STATIC FUNCTIONS
-
-    public int getCommand(byte[] data) {
-        int type = byteArrayToInt(getBytes(data, TYPE_START, 1));
-        int opCode = byteArrayToInt(getBytes(data, OPCODE_START, 1));
-        return ((type & 0xFF) << 8) + (opCode & 0xFF);
-    }
-
-    public void handleMessage(byte[] data) {
-    }
-
-    public void handleMessageNotReceived() {
-        failed = true;
-    }
-
-    public String getFriendlyName() {
-        return "UNKNOWN_PACKET";
-    }
-
-    protected byte[] getBytes(byte[] data, int srcStart, int srcLength) {
-        try {
-            byte[] ret = new byte[srcLength];
-
-            System.arraycopy(data, srcStart, ret, 0, srcLength);
-
-            return ret;
-        } catch (Exception e) {
-            aapsLogger.error(LTag.PUMPBTCOMM, "Unhandled exception", e);
-        }
-        return null;
-    }
-
-    protected static int byteArrayToInt(byte[] b) {
-        int ret;
-
-        switch (b.length) {
-            case 1:
-                ret = b[0] & 0x000000FF;
-                break;
-            case 2:
-                ret = ((b[1] & 0x000000FF) << 8) + (b[0] & 0x000000FF);
-                break;
-            case 3:
-                ret = ((b[2] & 0x000000FF) << 16) + ((b[1] & 0x000000FF) << 8) + (b[0] & 0x000000FF);
-                break;
-            case 4:
-                ret = ((b[3] & 0x000000FF) << 24) + ((b[2] & 0x000000FF) << 16) + ((b[1] & 0x000000FF) << 8) + (b[0] & 0x000000FF);
-                break;
-            default:
-                ret = -1;
-                break;
-        }
-        return ret;
-    }
-
-    public static synchronized long dateTimeSecFromBuff(byte[] buff, int offset) {
-        return
-                new DateTime(
-                        2000 + intFromBuff(buff, offset, 1),
-                        intFromBuff(buff, offset + 1, 1),
-                        intFromBuff(buff, offset + 2, 1),
-                        intFromBuff(buff, offset + 3, 1),
-                        intFromBuff(buff, offset + 4, 1),
-                        intFromBuff(buff, offset + 5, 1)
-                ).getMillis();
-    }
-
-    protected static int intFromBuff(byte[] b, int srcStart, int srcLength) {
-        int ret;
-
-        switch (srcLength) {
-            case 1:
-                ret = b[DATA_START + srcStart + 0] & 0x000000FF;
-                break;
-            case 2:
-                ret = ((b[DATA_START + srcStart + 1] & 0x000000FF) << 8) + (b[DATA_START + srcStart + 0] & 0x000000FF);
-                break;
-            case 3:
-                ret = ((b[DATA_START + srcStart + 2] & 0x000000FF) << 16) + ((b[DATA_START + srcStart + 1] & 0x000000FF) << 8) + (b[DATA_START + srcStart + 0] & 0x000000FF);
-                break;
-            case 4:
-                ret = ((b[DATA_START + srcStart + 3] & 0x000000FF) << 24) + ((b[DATA_START + srcStart + 2] & 0x000000FF) << 16) + ((b[DATA_START + srcStart + 1] & 0x000000FF) << 8) + (b[DATA_START + srcStart + 0] & 0x000000FF);
-                break;
-            default:
-                ret = -1;
-                break;
-        }
-        return ret;
-    }
-
-    protected static int intFromBuffMsbLsb(byte[] b, int srcStart, int srcLength) {
-        int ret;
-
-        switch (srcLength) {
-            case 1:
-                ret = b[DATA_START + srcStart] & 0x000000FF;
-                break;
-            case 2:
-                ret = ((b[DATA_START + srcStart] & 0x000000FF) << 8) + (b[DATA_START + srcStart + 1] & 0x000000FF);
-                break;
-            case 3:
-                ret = ((b[DATA_START + srcStart] & 0x000000FF) << 16) + ((b[DATA_START + srcStart + 1] & 0x000000FF) << 8) + (b[DATA_START + srcStart + 2] & 0x000000FF);
-                break;
-            case 4:
-                ret = ((b[DATA_START + srcStart] & 0x000000FF) << 24) + ((b[DATA_START + srcStart + 1] & 0x000000FF) << 16) + ((b[DATA_START + srcStart + 2] & 0x000000FF) << 8) + (b[DATA_START + srcStart + 3] & 0x000000FF);
-                break;
-            default:
-                ret = -1;
-                break;
-        }
-        return ret;
-    }
-
-    @TargetApi(Build.VERSION_CODES.KITKAT)
-    public static String stringFromBuff(byte[] buff, int offset, int length) {
-        byte[] strbuff = new byte[length];
-        System.arraycopy(buff, offset, strbuff, 0, length);
-        return new String(strbuff, StandardCharsets.UTF_8);
-    }
-
-    public long dateFromBuff(byte[] buff, int offset) {
-        return
-                new DateTime(
-                        2000 + byteArrayToInt(getBytes(buff, offset, 1)),
-                        byteArrayToInt(getBytes(buff, offset + 1, 1)),
-                        byteArrayToInt(getBytes(buff, offset + 2, 1)),
-                        0,
-                        0
-                ).getMillis();
-    }
-
-    @TargetApi(Build.VERSION_CODES.KITKAT)
-
-    public static String asciiStringFromBuff(byte[] buff, int offset, int length) {
-        byte[] strbuff = new byte[length];
-        System.arraycopy(buff, offset, strbuff, 0, length);
-        return new String(strbuff, StandardCharsets.UTF_8);
-    }
-
-    public static String toHexString(byte[] buff) {
-        if (buff == null)
-            return "";
-
-        StringBuilder sb = new StringBuilder();
-
-        int count = 0;
-        for (byte element : buff) {
-            sb.append(String.format("%02X ", element));
-            if (++count % 4 == 0) sb.append(" ");
-        }
-
-        return sb.toString();
-    }
-
-    final private static char[] hexArray = "0123456789ABCDEF".toCharArray();
-
-    public static String bytesToHex(byte[] bytes) {
-        char[] hexChars = new char[bytes.length * 2];
-        for (int j = 0; j < bytes.length; j++) {
-            int v = bytes[j] & 0xFF;
-            hexChars[j * 2] = hexArray[v >>> 4];
-            hexChars[j * 2 + 1] = hexArray[v & 0x0F];
-        }
-        return new String(hexChars);
-    }
-
-    public static byte[] hexToBytes(String s) {
-        int len = s.length();
-        byte[] data = new byte[len / 2];
-        for (int i = 0; i < len; i += 2) {
-            data[i / 2] = (byte) ((Character.digit(s.charAt(i), 16) << 4)
-                    + Character.digit(s.charAt(i + 1), 16));
-        }
-        return data;
-    }
-
-    public static int ByteToInt(byte b) {
-        return b & 0x000000FF;
-    }
-
-}
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet.kt
new file mode 100644
index 0000000000..ba0e31ebb9
--- /dev/null
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet.kt
@@ -0,0 +1,157 @@
+package info.nightscout.androidaps.danars.comm
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.danars.encryption.BleEncryption
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.utils.DateUtil
+import org.joda.time.DateTime
+import java.nio.charset.StandardCharsets
+import javax.inject.Inject
+
+open class DanaRS_Packet(protected var injector: HasAndroidInjector) {
+
+    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var dateUtil: DateUtil
+
+    var isReceived = false
+        private set
+    var failed = false
+    var type = BleEncryption.DANAR_PACKET__TYPE_RESPONSE // most of the messages, should be changed for others
+        protected set
+    var opCode = 0
+        protected set
+
+    fun success(): Boolean = !failed
+
+    fun setReceived() {
+        isReceived = true
+    }
+
+    val command: Int
+        get() = (type and 0xFF shl 8) + (opCode and 0xFF)
+
+    open fun getRequestParams(): ByteArray = ByteArray(0)
+
+    fun getCommand(data: ByteArray): Int {
+        val type = byteArrayToInt(getBytes(data, TYPE_START, 1))
+        val opCode = byteArrayToInt(getBytes(data, OPCODE_START, 1))
+        return (type and 0xFF shl 8) + (opCode and 0xFF)
+    }
+
+    open fun handleMessage(data: ByteArray) {}
+    open fun handleMessageNotReceived() {
+        failed = true
+    }
+
+    open fun getFriendlyName(): String = "UNKNOWN_PACKET"
+
+    protected fun getBytes(data: ByteArray, srcStart: Int, srcLength: Int): ByteArray {
+        val ret = ByteArray(srcLength)
+        System.arraycopy(data, srcStart, ret, 0, srcLength)
+        return ret
+    }
+
+    fun dateFromBuff(buff: ByteArray, offset: Int): Long =
+        DateTime(
+            2000 + byteArrayToInt(getBytes(buff, offset, 1)),
+            byteArrayToInt(getBytes(buff, offset + 1, 1)),
+            byteArrayToInt(getBytes(buff, offset + 2, 1)),
+            0,
+            0
+        ).millis
+
+    protected fun byteArrayToInt(b: ByteArray): Int =
+        when (b.size) {
+            1    -> b[0].toInt() and 0xFF
+            2    -> (b[1].toInt() and 0xFF shl 8) + (b[0].toInt() and 0xFF)
+            3    -> (b[2].toInt() and 0xFF shl 16) + (b[1].toInt() and 0xFF shl 8) + (b[0].toInt() and 0xFF)
+            4    -> (b[3].toInt() and 0xFF shl 24) + (b[2].toInt() and 0xFF shl 16) + (b[1].toInt() and 0xFF shl 8) + (b[0].toInt() and 0xFF)
+            else -> -1
+        }
+
+    @Synchronized fun dateTimeSecFromBuff(buff: ByteArray, offset: Int): Long =
+        DateTime(
+            2000 + intFromBuff(buff, offset, 1),
+            intFromBuff(buff, offset + 1, 1),
+            intFromBuff(buff, offset + 2, 1),
+            intFromBuff(buff, offset + 3, 1),
+            intFromBuff(buff, offset + 4, 1),
+            intFromBuff(buff, offset + 5, 1)
+        ).millis
+
+    protected fun intFromBuff(b: ByteArray, srcStart: Int, srcLength: Int): Int =
+        when (srcLength) {
+            1    -> b[DATA_START + srcStart + 0].toInt() and 0xFF
+            2    -> (b[DATA_START + srcStart + 1].toInt() and 0xFF shl 8) + (b[DATA_START + srcStart + 0].toInt() and 0xFF)
+            3    -> (b[DATA_START + srcStart + 2].toInt() and 0xFF shl 16) + (b[DATA_START + srcStart + 1].toInt() and 0xFF shl 8) + (b[DATA_START + srcStart + 0].toInt() and 0xFF)
+            4    -> (b[DATA_START + srcStart + 3].toInt() and 0xFF shl 24) + (b[DATA_START + srcStart + 2].toInt() and 0xFF shl 16) + (b[DATA_START + srcStart + 1].toInt() and 0xFF shl 8) + (b[DATA_START + srcStart + 0].toInt() and 0xFF)
+            else -> -1
+        }
+
+    protected fun intFromBuffMsbLsb(b: ByteArray, srcStart: Int, srcLength: Int): Int =
+        when (srcLength) {
+            1    -> b[DATA_START + srcStart].toInt() and 0xFF
+            2    -> (b[DATA_START + srcStart].toInt() and 0xFF shl 8) + (b[DATA_START + srcStart + 1].toInt() and 0xFF)
+            3    -> (b[DATA_START + srcStart].toInt() and 0xFF shl 16) + (b[DATA_START + srcStart + 1].toInt() and 0xFF shl 8) + (b[DATA_START + srcStart + 2].toInt() and 0xFF)
+            4    -> (b[DATA_START + srcStart].toInt() and 0xFF shl 24) + (b[DATA_START + srcStart + 1].toInt() and 0xFF shl 16) + (b[DATA_START + srcStart + 2].toInt() and 0xFF shl 8) + (b[DATA_START + srcStart + 3].toInt() and 0xFF)
+            else -> -1
+        }
+
+    fun stringFromBuff(buff: ByteArray, offset: Int, length: Int): String {
+        val stringBuff = ByteArray(length)
+        System.arraycopy(buff, offset, stringBuff, 0, length)
+        return String(stringBuff, StandardCharsets.UTF_8)
+    }
+
+    companion object {
+
+        private const val TYPE_START = 0
+        private const val OPCODE_START = 1
+        const val DATA_START = 2
+
+        fun asciiStringFromBuff(buff: ByteArray, offset: Int, length: Int): String {
+            val stringBuff = ByteArray(length)
+            System.arraycopy(buff, offset, stringBuff, 0, length)
+            return String(stringBuff, StandardCharsets.UTF_8)
+        }
+
+        fun toHexString(buff: ByteArray?): String {
+            if (buff == null) return "null"
+            val sb = StringBuilder()
+            for ((count, element) in buff.withIndex()) {
+                sb.append(String.format("%02X ", element))
+                if ((count + 1) % 4 == 0) sb.append(" ")
+            }
+            return sb.toString()
+        }
+
+        @Suppress("SpellCheckingInspection")
+        private val hexArray = "0123456789ABCDEF".toCharArray()
+        fun bytesToHex(bytes: ByteArray): String {
+            val hexChars = CharArray(bytes.size * 2)
+            for (j in bytes.indices) {
+                val v: Int = bytes[j].toInt() and 0xFF
+                hexChars[j * 2] = hexArray[v ushr 4]
+                hexChars[j * 2 + 1] = hexArray[v and 0x0F]
+            }
+            return String(hexChars)
+        }
+
+        fun hexToBytes(s: String): ByteArray {
+            val len = s.length
+            val data = ByteArray(len / 2)
+            var i = 0
+            while (i < len) {
+                data[i / 2] = ((Character.digit(s[i], 16) shl 4)
+                    + Character.digit(s[i + 1], 16)).toByte()
+                i += 2
+            }
+            return data
+        }
+    }
+
+    init {
+        @Suppress("LeakingThis")
+        injector.androidInjector().inject(this)
+    }
+}
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt b/danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt
index 61c506d835..866eee6251 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt
@@ -18,6 +18,8 @@ import info.nightscout.androidaps.danars.encryption.BleEncryption
 import info.nightscout.androidaps.danars.encryption.EncryptionType
 import info.nightscout.androidaps.danars.events.EventDanaRSPairingSuccess
 import info.nightscout.androidaps.events.EventPumpStatusChanged
+import info.nightscout.androidaps.extensions.notify
+import info.nightscout.androidaps.extensions.waitMillis
 import info.nightscout.androidaps.interfaces.PumpSync
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
@@ -28,8 +30,6 @@ import info.nightscout.androidaps.plugins.general.overview.notifications.Notific
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.ToastUtils
-import info.nightscout.androidaps.extensions.notify
-import info.nightscout.androidaps.extensions.waitMillis
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import java.util.*
@@ -62,6 +62,8 @@ class BLEComm @Inject internal constructor(
 
         private const val PACKET_START_BYTE = 0xA5.toByte()
         private const val PACKET_END_BYTE = 0x5A.toByte()
+        private const val BLE5_PACKET_START_BYTE = 0xAA.toByte()
+        private const val BLE5_PACKET_END_BYTE = 0xEE.toByte()
     }
 
     private var scheduledDisconnection: ScheduledFuture<*>? = null
@@ -327,12 +329,8 @@ class BLEComm @Inject internal constructor(
 
     private fun addToReadBuffer(buffer: ByteArray) {
         //log.debug("addToReadBuffer " + DanaRS_Packet.toHexString(buffer));
-        if (buffer.isEmpty()) {
-            return
-        }
-        if (bufferLength == 1024) {
-            aapsLogger.debug(LTag.PUMPBTCOMM, "1024 XXXXXXXXXXXXXX")
-        }
+        if (buffer.isEmpty()) return
+
         synchronized(readBuffer) {
             // Append incoming data to input buffer
             System.arraycopy(buffer, 0, readBuffer, bufferLength, buffer.size)
@@ -343,7 +341,6 @@ class BLEComm @Inject internal constructor(
     @kotlin.ExperimentalStdlibApi
     private fun readDataParsing(receivedData: ByteArray) {
         //aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< readDataParsing " + DanaRS_Packet.toHexString(receivedData))
-        var startSignatureFound = false
         var packetIsValid = false
         var isProcessing: Boolean
         isProcessing = true
@@ -363,10 +360,11 @@ class BLEComm @Inject internal constructor(
         while (isProcessing) {
             var length = 0
             synchronized(readBuffer) {
-                // Find packet start [A5 A5]
+                // Find packet start [A5 A5] or [AA AA]
                 if (bufferLength >= 6) {
                     for (idxStartByte in 0 until bufferLength - 2) {
-                        if (readBuffer[idxStartByte] == PACKET_START_BYTE && readBuffer[idxStartByte + 1] == PACKET_START_BYTE) {
+                        if (readBuffer[idxStartByte] == PACKET_START_BYTE && readBuffer[idxStartByte + 1] == PACKET_START_BYTE ||
+                            readBuffer[idxStartByte] == BLE5_PACKET_START_BYTE && readBuffer[idxStartByte + 1] == BLE5_PACKET_START_BYTE) {
                             if (idxStartByte > 0) {
                                 // if buffer doesn't start with signature remove the leading trash
                                 aapsLogger.debug(LTag.PUMPBTCOMM, "Shifting the input buffer by $idxStartByte bytes")
@@ -374,29 +372,25 @@ class BLEComm @Inject internal constructor(
                                 bufferLength -= idxStartByte
                                 if (bufferLength < 0) bufferLength = 0
                             }
-                            startSignatureFound = true
+                            // A5 A5 LEN TYPE CODE PARAMS CHECKSUM1 CHECKSUM2 5A 5A    or
+                            // AA AA LEN TYPE CODE PARAMS CHECKSUM1 CHECKSUM2 EE EE
+                            //           ^---- LEN -----^
+                            // total packet length 2 + 1 + readBuffer[2] + 2 + 2
+                            length = readBuffer[2].toInt()
+                            // test if there is enough data loaded
+                            if (length + 7 > bufferLength)
+                                return
+                            // Verify packed end [5A 5A]
+                            if (readBuffer[length + 5] == PACKET_END_BYTE && readBuffer[length + 6] == PACKET_END_BYTE ||
+                                readBuffer[length + 5] == BLE5_PACKET_END_BYTE && readBuffer[length + 6] == BLE5_PACKET_END_BYTE) {
+                                packetIsValid = true
+                            } else {
+                                aapsLogger.error(LTag.PUMPBTCOMM, "Error in input data. Resetting buffer.")
+                                bufferLength = 0
+                            }
                             break
                         }
-                    }
-                }
-                // A5 A5 LEN TYPE CODE PARAMS CHECKSUM1 CHECKSUM2 5A 5A
-                //           ^---- LEN -----^
-                // total packet length 2 + 1 + readBuffer[2] + 2 + 2
-                if (startSignatureFound) {
-                    length = readBuffer[2].toInt()
-                    // test if there is enough data loaded
-                    if (length + 7 > bufferLength) return
-                    // Verify packed end [5A 5A]
-                    if (readBuffer[length + 5] == PACKET_END_BYTE && readBuffer[length + 6] == PACKET_END_BYTE) {
-                        packetIsValid = true
-                    } else if (readBuffer[length + 5] == readBuffer[length + 6]) {
-                        // BLE5
-                        packetIsValid = true
-                        readBuffer[length + 5] = PACKET_END_BYTE
-                        readBuffer[length + 6] = PACKET_END_BYTE
-                    } else {
-                        aapsLogger.error(LTag.PUMPBTCOMM, "Error in input data. Resetting buffer.")
-                        bufferLength = 0
+                        break
                     }
                 }
             }
@@ -414,9 +408,11 @@ class BLEComm @Inject internal constructor(
                 bufferLength -= length + 7
                 // now we have encrypted packet in inputBuffer
 
-                //aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< PROCESSING: " + DanaRS_Packet.toHexString(inputBuffer))
+                val decrypted = bleEncryption.getDecryptedPacket(inputBuffer)
+                //aapsLogger.debug(LTag.PUMPBTCOMM, "XXXXXX <<<<< PROCESSING: " + DanaRS_Packet.toHexString(inputBuffer))
+                //aapsLogger.debug(LTag.PUMPBTCOMM, "XXXXXY <<<<< PROCESSING: " + DanaRS_Packet.toHexString(decrypted))
                 // decrypt the packet
-                bleEncryption.getDecryptedPacket(inputBuffer)?.let { decryptedBuffer ->
+                decrypted?.let { decryptedBuffer ->
                     if (decryptedBuffer[0] == BleEncryption.DANAR_PACKET__TYPE_ENCRYPTION_RESPONSE.toByte()) {
                         when (decryptedBuffer[1]) {
                             // 1st packet exchange
@@ -450,8 +446,9 @@ class BLEComm @Inject internal constructor(
                         // Retrieve message code from received buffer and last message sent
                         processMessage(decryptedBuffer)
                     }
-                } ?: throw IllegalStateException("Null decryptedInputBuffer")
-                startSignatureFound = false
+                }
+                if (decrypted == null)
+                    throw IllegalStateException("Null decryptedInputBuffer")
                 packetIsValid = false
                 if (bufferLength < 6) {
                     // stop the loop
@@ -722,8 +719,8 @@ class BLEComm @Inject internal constructor(
         encryptedCommandSent = true
         processedMessage = message
         val command = byteArrayOf(message.type.toByte(), message.opCode.toByte())
-        val params = message.requestParams
-        aapsLogger.debug(LTag.PUMPBTCOMM, ">>>>> " + message.friendlyName + " " + DanaRS_Packet.toHexString(command) + " " + DanaRS_Packet.toHexString(params))
+        val params = message.getRequestParams()
+        aapsLogger.debug(LTag.PUMPBTCOMM, ">>>>> " + message.getFriendlyName() + " " + DanaRS_Packet.toHexString(command) + " " + DanaRS_Packet.toHexString(params))
         var bytes = bleEncryption.getEncryptedPacket(message.opCode, params, null)
         // aapsLogger.debug(LTag.PUMPBTCOMM, ">>>>> " + DanaRS_Packet.toHexString(bytes))
         if (encryption != EncryptionType.ENCRYPTION_DEFAULT)
@@ -783,7 +780,7 @@ class BLEComm @Inject internal constructor(
 
         //SystemClock.sleep(200);
         if (!message.isReceived) {
-            aapsLogger.warn(LTag.PUMPBTCOMM, "Reply not received " + message.friendlyName)
+            aapsLogger.warn(LTag.PUMPBTCOMM, "Reply not received " + message.getFriendlyName())
             message.handleMessageNotReceived()
         }
         // verify encryption for v3
@@ -803,7 +800,7 @@ class BLEComm @Inject internal constructor(
             danaRSMessageHashTable.findMessage(receivedCommand)
         }
         if (message != null) {
-            aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + message.friendlyName + " " + DanaRS_Packet.toHexString(decryptedBuffer))
+            aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + message.getFriendlyName() + " " + DanaRS_Packet.toHexString(decryptedBuffer))
             // process received data
             message.handleMessage(decryptedBuffer)
             message.setReceived()
diff --git a/danars/src/main/jniLibs/arm64-v8a/libBleEncryption.so b/danars/src/main/jniLibs/arm64-v8a/libBleEncryption.so
index 7c0c49b7e8aa0a11be777b6cad2624200c37989d..baf90143284bf75740351f28416241fa26698748 100644
GIT binary patch
delta 3775
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

delta 4302
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

diff --git a/danars/src/main/jniLibs/armeabi-v7a/libBleEncryption.so b/danars/src/main/jniLibs/armeabi-v7a/libBleEncryption.so
index 4778aca663f1d0bbc3674de53b4fcf25ea02f2ca..f5daf1449d693d9be3843e36ac13b3e9318e9e98 100644
GIT binary patch
delta 8481
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

delta 8802
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
KX*smcNBD0kPRmpP

diff --git a/danars/src/main/jniLibs/x86/libBleEncryption.so b/danars/src/main/jniLibs/x86/libBleEncryption.so
index e5ef3a17a49bcbc8d0c88fe2450c6e9bc0ab3b2f..b63dd5a2344d76a4cf40b9f74dfe441de32bb97b 100644
GIT binary patch
delta 6218
zcmb_g3sh8P9{=uTpaFqF7;%&l2=IYoJX2GApbifc6?L>ythUG2=BAyr+}+rL25N>Y
zyW{@p9DD3pd#ttRSW(Qf)*;sfAFEcBR8;7aQjJBWWu@hI_xHc|&H!rJcJ|Ks=Kp=)
z|Ns5p-*d~e(w1i>-;L9sDiMN9xWE@Dgaoj00m>@9bjw0ShY1m3;L#L~z&8TlxarZ!
zQGLZi=w;K<Nkaz?T?bz4C{t>-_APzzweXa`nH%@M^TMl+JvTi)>&<`A32D~Qec&AY
z;!!zF6>`GFEi;AKg~9P6M%=>a2|~OI!0m;AYm0=~W8gobO>%;(I$wy#42o~SbMy6R
z;ENL{)kgt)#tN~@7_k~Kbt+VY$;|OJ&~M2Q!ffE%VB&Q{g}4Ia7;gu@I$DU2jP^dz
zZ2^8N6lVPGVIo%aqzln(5cE=RSb}R-rVw`+JtM#}r$C4g4Uy~7UK=BXYT%n8Vr?vF
z3>A_9J7DzFm*^sDLAQ210%FkL%_<>ST}FF5;7-WfX0-npCKALJOFzMr7|=Aj`K_=G
zVf2ej_Dc~o(LAAuV+sk{XU2aN3Jet(C}3ddvl_KwfHss7C`l-z=t1)@i;_`eOae;q
zV@|_Sw5$Rgi82bsgc6AYb;J-9j(IFqNW)$5h6u_*Rr^>s)+eY7%jA!BU>#ZKL=<>a
z(+NP!Uxr$~0>Vq7&#u*E(Ca@5)W(kvM~<eRNHax86}UL}nYYh?;yS&(^IG@|!rB=k
zMEe-Rl!FXmZU;k{+Q|^6bumO(yBWg#9)>WemmypcU<jl87{a&{3`fAVr?>*^Pcwus
z&ob0}*?c4_UP@Zx?lTA2m=!f`pDYog!95=huPGyNl#-&0q=%_8I%WCqfN}SkbYz3F
za+|6yQrBhJDgt+Xud42L+ln^dKu%YJK5(0cGOuX6+1IdcjBt8CSh9SXyRT3acU8^K
zF-z!B^evK~3S+Xb+72gJb~tSA)52265mYMs0^9zhs>eAQ>K!(vyw6k93M%h`z!T_K
z94FlEg{!VzQQ7AGx}kL}sLmHLX)z_lUgO${VM-1ETUvxWkaOG4C}or0Tr9ai&XGFm
zYo$eC;Hhb6(jZO-?zT6gl;?EXyTaU`<w#%D*ACTbcMqgBokJVmPYZW@YWC2{*d*7q
z3amHPY=%%geodiBON);?a`$@<c{Xz`h$)i{loUc)T0Bhg@)?u+eT#v8`KYPp=m~I)
zeBE>491ike=B|O<!wg*J&*p9#%pJ@xqMz$L1;fu{fq-(V1hZrae0>qF{Y<qiY6*Ju
ze7CtS>NlN3$n*U{`5$#C3wplayD-e<Yw(Xjq_j*8S~vk4k>W7~2Zx=n`~O3A*F~~s
zu>bm1|B1%K!T|>IWRD9PS%QsTDUXR$oYBg9vr-l3-M)_!;&bJ&1ymfbj5u(b*O54F
z`tw4)*U`s*I$lN}$6qQvO3?{6=^%|x@JSuilCWHQmSU|dhj$?5AjE6W@Gi|TdGE<E
zd%p~ne?v9anvpqJ*K4Y*9pGZAy9{fqQfF3Gb#L`SvJcxTbyC}~v2kB~rHNJk%qXwB
zlfE6cc9_A{vf~SHL56oe7`Fv(Cs$$?25n1xL|R8>!+$__{3*yDMz0TFEq^tHX4-~B
z>E*U+=>zJrtxOE6Yt^~x>bhy(h<k_MjJ4TaWtA*-r?D;ct9oq2z0$tsn@6saq|>xJ
z>822mK_)lQEc+j%8|gJWdnsVwEEj%8_l~+VL_J92E*g^DC=qQ*X6hG`H%qtC;*@n4
zCO%2sDUH&u<~veNvRrbU?oPXNM$nEyI=m9lUHJgJ()}WzZQytx{*}5cbSVvtP&ReZ
z#`KYiFB;T?P~D7@9-_O`v*q6gs4IPg<e`d;@vd5IC6+quf8fRShMP`lE59DMK*UGr
zY615A9bnHij43zLu3>xaF@(9QPpL91m2uv}4DU*guGi7yE${X^yS(c=1HS>Y+<$o;
z0mWffgi`&4Ea>ZuJbCU%G=6l695IdV9K9r!T>$g={IJ)Q!3PkfvL}%9AuO!y@wz+c
z!_j$2)e&Rt_@6YUR60YhF%L=mXyn+Lm$GjV>1rP3IOX1cP-9jb7i!aQ$F9++<R7Jq
z8uz5Mr}_DDrIPd*eV4g$ludEODdo|M)9kK_6R^Qs-s^StSn7Dkr}xIYC)!qFk_NY9
zOi=4NBl^7M0k5;y7;#|24R-6m5j>}}f^&Ln0WHZIYtndc&AOLPWSWzD0`dP=)ti06
z-Ts~+@mu+{WMb)v_m5n7o)01a#Oqyy9MPmZ29C<o9Mh|m2NY+M@_aD;O!_ohhgp9p
zuu^Ay{JEb%o1@bz4u~-FbUhC%b%bPeAtb!A43d!<92X+%z7Sdb5qkf!(eihPDLeZb
zsgdflN8$ge?Bt=1;Ad%hofj*mvMKOoH(9JU`aFAUicfLuoaSh?G^7Xh-|2oitlnxy
zzf$faf6i=aBYl%IHs5F2VRoNEV%(`wqFE}r&vaPoZV0ty_Zj3S&R|F{nAk%VxwdOu
z@9FcivdQc2f!aVRo=#NihbkWK@BnJ<3d!g|#Ss$spAdV9d&5%qX^?#<v(Jecz@E8a
zWPPcu#fzJs*!t2i<$0~TKytsR=`>^ayFW*#a$kLgtTc7d^?3=dT7yNo&r>AV7lkS7
zo0J_!hFErV@z!t;=J=O^6$1#v2H15}S5|i;lI;zxZDa=8bAxvJfq+}nf^FU`#V;&%
zeDi=av9X|o`;Kep*I*A{DUSaJ{h@S2>~MqA+kCPF(;wqO&iwow=FObk+c`5ag6~R5
zP%J)tKjCbe{!YI$yJ&m9J<3;aMFg9arY<^?Z<o3`P%&?I^^<i|YJq)Wh>WvYsq%ZQ
zGZcs4y;Jf!{KsG6MVnKFk(QRonv?fKo@c+_!8xNN$|U#67_FO>f}$Zl<aivk@;W^9
zcEPxuT1%a_NIGgmYd2KB;cYD3cZF8%(8@9<i}EkeHva{yb;EPd9HU=dez$zr1Uh#4
z<5)rOpVWv;gMG4HZk6cuDGoHMCy&Jc!;|OPIY^e4#Yh7z^1YTF_8FOnJnwj-XDB{D
zNmJ&5Z2pv_;#RgaM3NgK(MHExS{md0?A0HlSd5c7Na)BFi7|#m9Nf4^nmUp`o|2Ul
z)Z^l;aELyK70$%{tnwmsb*O$y8kA>=`YCO3NMefAN|#Pef@`KveL!lbLsJ(@yQyee
z!VtrDoU!+y?UU~tO^2qnfUv$WDOP902i1*czo4}<lSrK&0U5uZZjZnj8olJ3UL32N
zQU<LIx?zTOWl){F20AM9fahJ#ALDXUhD*jdeEQ`L%QjfUn-}2|QpXCJo>rPQBN2)&
zpAigrnQ1_*LMqTp{RHv_3DRd?3FobunYdh6CGtF~dgn2Zc0W7*CpOg4t#28a!&Q14
z`tS>q;_Oq_BjF13yx-*>;FQaQ+jmp<%o4es^E82`%o+vPFPl|m<wuNxth6n3Q-Pi8
zrsXAT2bqR{f+RFCLdWQcRB9{Agz29a*`avU>|)d_W^?who*i@sXFrbEC(g<KH)eD8
zkD8N&fmh7oq`7*|6nRoI(VR&(eL@6B!2lzQ^!^+kl{J?|l*|o^D1$pMK>V~uwr}pd
zq`~}*tf+T>4qwtlM-s&r&!R=eso{Zrs`?Stlvu5YqfPv#lYzoZZqvW8@GxTNS2`jU
zovTqi`)OBkn%sDRqDqn@IQteIL^Vy0euXY8NxN(uRxEx{6GgG+I(c?Xc-ej7_nX{d
zVQKMTR1_U<)`g5i&<g)ezb_dR-iafNnNF4@P-{t?+}cC0mL$sukJ4u)<7LrHBTJLZ
zuj^ISZD1PW>bMU)<;PjKRCJrMIQM~O<M}jhrWuF+EYMu_fvUdBX4zUp+GxnDfIJK2
z)AU@a)%NfuAuKzj7Rc&PRrN8=A)A?@Zp1bq%%9Qtvb5YzR6D*@Rep>NX<2O8{;P0p
z4D&h*x^ZVzbr%e_(ye8d@Q!a)70(lhL8}xZn~xh)piNcd=&xlHT<xfJA|Q>sRrQIp
zs#?28RSz=UtE#5}{RpECuQH8@S|Q-N{i=E$pdYXn@Km>|HgWr~s&)ak<0K`%M}Lp1
zrUEWKs;ct=I{{Y%@;TiHXoXAt->bQ5FDgCgXzWwfXecrl-Y5VpfW<2T{kT8Y0@lJ7
zyiTdjHS;bpHT&irk+Y)lqKUl+_6R>-zhJ(oM&U=rEZn-Rfcz}T#Y%r)kbQLrNcq_@
z4_^N2dv%Qo8N&|m0z}e?v%oWqKqo_fp<-w?+I9nG0`i@O9~*hbZ=~r9Q!af3ua@xG
znl3<iVhxXkVQWsI4aL_;c*M+4<VW$~w+G6+h4Nt(y|{4F^NZ{zsfR`_O^IYhx#W>!
zX-c@JCf&L;J(3mW(oPS6iUo2hq?eYaM6lSdNIJSSErKPUiliuKTDX-RLAlQKNOlRA
zYN~XmL^h$uC64NxDN*c3E*mD(GtT6wDRYG2GE>l7&g6&<sBV};-#XJG^jCaJTb35C
iz5Y|#vh;B6ouBSNjl<xl2bZNsYBjun%%|PU-uo}rJ~@H_

delta 6795
zcmb_h3sh9sx!&h6;DF#DAfgO!d?2VO;uDckhJcayM6J(QHPzON^^wF?xdRTQGaR^U
za<?|ztmIxzTuE<NRx<`KomfkWP*F53G2WCU*o#WcsAGaAHJWP9{r>Y95KNPM*FCfL
z`S;%c```cBuQ~LlaOh3JwP|+we8#8*GCbjo2>^~KP}ZrXOGI}7V?i1oP38jL1-$F|
z!_z`qiWpPN^OvU%?aTTsWIfB%g!-soMt?K!W?f{_l`Vfrd3?m+oiUeQI>~#4yrk`r
ztUnQ`boOiC;ubM-yxYRqNeGKzVQdSi@-i5^14!+KfaUWTJEh@eULi)>60;e5MWYyO
zV61Kf8hFClE%`9up|Omu(>S&PHqBz}DndXKufT>UM=@s9@Xc_!XDDMcz(;s9@J*qN
zWo!7;fSE9UI|||V2e2XRP%2~f8pB<l6cA}+;~4vy)-wVk+hL-vat}py2xGE_Z>2Dp
zAXZZm3z#>au@48SDk_2Ak<M7NMlXRr942;XZ4Y2M^j*=~uLiJ4mWk2T34RBL9i!_{
z1w0!NxqkhI?VEO%Zr!wgTj`J1@7TF@`))pa&{<&+4>qP-pph9-=m|y{j1q<dVeq#1
z8KzaE0Y{*WL@}ep^F78NSrSkqOcaX#kfazCC9?oyQQ}c36GKp7B14#AIby*V3&U;j
zkfOwNU8pJ#*+(|%_K;qB$PTiT>>iFnQ6{_SK}3~@{G$g+;(y|lnh1L0ptnFj{@dWR
z0Pyj@1kbk7_d$AVG{~M*+b7mDHVAA@1VP+F5U!ji2qotT!tHi~aQOm3xY$7uL*7Xc
zVdx?Vr@9FuBwm7W+(*#N5?Bva;LVo=VaZ*Bi0OTTLG`~0i4fA|R~Nv<E#-J!>-t8P
zm)d<sFB)uhMf2-R8LPD~Lc?iD^`7S+54H#^cwA`0ifO>ueFha-D;;`6mKVvpQ)3o;
zpMnf~OU&wKS6@kkK<{0xpp2`VpK{gi9?eRepDbOm-0oYTs9Ralba@Hqp<4tGzaKi$
zb^?JhHCkircbTaQ-vN`XzFJ4!C$e1YdJXSZLn>v3b3v-Xxh&P_Z1&n7$g;H7=d?C?
zD^a~hA7dY;W-wK+jd9d9LGnOui_U$*yByUt$=YLYS+H*X>b1>eZ0(6L5a+i!N4NQv
z#oQjY%GLszQU$$D4b1M%{7F-Y^t{?!BG|8I3hmXE!ZHYORM1@D$BDrG<a~&9RHc17
z!2VgLaJ#y4s7iaLFRh^;ZD21g2H#Q9#y1R!wY`qvI#o_SGRfgl3<@?ixTs@No8x`e
zeH~LIXehytGBr4e_MLkM`z4cxedn^F;&Klp2EXSx+fRb{uy7lA{n7(8T-yIxy5V8z
ziaY<%KHC5T0|$t}kW%jHL--8VhwtsRl9mm6L<fe=_MLH4CHN!XJ1GB48;bPE_eK|v
z*<7{9Mq{LuOw~Pn0gJKZ&=l)z18x8RFx~bYS@UrGdQJbH&cnk#4$|xqt~*&@3@3}j
z!ljZ>X^&AV3wL_Xar@9oVremN7%GkU`CXcr!j<`i){IuGkK%N#jIWAF5*G7)5ivqL
zKN#T>F7VNjD}?p@pCZ=`zkrm35~n#8vy8#H4>Qdd-UoO1t;mXzn=ltwltr~eim7S>
zCUB|BC}U<SZ|5~puL&JIYuK3ZSN^7`m0l*4)84^<JZ#4>O{%H!wsT6VGKDpJ<N4>q
zGQebxeo08>Z%2QN?vr0Y_b_f5zD-OE<!=rj4x?L#mkS4ZVa%Fn-P|Zus%mZ)KOVDx
z_={LD?PXDdsp>A)o?cUzj@U1ptN&ocIzjjq&yL;fm+_Fxv$;F=pM^R;$4pULX|5A}
zH~DSzE<g1{8h7%a#~lz_d3Zcgr^VL^vHWEG?ne_J<_i)I2zTl)B^X5UD=+^vX_rm+
z;~^W$ylN;9QYh`m&tYf~_!hiXZ}jEi3TAqY*}yrz^HWtoZ3YBLiWup|PIZK(|E$CE
zqz%Uq=Nb(3`_3u{`n*&5mE?(&qc!bS3Ue*lAU)sRpE+M!j?Q}Te9EIzo)s#2ZOS-X
zIpmnCXk#K(QN4Eam&($jriFLsRat(@r7wv7#YM!HQ!3Uny4JG}RL(M=RA!XchC6do
zVWh#??6h_{i#weq9nL)$y!Svd>5S9rm8?dIN##dqs7s7|X6gj7<tqPi>SN;EnY=!A
zX(B}!(WBiJ0!14wX>FI+jnDx)?f3>pO~#k-gHdL@pB_~xWb;3adQmvXSB;*NM4?9_
zl@pisOS`9C5mp)QZ}a1$OBE{dA5zU9^SU6`-yTya2oZc%TFtUd{cBFalJ9rjUKY;a
zle4(nS<>a)(`l+2uW0h>BOVR62M%{(7vg2@;N59<F>@VvrAE<&;a8D0Wq=Bwv)Jn_
z>2~hv(pC8P9O;i#vGTu3MJGQnZlkIqN&I0Jk4ztvp<39bTUhW&_Oibcdpplf-=ChN
zCIklIql-w8r~7X?_UWPd;beX#y>P@)P(5lso5u4qHrO5-5w|)*7_kf`ZrxI`S1NH!
zZ|R?zL7gskQ__1gRKeFSeh*rv(n?mS(7wmR#8zx|>z?2Jwy$w>r}{M(cS|K+X{}qT
z*FHsOs5;q_Io1Q-cRTsE@uSijG;*uodhO%G-c*@FRqOw~lk@Sb1Q-8od>r1P6XJ)u
zKw)Zlk0x-a@xJgew?)SAr4wEgYWUX^;_!}{I9G7+)f2~L)tDNM_It?MU5fW;77F%z
z?WU@Y{<dhphYtrETI4?5?&hVLF{@HOQk_}rcG}4<pd?2JD%C?J2X#0AmG)vm>p;co
zSNFg#9_r4Us&4AyJ4k%y(GPpYlN4}P7mCUlQqwV{x-dX`OQ}8~*pDkV*|zp!`u;W*
z*HkYSCAXFurpB*nrrAw1jd!dju(-xy5vwf$(jK?e=qK!;MRFeqzwpW(FxS=+E)iuw
zA2%<nwyRM^KAu<FTJoTsue<F50#Q!Z+q7>$n~rY?EtXicsq0!;-yY0%?Al)R)5uIw
zG7>|H?_BBdw0yS^{`RD-OcG9_>>kQUsHHP!?}|c6bm=d>1JcROlg&vr)lnEwx8x=s
zsm$Yu%9X4hdz0X_dak{T)q=k{F+OW=AHFUSwpx!tHWub%qNz3wHOYF+-eg4Jba7q$
z*OSd@L~CjYuDJCJ&^X#82X#<RsfZ%Mek)Ar=ATct46Z@0hr>*#wUW=u8at)jRHe-D
z)^h*C10TNnFU&K&yG5EDGxSMj|2WRGCK~r*+NwS3xXRnIo)OQd@p)5T#S-x8lmj@W
z?aMZcO#+`Z&B{&FgZL-e!_fKn?D^D+UV`MnO4V&@H0P$h@A%LWnk%_He8W@)&5urv
zCSLRO*q{hg!+~%QkDZ<j_FUz?Vfsiue_93!8ngt52o)a}gwp_3bEn4zVOLL8jdCKT
zhp9moMM3oIo}}wmDVE^Cql$<Q(|WKURwX3}O}t`yEc|<U`a$6|&ziANIKvOmh#agr
zfP+LE+Ai^O3eTF^0K)4tV~40>Xg6MC^f2B&dzfYoZSkqAuQ_RF9UoC*Xq$1IBS67>
zW)%#fgf}%5!7p7*rq%_ozg3Jzf*AFa)5jb>c2+1tn>{ND@19vvkmqRPhjOCP{B6#B
zv#zF3&~z(3JZ`q1Kzt;DefHys+n;AguTbR#51^_px#CdHpV$6H$?r~eslbO>rnX^E
z8@!iFe9|5yOwMHI-zS}=l$nf(pW!*VkBO%#&mwtUZXBZCkXtssrk|*1l(x^*$n1B2
zZK|T{8Jzu1jd=pv{KMSjX`h*@GSyzGxW|4?Ff|&C_Pgk%>mJZ5z2Yf@ah2W>sKL+7
zSU=c*$haNH>*u5)a2My8;r7>a3Q)J?jl_FRo*pU6eH=h~`sMz~y!jvtv&4ci%|h8$
zWSK4|o4MUGHKvII;OBz-YMOZXdlup{&m|Sp=ISbnFc`XuKEy98WS+V6V;`2MrCoK&
z=NJhdH!n7O?zYX=?HhOQ-LZRX>2|hj<F3S+GiN4l-M)4A)(zX1;I^;yr%U&4-}w0E
zy?*4T&3wb4Xq)d~<qgSk<3Eli`d)bBy2p*i9OirZ*!83C#GCeV1#!@E!&P^q`oN7^
z_nbL%7`lD`RtXxgJm>r6G2e>^Ca@cCSKe@!-+0S$v(9tfUEUXUv*uU6>LWMzAL-Y>
zb^BALJZD}Ge|lbW;G$EqoXy|MkBkUN7eWoVH%rAp(gL!jm7kn9TFg7mug^;s7o6ck
z@{>hl8$di?ly4AQ+W7MP<OyAEvP>7U%reASCC&{CEP5{R7Y2Jk!14%)vxEj3Rgq&c
zG^rQ)Yx$$a6BqfP0FL~X-^q^;Jcj+{I<kOgSfgy-OR`Ltw|;TrPZg^Y(M79o;bmFA
z(id-i4$8!jh=^#6SaG7R$a3>Qn&U(>7X2BZX#x%1Z2R>TC}z(K5WD?mE5s{7e4tyF
z=|;F8aX>)pAU`pMtrE0_J}wrF7TbM%96;S|faKu&Ks<?)^GU@|S3$U7<cAB!1m?XX
z%ZdEmf^?f1wF_9@?w^$9Bll%Fr$v^}5&WYpe+jq^;}r8imKU_54>04jEI$dj4Uq2X
zI<a$d1HSaJEO!9Dfqfps5vdb<<3zw5M0o+=3BYZDZy?Stz<r44v2Wx_@;(Hl3mt22
z$Z{wQ3H8bH6f)=*`T%`jK@s4Idte5vKl+%_Fg}m&08nsjXKvhw!cXQvp-bSEI4Va0
z(q%H0JpT3*6MxVJQo3|5K&t)i8@Y5W@&i?N9}wfq!qFf&QiGAGQ+uq|&eY&+KspK1
zWj4({4sKbPkko=3Xhf^j02PQrDRIK7(nPdjbg6*r?W_>`OGSNn+rp_~r?9GjfN~Y(
zPW^+02?n8u$1O_;CR?c#aO<*!K(cf!-?}U%m~5qTnjZue>7<g&f4?jth%_5Q_~m8E
zL8LS>gol(Q2j-!g$0wDf1XEO~IQZHUXh4lhBCje*2vKg~5zWFG{5K`>A%#{{Q33`2
zK}mejq5{Si74WZ1l7rO0fq3%r<Ur-`BVM#TB~baJi2n>V8VNW5*X1d}N)0!2i})Xx
GfBZk=)KP)}

diff --git a/danars/src/main/jniLibs/x86_64/libBleEncryption.so b/danars/src/main/jniLibs/x86_64/libBleEncryption.so
index e4c02d8842ec29409e009d2a087df710386175a9..871e79aad523b93a3492707a7faa9d91cd22b1b5 100644
GIT binary patch
delta 6673
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

delta 7078
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

diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsMessageHashTableTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsMessageHashTableTest.kt
index 98c90be4ac..46e6a328e3 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsMessageHashTableTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsMessageHashTableTest.kt
@@ -49,6 +49,6 @@ class DanaRsMessageHashTableTest : DanaRSTestBase() {
         val danaRSMessageHashTable = DanaRSMessageHashTable(packetInjector)
         val forTesting: DanaRS_Packet = DanaRS_Packet_APS_Set_Event_History(packetInjector, info.nightscout.androidaps.dana.DanaPump.CARBS, 0, 0, 0)
         val testPacket: DanaRS_Packet = danaRSMessageHashTable.findMessage(forTesting.command)
-        Assert.assertEquals(BleEncryption.DANAR_PACKET__OPCODE__APS_SET_EVENT_HISTORY.toLong(), testPacket.getOpCode().toLong())
+        Assert.assertEquals(BleEncryption.DANAR_PACKET__OPCODE__APS_SET_EVENT_HISTORY.toLong(), testPacket.opCode.toLong())
     }
 }
\ No newline at end of file