caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge remote-tracking branch 'origin/dev' into watchfaces

Browse source
This commit is contained in:
Andrew Warrington 2017-12-10 21:40:46 +01:00
parent 74e833c873 88defc9f7b
commit 42aa552017
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java
View file

@ -1,6 +1,5 @@
package info.nightscout.androidaps.plugins.Wear; package info.nightscout.androidaps.plugins.Wear;
import android.os.Handler;
import android.os.HandlerThread; import android.os.HandlerThread;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
@ -26,7 +25,6 @@ import info.nightscout.androidaps.db.ProfileSwitch;
import info.nightscout.androidaps.db.Source; import info.nightscout.androidaps.db.Source;
import info.nightscout.androidaps.db.TempTarget; import info.nightscout.androidaps.db.TempTarget;
import info.nightscout.androidaps.interfaces.APSInterface; import info.nightscout.androidaps.interfaces.APSInterface;
import info.nightscout.androidaps.interfaces.DanaRInterface;
import info.nightscout.androidaps.interfaces.PluginBase; import info.nightscout.androidaps.interfaces.PluginBase;
import info.nightscout.androidaps.interfaces.ProfileInterface; import info.nightscout.androidaps.interfaces.ProfileInterface;
import info.nightscout.androidaps.interfaces.PumpInterface; import info.nightscout.androidaps.interfaces.PumpInterface;
@ -296,11 +294,10 @@ public class ActionStringHandler {
rMessage += MainApp.instance().getString(R.string.pumpbusy); rMessage += MainApp.instance().getString(R.string.pumpbusy);
} else { } else {
rMessage += "trying to fetch data from pump."; rMessage += "trying to fetch data from pump.";
Handler handler = new Handler(handlerThread.getLooper());
handler.post(new Runnable() { ConfigBuilderPlugin.getCommandQueue().loadHistory(RecordTypes.RECORD_TYPE_DAILY, new Callback() {
@Override @Override
public void run() { public void run() {
((DanaRInterface) pump).loadHistory(RecordTypes.RECORD_TYPE_DAILY);
List<DanaRHistoryRecord> dummies = new LinkedList<DanaRHistoryRecord>(); List<DanaRHistoryRecord> dummies = new LinkedList<DanaRHistoryRecord>();
List<DanaRHistoryRecord> historyList = getTDDList(dummies); List<DanaRHistoryRecord> historyList = getTDDList(dummies);
if (isOldData(historyList)) { if (isOldData(historyList)) {
@ -308,8 +305,8 @@ public class ActionStringHandler {
} else { } else {
sendStatusmessage("TDD", generateTDDMessage(historyList, dummies)); sendStatusmessage("TDD", generateTDDMessage(historyList, dummies));
} }
} }
}); });
} }
} else { } else {
// if up to date: prepare, send (check if CPP is activated -> add CPP stats) // if up to date: prepare, send (check if CPP is activated -> add CPP stats)