From b8f2fdc7a889afa9db19c3f639f534c3d080ec18 Mon Sep 17 00:00:00 2001
From: Bart Sopers <bart@sopers.nl>
Date: Mon, 27 Apr 2020 22:55:31 +0200
Subject: [PATCH] Small cleanup

---
 .../omnipod/comm/OmnipodCommunicationService.java    | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/OmnipodCommunicationService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/OmnipodCommunicationService.java
index 139a3e8dc3..8c29a1356c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/OmnipodCommunicationService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/OmnipodCommunicationService.java
@@ -263,15 +263,13 @@ public class OmnipodCommunicationService extends RileyLinkCommunicationManager {
     }
 
     private OmnipodPacket createAckPacket(PodState podState, Integer packetAddress, Integer messageAddress) {
-        int pktAddress = podState.getAddress();
-        int msgAddress = podState.getAddress();
-        if (packetAddress != null) {
-            pktAddress = packetAddress;
+        if(packetAddress == null) {
+            packetAddress = podState.getAddress();
         }
-        if (messageAddress != null) {
-            msgAddress = messageAddress;
+        if(messageAddress == null) {
+            messageAddress = podState.getAddress();
         }
-        return new OmnipodPacket(pktAddress, PacketType.ACK, podState.getPacketNumber(), ByteUtil.getBytesFromInt(msgAddress));
+        return new OmnipodPacket(packetAddress, PacketType.ACK, podState.getPacketNumber(), ByteUtil.getBytesFromInt(messageAddress));
     }
 
     private void ackUntilQuiet(PodState podState, Integer packetAddress, Integer messageAddress) {