diff --git a/app/src/main/java/info/nightscout/android/medtronic/MainActivity.java b/app/src/main/java/info/nightscout/android/medtronic/MainActivity.java index 65999350ff1c0aae746e92fa386d54f3bc1715a5..6a493ac5550eed62fcc97909a2c124a9228643d5 100644 --- a/app/src/main/java/info/nightscout/android/medtronic/MainActivity.java +++ b/app/src/main/java/info/nightscout/android/medtronic/MainActivity.java @@ -738,8 +738,6 @@ public class MainActivity extends AppCompatActivity implements OnSharedPreferenc PumpInfo pump = getActivePump(); if (pump != null && pump.isValid()) { - Log.d(TAG, "history display refresh size: " + pump.getPumpHistory().size()); - Log.d(TAG, "history display refresh date: " + pump.getPumpHistory().last().getEventDate()); pumpStatusData = pump.getPumpHistory().last(); } diff --git a/app/src/main/java/info/nightscout/android/medtronic/message/AbstractBinaryRequestMessage.java b/app/src/main/java/info/nightscout/android/medtronic/message/AbstractBinaryRequestMessage.java index dbb4f3f27d610ffc86d55fc29418f7b4570414a1..ac9919086448853c5cd829895df338e472dc4093 100644 --- a/app/src/main/java/info/nightscout/android/medtronic/message/AbstractBinaryRequestMessage.java +++ b/app/src/main/java/info/nightscout/android/medtronic/message/AbstractBinaryRequestMessage.java @@ -12,7 +12,7 @@ import info.nightscout.android.medtronic.exception.ChecksumException; /** * Created by lgoedhart on 26/03/2016. */ -public abstract class AbstractBinaryRequestMessage<T extends AbstractResponseMessage> extends AbstractRequestMessage<T> { +public abstract class AbstractBinaryRequestMessage<T> extends AbstractRequestMessage<T> { private final static int ENVELOPE_SIZE = 33; //protected ByteBuffer mBayerEnvelope; diff --git a/app/src/main/java/info/nightscout/android/medtronic/message/AbstractRequestMessage.java b/app/src/main/java/info/nightscout/android/medtronic/message/AbstractRequestMessage.java index 45e710df9fce2df0d1cf7acef432c7ff34d30f93..72851b9edccaffba59a28a2a39c97c0135cd8805 100644 --- a/app/src/main/java/info/nightscout/android/medtronic/message/AbstractRequestMessage.java +++ b/app/src/main/java/info/nightscout/android/medtronic/message/AbstractRequestMessage.java @@ -12,7 +12,7 @@ import info.nightscout.android.medtronic.exception.InvalidMessageException; * Created by volker on 12.12.2016. */ -public abstract class AbstractRequestMessage<T extends AbstractResponseMessage> extends AbstractBaseMessage { +public abstract class AbstractRequestMessage<T> extends AbstractBaseMessage { private static final String TAG = AbstractRequestMessage.class.getSimpleName(); protected AbstractRequestMessage(byte[] bytes) { diff --git a/app/src/main/java/info/nightscout/android/medtronic/message/MedtronicRequestMessage.java b/app/src/main/java/info/nightscout/android/medtronic/message/MedtronicRequestMessage.java index 1953149b61f4dc99905c3f20a987be43bd6698a7..fe899a538297a2bbee73a19b5b853a7334904a0c 100644 --- a/app/src/main/java/info/nightscout/android/medtronic/message/MedtronicRequestMessage.java +++ b/app/src/main/java/info/nightscout/android/medtronic/message/MedtronicRequestMessage.java @@ -16,7 +16,7 @@ import info.nightscout.android.medtronic.exception.EncryptionException; /** * Created by lgoedhart on 26/03/2016. */ -public abstract class MedtronicRequestMessage<T extends AbstractResponseMessage> extends AbstractBinaryRequestMessage<T> { +public abstract class MedtronicRequestMessage<T> extends AbstractBinaryRequestMessage<T> { static int ENVELOPE_SIZE = 2; static int CRC_SIZE = 2; diff --git a/app/src/main/java/info/nightscout/android/medtronic/message/pump/MedtronicSendMessageRequestMessage.java b/app/src/main/java/info/nightscout/android/medtronic/message/pump/MedtronicSendMessageRequestMessage.java index b9e8ca1cdb470a7f5fa8a4697bc74f55cc4445aa..26fde138e96ebf0a02c5ef9034000c09e55a4752 100644 --- a/app/src/main/java/info/nightscout/android/medtronic/message/pump/MedtronicSendMessageRequestMessage.java +++ b/app/src/main/java/info/nightscout/android/medtronic/message/pump/MedtronicSendMessageRequestMessage.java @@ -14,7 +14,7 @@ import info.nightscout.android.medtronic.message.MessageUtils; * Created by volker on 18.12.2016. */ -public abstract class MedtronicSendMessageRequestMessage<T> extends MedtronicRequestMessage { +public abstract class MedtronicSendMessageRequestMessage<T> extends MedtronicRequestMessage<T> { static int ENVELOPE_SIZE = 11; static int ENCRYPTED_ENVELOPE_SIZE = 3; static int CRC_SIZE = 2; diff --git a/app/src/main/java/info/nightscout/android/medtronic/message/pump/ReadHistoryBaseRequestMessage.java b/app/src/main/java/info/nightscout/android/medtronic/message/pump/ReadHistoryBaseRequestMessage.java index 1e7c1aa7b4bff1be276fdce7b733d02c3ed33659..4a81c27ff3a23702e4df1d601869becbf38cf6dd 100644 --- a/app/src/main/java/info/nightscout/android/medtronic/message/pump/ReadHistoryBaseRequestMessage.java +++ b/app/src/main/java/info/nightscout/android/medtronic/message/pump/ReadHistoryBaseRequestMessage.java @@ -5,6 +5,7 @@ import android.util.Log; import java.io.IOException; import java.nio.ByteBuffer; import java.nio.ByteOrder; +import java.util.ArrayList; import java.util.Date; import java.util.concurrent.TimeoutException; @@ -126,6 +127,17 @@ public abstract class ReadHistoryBaseRequestMessage<T extends AbstractResponseMe return count; } + protected int[] missingSegmentKeys() { + ArrayList<Integer> keys = new ArrayList<>(this.segments.length); + int count = 0; + for ( byte[] segment: this.segments){ + if (segment==null) { + keys.add(count); + }; + count ++; + } + return keys.toArray(); + } /* get missingSegmentKeys() { return this.segments.filter(value => value === undefined).keys();