caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Cleanup.

Browse source
This commit is contained in:
Johannes Mockenhaupt 2018-01-28 21:56:56 +01:00
parent 302d3494d2
commit 6609eb6be5
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java
View file

@ -4,18 +4,12 @@ import android.os.SystemClock;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import com.crashlytics.android.answers.Answers;
import com.crashlytics.android.answers.CustomEvent;
import org.json.JSONObject; import org.json.JSONObject;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.List;
import java.util.Locale;
import de.jotomo.ruffy.spi.BasalProfile; import de.jotomo.ruffy.spi.BasalProfile;
import de.jotomo.ruffy.spi.BolusProgressReporter; import de.jotomo.ruffy.spi.BolusProgressReporter;
@ -103,12 +97,11 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf
private volatile boolean cancelBolus; private volatile boolean cancelBolus;
private Bolus lastRequestedBolus; private Bolus lastRequestedBolus;
// private long pumpHistoryLastChecked;
private volatile long timestampOfLastKnownBolusRecord;
/** this is set whenever a connection to the pump is made and indicates if new history /** this is set whenever a connection to the pump is made and indicates if new history
records on the pump have been found */ records on the pump have been found */
private volatile boolean pumpHistoryChanged = false; private volatile boolean pumpHistoryChanged = false;
private volatile long timestampOfLastKnownPumpBolusRecord;
public static ComboPlugin getPlugin() { public static ComboPlugin getPlugin() {
if (plugin == null) if (plugin == null)
@ -1041,7 +1034,7 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf
// and only read My Data history when quick info shows a new record // and only read My Data history when quick info shows a new record
CommandResult historyResult = runCommand(MainApp.gs(R.string.combo_activity_reading_pump_history), 3, () -> CommandResult historyResult = runCommand(MainApp.gs(R.string.combo_activity_reading_pump_history), 3, () ->
ruffyScripter.readHistory(new PumpHistoryRequest() ruffyScripter.readHistory(new PumpHistoryRequest()
.bolusHistory(timestampOfLastKnownBolusRecord))); .bolusHistory(timestampOfLastKnownPumpBolusRecord)));
if (!historyResult.success) { if (!historyResult.success) {
return; return;
} }
@ -1049,7 +1042,7 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf
pumpHistoryChanged = updateDbFromPumpHistory(historyResult.history); pumpHistoryChanged = updateDbFromPumpHistory(historyResult.history);
if (!historyResult.history.bolusHistory.isEmpty()) { if (!historyResult.history.bolusHistory.isEmpty()) {
timestampOfLastKnownBolusRecord = historyResult.history.bolusHistory.get(0).timestamp; timestampOfLastKnownPumpBolusRecord = historyResult.history.bolusHistory.get(0).timestamp;
} }
long end = System.currentTimeMillis(); long end = System.currentTimeMillis();