diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/KeyExchange.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/KeyExchange.kt index 5f36fcf5c9..90130a29f0 100644 --- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/KeyExchange.kt +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/KeyExchange.kt @@ -2,7 +2,6 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.pair import com.google.crypto.tink.subtle.X25519 import info.nightscout.androidaps.logging.AAPSLogger -import info.nightscout.androidaps.logging.AAPSLoggerTest import info.nightscout.androidaps.logging.LTag import info.nightscout.androidaps.plugins.pump.omnipod.dash.BuildConfig import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.MessageIOException @@ -12,10 +11,11 @@ import org.spongycastle.crypto.macs.CMac import org.spongycastle.crypto.params.KeyParameter import java.security.SecureRandom -class KeyExchange(private val aapsLogger: AAPSLogger, - var pdmPrivate: ByteArray = X25519.generatePrivateKey(), - val pdmNonce: ByteArray = ByteArray(NONCE_SIZE) - ) { +class KeyExchange( + private val aapsLogger: AAPSLogger, + var pdmPrivate: ByteArray = X25519.generatePrivateKey(), + val pdmNonce: ByteArray = ByteArray(NONCE_SIZE) +) { val pdmPublic = X25519.publicFromPrivate(pdmPrivate) var podPublic = ByteArray(PUBLIC_KEY_SIZE) diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessagePacketTest.kt b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessagePacketTest.kt index 8e1afae115..519f06fa9e 100644 --- a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessagePacketTest.kt +++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessagePacketTest.kt @@ -1,9 +1,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message -import android.app.Notification import com.google.crypto.tink.subtle.Hex import info.nightscout.androidaps.logging.AAPSLoggerTest -import info.nightscout.androidaps.logging.LTag import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.Id import info.nightscout.androidaps.utils.extensions.toHex import org.junit.Assert.* @@ -32,24 +30,24 @@ class MessagePacketTest { assertEquals(msg.sas, true) assertEquals(msg.tfs, false) assertEquals(msg.version, 0.toShort()) - assertEquals(msg.payload.toHex(), payload.substring(32, payload.length) ) + assertEquals(msg.payload.toHex(), payload.substring(32, payload.length)) } @Test fun testSerializeMessagePacket() { val msg = MessagePacket( type = MessageType.ENCRYPTED, source = Id.fromLong(136326824), - destination = Id.fromLong(136326825), + destination = Id.fromLong(136326825), sequenceNumber = 7.toByte(), ackNumber = 0.toByte(), - eqos = 1.toShort(), - priority = false, - lastMessage = false, - gateway = false, + eqos = 1.toShort(), + priority = false, + lastMessage = false, + gateway = false, sas = true, tfs = false, - payload = Hex.decode(payload.substring(32, payload.length)) + payload = Hex.decode(payload.substring(32, payload.length)) ) assertEquals(msg.asByteArray().toHex(), payload) } -} \ No newline at end of file +} diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadJoinerTest.kt b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadJoinerTest.kt index 8989791512..5ceed4dd49 100644 --- a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadJoinerTest.kt +++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadJoinerTest.kt @@ -18,5 +18,3 @@ class PayloadJoinerTest { assertEquals(payload, actual.toHex()) } } - - diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadSplitJoinTest.kt b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadSplitJoinTest.kt index b1460fdb80..6eecdf780f 100644 --- a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadSplitJoinTest.kt +++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadSplitJoinTest.kt @@ -23,4 +23,4 @@ class PayloadSplitJoinTest { assertEquals(got.toHex(), payload.toHex()) } } -} \ No newline at end of file +} diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadSplitterTest.kt b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadSplitterTest.kt index de6e570134..8d046c0439 100644 --- a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadSplitterTest.kt +++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadSplitterTest.kt @@ -10,15 +10,15 @@ class PayloadSplitterTest { @Test fun testSplitter() { val f1 = "00,01,54,57,10,23,03,00,00,c0,ff,ff,ff,fe,08,20,2e,a8,50,30".replace(",", "") val f2 = "01,04,bc,20,1f,f6,3d,00,01,a5,ff,ff,ff,fe,08,20,2e,a8,50,30".replace(",", "") - val payload = Hex.decode("54,57,10,23,03,00,00,c0,ff,ff,ff,fe,08,20,2e,a8,50,30,3d,00,01,a5".replace(",","")) + val payload = Hex.decode("54,57,10,23,03,00,00,c0,ff,ff,ff,fe,08,20,2e,a8,50,30,3d,00,01,a5".replace(",", "")) val splitter = PayloadSplitter(payload) val packets = splitter.splitInPackets() assertEquals(packets.size, 2) assertEquals(f1, packets.get(0).asByteArray().toHex()) - val p2 = packets.get(1).asByteArray() + val p2 = packets.get(1).asByteArray() assertTrue(p2.size >= 10) - assertEquals(f2.subSequence(0, 20),p2.copyOfRange(0, 10).toHex()) + assertEquals(f2.subSequence(0, 20), p2.copyOfRange(0, 10).toHex()) } -} \ No newline at end of file +} diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/StringLengthPrefixEncodingTest.kt b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/StringLengthPrefixEncodingTest.kt index 03800217b1..96bce14845 100644 --- a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/StringLengthPrefixEncodingTest.kt +++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/StringLengthPrefixEncodingTest.kt @@ -6,7 +6,7 @@ import org.junit.Assert.* import org.junit.Test class StringLengthPrefixEncodingTest { - private val p0Payload = Hex.decode("50,30,3d,00,01,a5".replace(",","")) // from logs + private val p0Payload = Hex.decode("50,30,3d,00,01,a5".replace(",", "")) // from logs private val p0Content = Hex.decode("a5") @Test fun testFormatKeysP0() { @@ -19,4 +19,4 @@ class StringLengthPrefixEncodingTest { assertEquals(parsed.size, 1) assertEquals(parsed[0].toHex(), p0Content.toHex()) } -} \ No newline at end of file +} diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/KeyExchangeTest.kt b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/KeyExchangeTest.kt index 7d8fcf7edf..51d4bca126 100644 --- a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/KeyExchangeTest.kt +++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/KeyExchangeTest.kt @@ -2,7 +2,6 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.pair import info.nightscout.androidaps.logging.AAPSLoggerTest import info.nightscout.androidaps.utils.extensions.toHex -import org.junit.Assert import org.junit.Assert.* import org.junit.Test import org.spongycastle.util.encoders.Hex @@ -12,15 +11,15 @@ class KeyExchangeTest { val aapsLogger = AAPSLoggerTest() val ke = KeyExchange( aapsLogger, - pdmPrivate= Hex.decode("27ec94b71a201c5e92698d668806ae5ba00594c307cf5566e60c1fc53a6f6bb6"), - pdmNonce= Hex.decode("edfdacb242c7f4e1d2bc4d93ca3c5706") + pdmPrivate = Hex.decode("27ec94b71a201c5e92698d668806ae5ba00594c307cf5566e60c1fc53a6f6bb6"), + pdmNonce = Hex.decode("edfdacb242c7f4e1d2bc4d93ca3c5706") ) val podPublicKey = Hex.decode("2fe57da347cd62431528daac5fbb290730fff684afc4cfc2ed90995f58cb3b74") val podNonce = Hex.decode("00000000000000000000000000000000") - ke.updatePodPublicData(podPublicKey+podNonce) + ke.updatePodPublicData(podPublicKey + podNonce) assertEquals(ke.pdmPublic.toHex(), "f2b6940243aba536a66e19fb9a39e37f1e76a1cd50ab59b3e05313b4fc93975e") assertEquals(ke.pdmConf.toHex(), "5fc3b4da865e838ceaf1e9e8bb85d1ac") ke.validatePodConf(Hex.decode("af4f10db5f96e5d9cd6cfc1f54f4a92f")) assertEquals(ke.ltk.toHex(), "341e16d13f1cbf73b19d1c2964fee02b") } -} \ No newline at end of file +}