caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge pull request #33 from jotomo/combo-scripter-v2

Browse source 
18 feb V2
This commit is contained in:
Simon Pauwels 2018-02-18 16:39:38 +01:00 committed by GitHub
commit 55193d3e75
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -57,7 +57,7 @@ android {
targetSdkVersion 23 targetSdkVersion 23
multiDexEnabled true multiDexEnabled true
versionCode 1500 versionCode 1500
version "1.57-combo-csv2-beta-6" version "1.58-combo-phantom-fusion"
buildConfigField "String", "VERSION", '"' + version + '"' buildConfigField "String", "VERSION", '"' + version + '"'
buildConfigField "String", "BUILDVERSION", generateGitBuild() buildConfigField "String", "BUILDVERSION", generateGitBuild()

17
app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java
View file

@ -2,6 +2,7 @@ package info.nightscout.androidaps.queue;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.SystemClock;
import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatActivity;
import android.text.Html; import android.text.Html;
import android.text.Spanned; import android.text.Spanned;
@ -289,13 +290,17 @@ public class CommandQueue {
// Check that there is a valid profileSwitch NOW // Check that there is a valid profileSwitch NOW
if (MainApp.getConfigBuilder().getProfileSwitchFromHistory(System.currentTimeMillis())==null) { if (MainApp.getConfigBuilder().getProfileSwitchFromHistory(System.currentTimeMillis())==null) {
Notification noProfileSwitchNotif = new Notification(Notification.PROFILE_SWITCH_MISSING, MainApp.sResources.getString(R.string.profileswitch_ismissing), Notification.NORMAL); // wait for DatabaseHelper.scheduleProfiSwitch() to do the profile switch // TODO clean this crap up
MainApp.bus().post(new EventNewNotification(noProfileSwitchNotif)); SystemClock.sleep(5000);
if (callback != null) { if (MainApp.getConfigBuilder().getProfileSwitchFromHistory(System.currentTimeMillis())==null) {
PumpEnactResult result = new PumpEnactResult().success(false).enacted(false).comment("Refuse to send profile to pump! No ProfileSwitch!"); Notification noProfileSwitchNotif = new Notification(Notification.PROFILE_SWITCH_MISSING, MainApp.gs(R.string.profileswitch_ismissing), Notification.NORMAL);
callback.result(result).run(); MainApp.bus().post(new EventNewNotification(noProfileSwitchNotif));
if (callback != null) {
PumpEnactResult result = new PumpEnactResult().success(false).enacted(false).comment("Refuse to send profile to pump! No ProfileSwitch!");
callback.result(result).run();
}
return false;
} }
return false;
} }
// Compare with pump limits // Compare with pump limits

9
app/src/test/java/info/nightscout/androidaps/queue/CommandQueueTest.java
View file

@ -81,17 +81,18 @@ public class CommandQueueTest extends CommandQueue {
extendedBolus(1, 30, null); extendedBolus(1, 30, null);
Assert.assertEquals(2, size()); Assert.assertEquals(2, size());
// add setProfile // add setProfile (command is not queued before unless a ProfileSwitch exists)
// TODO test with profile switch set
setProfile(new Profile(new JSONObject(profileJson), Constants.MGDL), null); setProfile(new Profile(new JSONObject(profileJson), Constants.MGDL), null);
Assert.assertEquals(3, size()); Assert.assertEquals(2, size());
// add loadHistory // add loadHistory
loadHistory((byte) 0, null); loadHistory((byte) 0, null);
Assert.assertEquals(4, size()); Assert.assertEquals(3, size());
// add loadEvents // add loadEvents
loadEvents(null); loadEvents(null);
Assert.assertEquals(5, size()); Assert.assertEquals(4, size());
clear(); clear();
tempBasalAbsolute(0, 30, true, null); tempBasalAbsolute(0, 30, true, null);