diff --git a/app/build.gradle b/app/build.gradle
index 52ca877595..7920ea6240 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -63,11 +63,12 @@ android {
targetSdkVersion 25
multiDexEnabled true
versionCode 1500
- version "2.1.2"
+ version "2.2"
buildConfigField "String", "VERSION", '"' + version + '"'
buildConfigField "String", "BUILDVERSION", '"' + generateGitBuild() + '-' + generateDate() + '"'
buildConfigField "String", "HEAD", '"' + generateGitBuild() + '"'
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+ // if you change minSdkVersion to less than 11, you need to change executeTask for wear
ndk {
moduleName "BleCommandUtil"
@@ -77,7 +78,7 @@ android {
// TODO remove once wear dependency com.google.android.gms:play-services-wearable:7.3.0
// has been upgraded (requiring significant code changes), which currently fails release
// build with a deprecation warning
- abortOnError false
+ // abortOnError false
// (disabled entirely to avoid reports on the error, which would still be displayed
// and it's easy to overlook that it's ignored)
checkReleaseBuilds false
@@ -194,7 +195,7 @@ dependencies {
implementation "org.slf4j:slf4j-api:1.7.12"
implementation "com.jjoe64:graphview:4.0.1"
implementation "com.joanzapata.iconify:android-iconify-fontawesome:2.1.1"
- implementation "com.google.android.gms:play-services-wearable:7.5.0"
+ implementation 'com.google.android.gms:play-services-wearable:10.2.1'
implementation(name: "android-edittext-validator-v1.3.4-mod", ext: "aar")
implementation(name: "sightparser-release", ext: "aar")
implementation 'com.madgag.spongycastle:core:1.58.0.0'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2ec11e5a33..dc9201d86c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -169,7 +169,63 @@
android:name=".plugins.general.wear.wearintegration.WatchUpdaterService"
android:exported="true">
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
+
diff --git a/app/src/main/java/info/nightscout/androidaps/Constants.java b/app/src/main/java/info/nightscout/androidaps/Constants.java
index 183975b984..2ecabfe965 100644
--- a/app/src/main/java/info/nightscout/androidaps/Constants.java
+++ b/app/src/main/java/info/nightscout/androidaps/Constants.java
@@ -68,4 +68,7 @@ public class Constants {
//SMS Communicator
public static final long SMS_CONFIRM_TIMEOUT = T.mins(5).msecs();
+ //Storage [MB]
+ public static final long MINIMUM_FREE_SPACE = 200;
+
}
diff --git a/app/src/main/java/info/nightscout/androidaps/MainApp.java b/app/src/main/java/info/nightscout/androidaps/MainApp.java
index 96b55286db..eca527543c 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainApp.java
+++ b/app/src/main/java/info/nightscout/androidaps/MainApp.java
@@ -37,6 +37,7 @@ import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
import info.nightscout.androidaps.plugins.constraints.dstHelper.DstHelperPlugin;
import info.nightscout.androidaps.plugins.constraints.objectives.ObjectivesPlugin;
import info.nightscout.androidaps.plugins.constraints.safety.SafetyPlugin;
+import info.nightscout.androidaps.plugins.constraints.storage.StorageConstraintPlugin;
import info.nightscout.androidaps.plugins.general.actions.ActionsFragment;
import info.nightscout.androidaps.plugins.general.careportal.CareportalPlugin;
import info.nightscout.androidaps.plugins.general.food.FoodPlugin;
@@ -175,6 +176,7 @@ public class MainApp extends Application {
if (Config.OTHERPROFILES) pluginsList.add(LocalProfilePlugin.getPlugin());
pluginsList.add(TreatmentsPlugin.getPlugin());
if (Config.SAFETY) pluginsList.add(SafetyPlugin.getPlugin());
+ if (Config.SAFETY) pluginsList.add(StorageConstraintPlugin.getPlugin());
if (Config.APS) pluginsList.add(ObjectivesPlugin.getPlugin());
pluginsList.add(SourceXdripPlugin.getPlugin());
pluginsList.add(SourceNSClientPlugin.getPlugin());
@@ -198,6 +200,7 @@ public class MainApp extends Application {
pluginsList.add(DstHelperPlugin.getPlugin());
+
ConfigBuilderPlugin.getPlugin().initialize();
}
diff --git a/app/src/main/java/info/nightscout/androidaps/data/ConstraintChecker.java b/app/src/main/java/info/nightscout/androidaps/data/ConstraintChecker.java
index ceb85c6967..68664033d0 100644
--- a/app/src/main/java/info/nightscout/androidaps/data/ConstraintChecker.java
+++ b/app/src/main/java/info/nightscout/androidaps/data/ConstraintChecker.java
@@ -50,6 +50,10 @@ public class ConstraintChecker implements ConstraintsInterface {
return isAdvancedFilteringEnabled(new Constraint<>(true));
}
+ public Constraint isSuperBolusEnabled() {
+ return isSuperBolusEnabled(new Constraint<>(true));
+ }
+
public Constraint getMaxBasalAllowed(Profile profile) {
return applyBasalConstraints(new Constraint<>(Constants.REALLYHIGHBASALRATE), profile);
}
@@ -157,6 +161,17 @@ public class ConstraintChecker implements ConstraintsInterface {
return value;
}
+ @Override
+ public Constraint isSuperBolusEnabled(Constraint value) {
+ ArrayList constraintsPlugins = mainApp.getSpecificPluginsListByInterface(ConstraintsInterface.class);
+ for (PluginBase p : constraintsPlugins) {
+ ConstraintsInterface constraint = (ConstraintsInterface) p;
+ if (!p.isEnabled(PluginType.CONSTRAINTS)) continue;
+ constraint.isSuperBolusEnabled(value);
+ }
+ return value;
+ }
+
@Override
public Constraint applyBasalConstraints(Constraint absoluteRate, Profile profile) {
ArrayList constraintsPlugins = mainApp.getSpecificPluginsListByInterface(ConstraintsInterface.class);
diff --git a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
index f3d1e84a2b..6600632869 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
@@ -464,7 +464,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
} catch (SQLException e) {
log.error("Unhandled exception", e);
}
- return new ArrayList();
+ return new ArrayList<>();
}
public List getBgreadingsDataFromTime(long start, long end, boolean ascending) {
@@ -481,7 +481,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
} catch (SQLException e) {
log.error("Unhandled exception", e);
}
- return new ArrayList();
+ return new ArrayList<>();
}
public List getAllBgreadingsDataFromTime(long mills, boolean ascending) {
diff --git a/app/src/main/java/info/nightscout/androidaps/interfaces/ConstraintsInterface.java b/app/src/main/java/info/nightscout/androidaps/interfaces/ConstraintsInterface.java
index 5ac8cc83f7..f1c79dd5cb 100644
--- a/app/src/main/java/info/nightscout/androidaps/interfaces/ConstraintsInterface.java
+++ b/app/src/main/java/info/nightscout/androidaps/interfaces/ConstraintsInterface.java
@@ -35,6 +35,10 @@ public interface ConstraintsInterface {
return value;
}
+ default Constraint isSuperBolusEnabled(Constraint value) {
+ return value;
+ }
+
default Constraint applyBasalConstraints(Constraint absoluteRate, Profile profile) {
return absoluteRate;
}
diff --git a/app/src/main/java/info/nightscout/androidaps/interfaces/PluginBase.java b/app/src/main/java/info/nightscout/androidaps/interfaces/PluginBase.java
index b92b8a8f87..01be296539 100644
--- a/app/src/main/java/info/nightscout/androidaps/interfaces/PluginBase.java
+++ b/app/src/main/java/info/nightscout/androidaps/interfaces/PluginBase.java
@@ -93,6 +93,8 @@ public abstract class PluginBase {
return state == State.ENABLED && specialEnableCondition();
if (type == PluginType.CONSTRAINTS && pluginDescription.mainType == PluginType.PUMP && isEnabled(PluginType.PUMP))
return true;
+ if (type == PluginType.CONSTRAINTS && pluginDescription.mainType == PluginType.APS && isEnabled(PluginType.APS))
+ return true;
if (type == PluginType.PROFILE && pluginDescription.mainType == PluginType.PUMP)
return isProfileInterfaceEnabled;
return false;
diff --git a/app/src/main/java/info/nightscout/androidaps/interfaces/PumpInterface.java b/app/src/main/java/info/nightscout/androidaps/interfaces/PumpInterface.java
index 976ac5c607..3690312cf8 100644
--- a/app/src/main/java/info/nightscout/androidaps/interfaces/PumpInterface.java
+++ b/app/src/main/java/info/nightscout/androidaps/interfaces/PumpInterface.java
@@ -2,9 +2,13 @@ package info.nightscout.androidaps.interfaces;
import org.json.JSONObject;
+import java.util.List;
+
import info.nightscout.androidaps.data.DetailedBolusInfo;
import info.nightscout.androidaps.data.Profile;
import info.nightscout.androidaps.data.PumpEnactResult;
+import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction;
+import info.nightscout.androidaps.plugins.general.actions.defs.CustomActionType;
/**
* Created by mike on 04.06.2016.
@@ -61,4 +65,10 @@ public interface PumpInterface {
PumpEnactResult loadTDDs();
+ public boolean canHandleDST();
+
+ List getCustomActions();
+
+ void executeCustomAction(CustomActionType customActionType);
+
}
diff --git a/app/src/main/java/info/nightscout/androidaps/logging/L.java b/app/src/main/java/info/nightscout/androidaps/logging/L.java
index 2c9201bd79..583969c739 100644
--- a/app/src/main/java/info/nightscout/androidaps/logging/L.java
+++ b/app/src/main/java/info/nightscout/androidaps/logging/L.java
@@ -95,6 +95,7 @@ public class L {
public static final String PROFILE = "PROFILE";
public static final String CONFIGBUILDER = "CONFIGBUILDER";
public static final String UI = "UI";
+ public static final String SMS = "SMS";
private static void initialize() {
logElements = new ArrayList<>();
@@ -117,6 +118,7 @@ public class L {
logElements.add(new LogElement(PUMPBTCOMM, false));
logElements.add(new LogElement(PUMPCOMM, true));
logElements.add(new LogElement(PUMPQUEUE, true));
+ logElements.add(new LogElement(SMS, true));
logElements.add(new LogElement(UI, true));
}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
index 7ee7cf0348..91bbccc515 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
@@ -34,6 +34,7 @@ import info.nightscout.androidaps.db.DatabaseHelper;
import info.nightscout.androidaps.db.Source;
import info.nightscout.androidaps.db.TemporaryBasal;
import info.nightscout.androidaps.events.EventNewBG;
+import info.nightscout.androidaps.events.EventTempTargetChange;
import info.nightscout.androidaps.interfaces.APSInterface;
import info.nightscout.androidaps.interfaces.Constraint;
import info.nightscout.androidaps.interfaces.PluginBase;
@@ -175,6 +176,14 @@ public class LoopPlugin extends PluginBase {
return loopSuspendedTill;
}
+ @Subscribe
+ public void onStatusEvent(final EventTempTargetChange ev) {
+ new Thread(() -> invoke("EventTempTargetChange", true)).start();
+ FabricPrivacy.getInstance().logCustom(new CustomEvent("TT_Loop_Run"));
+ }
+
+
+
public void suspendTo(long endTime) {
loopSuspendedTill = endTime;
isSuperBolus = false;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.java
index f1232e39c3..73914662d7 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.java
@@ -13,6 +13,7 @@ import info.nightscout.androidaps.data.Profile;
import info.nightscout.androidaps.db.TempTarget;
import info.nightscout.androidaps.interfaces.APSInterface;
import info.nightscout.androidaps.interfaces.Constraint;
+import info.nightscout.androidaps.interfaces.ConstraintsInterface;
import info.nightscout.androidaps.interfaces.PluginBase;
import info.nightscout.androidaps.interfaces.PluginDescription;
import info.nightscout.androidaps.interfaces.PluginType;
@@ -38,7 +39,7 @@ import info.nightscout.androidaps.utils.ToastUtils;
/**
* Created by mike on 05.08.2016.
*/
-public class OpenAPSSMBPlugin extends PluginBase implements APSInterface {
+public class OpenAPSSMBPlugin extends PluginBase implements APSInterface, ConstraintsInterface {
private static Logger log = LoggerFactory.getLogger(L.APS);
private static OpenAPSSMBPlugin openAPSSMBPlugin;
@@ -147,7 +148,9 @@ public class OpenAPSSMBPlugin extends PluginBase implements APSInterface {
if (L.isEnabled(L.APS))
Profiler.log(log, "getMealData()", startPart);
- double maxIob = MainApp.getConstraintChecker().getMaxIOBAllowed().value();
+ Constraint maxIOBAllowedConstraint = MainApp.getConstraintChecker().getMaxIOBAllowed();
+ inputConstraints.copyReasons(maxIOBAllowedConstraint);
+ double maxIob = maxIOBAllowedConstraint.value();
minBg = verifyHardLimits(minBg, "minBg", HardLimits.VERY_HARD_LIMIT_MIN_BG[0], HardLimits.VERY_HARD_LIMIT_MIN_BG[1]);
maxBg = verifyHardLimits(maxBg, "maxBg", HardLimits.VERY_HARD_LIMIT_MAX_BG[0], HardLimits.VERY_HARD_LIMIT_MAX_BG[1]);
@@ -266,4 +269,9 @@ public class OpenAPSSMBPlugin extends PluginBase implements APSInterface {
return newvalue;
}
+ public Constraint isSuperBolusEnabled(Constraint value) {
+ value.set(false);
+ return value;
+ }
+
}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderFragment.java
index c456a626e7..b374c78413 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderFragment.java
@@ -42,6 +42,7 @@ import info.nightscout.androidaps.interfaces.SensitivityInterface;
import info.nightscout.androidaps.plugins.common.SubscriberFragment;
import info.nightscout.androidaps.plugins.insulin.InsulinOrefRapidActingPlugin;
import info.nightscout.androidaps.plugins.profile.ns.NSProfilePlugin;
+
import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin;
import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref0Plugin;
import info.nightscout.androidaps.utils.FabricPrivacy;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctions.java b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctions.java
index c87432a9ab..6b9b353979 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctions.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctions.java
@@ -16,6 +16,7 @@ import info.nightscout.androidaps.R;
import info.nightscout.androidaps.data.Profile;
import info.nightscout.androidaps.data.ProfileStore;
import info.nightscout.androidaps.db.ProfileSwitch;
+import info.nightscout.androidaps.db.Source;
import info.nightscout.androidaps.events.EventNewBasalProfile;
import info.nightscout.androidaps.events.EventProfileSwitchChange;
import info.nightscout.androidaps.interfaces.ProfileInterface;
@@ -139,4 +140,44 @@ public class ProfileFunctions {
return null;
}
+ public static ProfileSwitch prepareProfileSwitch(final ProfileStore profileStore, final String profileName, final int duration, final int percentage, final int timeshift, long date) {
+ ProfileSwitch profileSwitch = new ProfileSwitch();
+ profileSwitch.date = date;
+ profileSwitch.source = Source.USER;
+ profileSwitch.profileName = profileName;
+ profileSwitch.profileJson = profileStore.getSpecificProfile(profileName).getData().toString();
+ profileSwitch.profilePlugin = ConfigBuilderPlugin.getPlugin().getActiveProfileInterface().getClass().getName();
+ profileSwitch.durationInMinutes = duration;
+ profileSwitch.isCPP = percentage != 100 || timeshift != 0;
+ profileSwitch.timeshift = timeshift;
+ profileSwitch.percentage = percentage;
+ return profileSwitch;
+ }
+
+ public static void doProfileSwitch(final ProfileStore profileStore, final String profileName, final int duration, final int percentage, final int timeshift) {
+ ProfileSwitch profileSwitch = prepareProfileSwitch(profileStore, profileName, duration, percentage, timeshift, System.currentTimeMillis());
+ TreatmentsPlugin.getPlugin().addToHistoryProfileSwitch(profileSwitch);
+ FabricPrivacy.getInstance().logCustom(new CustomEvent("ProfileSwitch"));
+ }
+
+ public static void doProfileSwitch(final int duration, final int percentage, final int timeshift) {
+ ProfileSwitch profileSwitch = TreatmentsPlugin.getPlugin().getProfileSwitchFromHistory(System.currentTimeMillis());
+ if (profileSwitch != null) {
+ profileSwitch = new ProfileSwitch();
+ profileSwitch.date = System.currentTimeMillis();
+ profileSwitch.source = Source.USER;
+ profileSwitch.profileName = getInstance().getProfileName(System.currentTimeMillis(), false);
+ profileSwitch.profileJson = getInstance().getProfile().getData().toString();
+ profileSwitch.profilePlugin = ConfigBuilderPlugin.getPlugin().getActiveProfileInterface().getClass().getName();
+ profileSwitch.durationInMinutes = duration;
+ profileSwitch.isCPP = percentage != 100 || timeshift != 0;
+ profileSwitch.timeshift = timeshift;
+ profileSwitch.percentage = percentage;
+ TreatmentsPlugin.getPlugin().addToHistoryProfileSwitch(profileSwitch);
+ FabricPrivacy.getInstance().logCustom(new CustomEvent("ProfileSwitch"));
+ } else {
+ log.error("No profile switch existing");
+ }
+ }
+
}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/dstHelper/DstHelperPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/dstHelper/DstHelperPlugin.java
index 2862cc3d7a..ec3ef44881 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/dstHelper/DstHelperPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/dstHelper/DstHelperPlugin.java
@@ -12,18 +12,17 @@ import info.nightscout.androidaps.interfaces.ConstraintsInterface;
import info.nightscout.androidaps.interfaces.PluginBase;
import info.nightscout.androidaps.interfaces.PluginDescription;
import info.nightscout.androidaps.interfaces.PluginType;
+import info.nightscout.androidaps.interfaces.PumpInterface;
import info.nightscout.androidaps.logging.L;
import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin;
+import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
-import info.nightscout.androidaps.utils.T;
-/**
- * Created by Rumen on 31.10.2018.
- */
public class DstHelperPlugin extends PluginBase implements ConstraintsInterface {
+ public static final int DISABLE_TIMEFRAME_HOURS = -3;
+ public static final int WARN_PRIOR_TIMEFRAME_HOURS = 24;
private static Logger log = LoggerFactory.getLogger(L.CONSTRAINTS);
- private int minutesToChange = 0;
static DstHelperPlugin plugin = null;
@@ -43,83 +42,53 @@ public class DstHelperPlugin extends PluginBase implements ConstraintsInterface
);
}
- public int dstTest(Calendar c) throws Exception {
-// c = Calendar.getInstance(TimeZone.getDefault());
-// c = Calendar.getInstance(TimeZone.getTimeZone("Australia/Lord_Howe"));
-// c.setTimeInMillis(DateUtil.fromISODateString("2018-10-07T01:00:00Z").getTime());
- long zoneOffset = c.get(Calendar.ZONE_OFFSET);
- long d1 = c.getTimeInMillis() - zoneOffset;
- c.setTimeInMillis(d1);
- int offset1 = c.get(Calendar.DST_OFFSET);
-
- c.add(Calendar.DATE, 1);
- long d2 = c.getTimeInMillis();
-
- int diffInHours = (int) ((d1 - d2) / -T.hours(1).msecs());
- long offsetDetectedTime = 0;
- // comparing millis because change can be < 1 hour
-// log.debug("Starting from: "+startTimeString + " to "+endTimeString);
-// log.debug("start "+offset1+" end "+c.get(Calendar.DST_OFFSET));
- if (offset1 != c.get(Calendar.DST_OFFSET)) {
- //we have a time change in next 24 hours, but when exactly
-// log.debug("Daylight saving time detected between " + startTimeString + " and " + endTimeString);
-// log.debug("Diff in hours is: "+diffInHours);
- c.setTimeInMillis(d1 - zoneOffset);
- offset1 = c.get(Calendar.DST_OFFSET);
- for (int i = 0; i <= diffInHours * 4; i++) {
-
- if (offset1 != c.get(Calendar.DST_OFFSET)) {
- log.debug("Detected offset in " + ((i / 4) - zoneOffset / T.hours(1).msecs()) + " hours value is " + (offset1 - c.get(Calendar.DST_OFFSET)) / T.mins(1).msecs() + " minutes");
- offsetDetectedTime = c.getTimeInMillis() - d1;
- break;
- }
- c.add(Calendar.MINUTE, 15);
-
- }
- }
- int minutesLeft = (int) ((offsetDetectedTime / T.mins(1).msecs()));
- /*log.debug("zoneoffset(minutes):"+zoneOffset/T.mins(1).msecs());
- log.debug("Start offset: "+offset1/T.mins(1).msecs());
- log.debug("End offset :" + c.get(Calendar.DST_OFFSET)/T.mins(1).msecs());
- log.debug("Now is:"+startTimeString);
- log.debug("Detected in(min): "+(offsetDetectedTime/T.mins(1).msecs()));
- log.debug("Returning value of: " + minutesLeft); */
- minutesToChange = minutesLeft;
- return minutesLeft;
-
+ public static boolean wasDST(Calendar now) {
+ Calendar ago = (Calendar) now.clone();
+ ago.add(Calendar.HOUR, DISABLE_TIMEFRAME_HOURS);
+ return now.get(Calendar.DST_OFFSET) != ago.get(Calendar.DST_OFFSET);
}
- //Return false if time to DST change is less than 91 and positive
+ public static boolean willBeDST(Calendar now) {
+ Calendar ago = (Calendar) now.clone();
+ ago.add(Calendar.HOUR, WARN_PRIOR_TIMEFRAME_HOURS);
+ return now.get(Calendar.DST_OFFSET) != ago.get(Calendar.DST_OFFSET);
+ }
+
+ //Return false if time to DST change happened in the last 3 hours.
@Override
public Constraint isLoopInvocationAllowed(Constraint value) {
- try {
- this.dstTest(Calendar.getInstance());
- } catch (Exception e) {
- e.printStackTrace();
- }
- if (this.minutesToChange <= 90 && minutesToChange > 0 && value.value()) {
- try {
- LoopPlugin loopPlugin = LoopPlugin.getPlugin();
- if (loopPlugin.suspendedTo() == 0L) {
-// loopPlugin.suspendTo(System.currentTimeMillis() + minutesToChange * T.mins(1).msecs());
- warnUser(Notification.DST_LOOP_DISABLED, MainApp.gs(R.string.dst_loop_disabled_warning));
- } else
- log.debug("Loop already suspended");
- } catch (Exception e) {
- e.printStackTrace();
- }
- value.set(false, "DST in 90 minutes or less", this);
- } else if (minutesToChange <= 24 * T.hours(1).mins() && minutesToChange > 0) {
+ PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
+ if (pump == null || pump.canHandleDST()) {
+ log.debug("Pump can handle DST");
+ return value;
+ }
+
+ Calendar cal = Calendar.getInstance();
+
+ if (willBeDST(cal)) {
warnUser(Notification.DST_IN_24H, MainApp.gs(R.string.dst_in_24h_warning));
}
+
+ if (!value.value()) {
+ log.debug("Already not allowed - don't check further");
+ return value;
+ }
+
+ if (wasDST(cal)) {
+ LoopPlugin loopPlugin = LoopPlugin.getPlugin();
+ if (!loopPlugin.isSuspended()) {
+ warnUser(Notification.DST_LOOP_DISABLED, MainApp.gs(R.string.dst_loop_disabled_warning));
+ } else {
+ log.debug("Loop already suspended");
+ }
+ value.set(false, "DST in last 3 hours.", this);
+ }
return value;
}
- // display warning
- void warnUser(int id, String warningText) {
+ private void warnUser(int id, String warningText) {
Notification notification = new Notification(id, warningText, Notification.LOW);
MainApp.bus().post(new EventNewNotification(notification));
}
-
}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesFragment.java
index 9f1ac748d5..b943571089 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesFragment.java
@@ -120,6 +120,7 @@ public class ObjectivesFragment extends SubscriberFragment {
public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
Objective objective = ObjectivesPlugin.getPlugin().getObjectives().get(position);
holder.title.setText(MainApp.gs(R.string.nth_objective, position + 1));
+ holder.revert.setVisibility(View.INVISIBLE);
if (objective.getObjective() != 0) {
holder.objective.setVisibility(View.VISIBLE);
holder.objective.setText(MainApp.gs(objective.getObjective()));
@@ -145,6 +146,9 @@ public class ObjectivesFragment extends SubscriberFragment {
holder.verify.setVisibility(View.VISIBLE);
holder.verify.setEnabled(objective.isCompleted() || enableFake.isChecked());
holder.start.setVisibility(View.GONE);
+ if(objective.isRevertable()) {
+ holder.revert.setVisibility(View.VISIBLE);
+ }
holder.progress.setVisibility(View.VISIBLE);
holder.progress.removeAllViews();
for (Objective.Task task : objective.getTasks()) {
@@ -169,8 +173,20 @@ public class ObjectivesFragment extends SubscriberFragment {
scrollToCurrentObjective();
startUpdateTimer();
});
+ holder.revert.setOnClickListener((view) -> {
+ objective.setAccomplishedOn(null);
+ objective.setStartedOn(null);
+ if (position > 0) {
+ Objective prevObj = ObjectivesPlugin.getPlugin().getObjectives().get(position - 1);
+ prevObj.setAccomplishedOn(null);
+ }
+ notifyDataSetChanged();
+ scrollToCurrentObjective();
+ });
}
+
+
@Override
public int getItemCount() {
return ObjectivesPlugin.getPlugin().getObjectives().size();
@@ -185,6 +201,7 @@ public class ObjectivesFragment extends SubscriberFragment {
public LinearLayout progress;
public Button verify;
public Button start;
+ public Button revert;
public ViewHolder(View itemView) {
super(itemView);
@@ -195,6 +212,7 @@ public class ObjectivesFragment extends SubscriberFragment {
progress = itemView.findViewById(R.id.objective_progress);
verify = itemView.findViewById(R.id.objective_verify);
start = itemView.findViewById(R.id.objective_start);
+ revert = itemView.findViewById(R.id.objective_back);
}
}
}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective.java b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective.java
index a1935c2ec6..83abe15688 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective.java
@@ -42,6 +42,10 @@ public abstract class Objective {
return true;
}
+ public boolean isRevertable() {
+ return false;
+ }
+
public boolean isAccomplished() {
return accomplishedOn != null;
}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective4.java b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective4.java
index 5708565ebe..1bbb4ef7c2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective4.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective4.java
@@ -25,4 +25,9 @@ public class Objective4 extends Objective {
}
});
}
+
+ @Override
+ public boolean isRevertable() {
+ return true;
+ }
}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/storage/StorageConstraintPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/storage/StorageConstraintPlugin.java
new file mode 100644
index 0000000000..197fd5c17a
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/storage/StorageConstraintPlugin.java
@@ -0,0 +1,76 @@
+package info.nightscout.androidaps.plugins.constraints.storage;
+
+import android.os.Environment;
+import android.os.StatFs;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+
+import info.nightscout.androidaps.Constants;
+import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.interfaces.Constraint;
+import info.nightscout.androidaps.interfaces.ConstraintsInterface;
+import info.nightscout.androidaps.interfaces.PluginBase;
+import info.nightscout.androidaps.interfaces.PluginDescription;
+import info.nightscout.androidaps.interfaces.PluginType;
+import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;
+import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
+import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
+
+/**
+ * Created by Rumen on 06.03.2019.
+ */
+public class StorageConstraintPlugin extends PluginBase implements ConstraintsInterface {
+ private static Logger log = LoggerFactory.getLogger(L.CONSTRAINTS);
+ static StorageConstraintPlugin plugin = null;
+
+ public static StorageConstraintPlugin getPlugin() {
+ if (plugin == null)
+ plugin = new StorageConstraintPlugin();
+ return plugin;
+ }
+
+ public StorageConstraintPlugin() {
+ super(new PluginDescription()
+ .mainType(PluginType.CONSTRAINTS)
+ .neverVisible(true)
+ .alwaysEnabled(true)
+ .showInList(false)
+ .pluginName(R.string.storage)
+ );
+ }
+
+ /**
+ * Constraints interface
+ **/
+
+ @Override
+ public Constraint isClosedLoopAllowed(Constraint value) {
+ long diskfree = getAvailableInternalMemorySize();
+ if (L.isEnabled(L.CONSTRAINTS))
+ log.debug("Internal storage free (Mb):" + diskfree);
+ if (diskfree < Constants.MINIMUM_FREE_SPACE) {
+ value.set(false, MainApp.gs(R.string.diskfull, Constants.MINIMUM_FREE_SPACE), this);
+ Notification notification = new Notification(Notification.DISKFULL, MainApp.gs(R.string.diskfull, Constants.MINIMUM_FREE_SPACE), Notification.NORMAL);
+ MainApp.bus().post(new EventNewNotification(notification));
+ } else {
+ MainApp.bus().post(new EventDismissNotification(Notification.DISKFULL));
+ }
+
+ return value;
+ }
+
+ public static long getAvailableInternalMemorySize() {
+ File path = Environment.getDataDirectory();
+ StatFs stat = new StatFs(path.getPath());
+ long blockSize = stat.getBlockSizeLong();
+ long blocksAvailable = stat.getAvailableBlocksLong();
+ int size = 1048576; // blocksize of 1 Mb
+ return ((blocksAvailable * blockSize) / size);
+ }
+
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.java
index a0b6e2c1e6..02ff6e6b5c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.java
@@ -3,16 +3,23 @@ package info.nightscout.androidaps.plugins.general.actions;
import android.app.Activity;
import android.content.Intent;
+import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import android.widget.LinearLayout;
import com.crashlytics.android.answers.CustomEvent;
import com.squareup.otto.Subscribe;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
import info.nightscout.androidaps.Config;
import info.nightscout.androidaps.activities.HistoryBrowseActivity;
import info.nightscout.androidaps.MainApp;
@@ -25,19 +32,22 @@ import info.nightscout.androidaps.events.EventInitializationChanged;
import info.nightscout.androidaps.events.EventRefreshOverview;
import info.nightscout.androidaps.events.EventTempBasalChange;
import info.nightscout.androidaps.interfaces.PumpInterface;
+import info.nightscout.androidaps.plugins.common.SubscriberFragment;
+import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
+import info.nightscout.androidaps.plugins.general.actions.ActionsPlugin;
+import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction;
import info.nightscout.androidaps.plugins.general.actions.dialogs.FillDialog;
import info.nightscout.androidaps.plugins.general.actions.dialogs.NewExtendedBolusDialog;
import info.nightscout.androidaps.plugins.general.actions.dialogs.NewTempBasalDialog;
import info.nightscout.androidaps.plugins.general.careportal.CareportalFragment;
import info.nightscout.androidaps.plugins.general.careportal.Dialogs.NewNSTreatmentDialog;
import info.nightscout.androidaps.plugins.general.careportal.OptionsToShow;
-import info.nightscout.androidaps.plugins.common.SubscriberFragment;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
import info.nightscout.androidaps.utils.FabricPrivacy;
import info.nightscout.androidaps.utils.SingleClickButton;
+
/**
* A simple {@link Fragment} subclass.
*/
@@ -49,6 +59,7 @@ public class ActionsFragment extends SubscriberFragment implements View.OnClickL
return actionsPlugin;
}
+ View actionsFragmentView;
SingleClickButton profileSwitch;
SingleClickButton tempTarget;
SingleClickButton extendedBolus;
@@ -59,6 +70,9 @@ public class ActionsFragment extends SubscriberFragment implements View.OnClickL
SingleClickButton tddStats;
SingleClickButton history;
+ private Map pumpCustomActions = new HashMap<>();
+ private List pumpCustomButtons = new ArrayList<>();
+
public ActionsFragment() {
super();
}
@@ -90,6 +104,8 @@ public class ActionsFragment extends SubscriberFragment implements View.OnClickL
history.setOnClickListener(this);
tddStats.setOnClickListener(this);
+ actionsFragmentView = view;
+
updateGUI();
return view;
} catch (Exception e) {
@@ -192,13 +208,87 @@ public class ActionsFragment extends SubscriberFragment implements View.OnClickL
else
tempTarget.setVisibility(View.VISIBLE);
- if (!ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription().supportsTDDs) tddStats.setVisibility(View.GONE);
- else tddStats.setVisibility(View.VISIBLE);
+ if (!pump.getPumpDescription().supportsTDDs)
+ tddStats.setVisibility(View.GONE);
+ else
+ tddStats.setVisibility(View.VISIBLE);
+
+ checkPumpCustomActions();
+
}
});
}
+ View.OnClickListener pumpCustomActionsListener = v -> {
+
+ SingleClickButton btn = (SingleClickButton)v;
+
+ CustomAction customAction = this.pumpCustomActions.get(btn.getText().toString());
+
+ ConfigBuilderPlugin.getPlugin().getActivePump().executeCustomAction(customAction.getCustomActionType());
+
+ };
+
+
+ private void checkPumpCustomActions() {
+
+ PumpInterface activePump = ConfigBuilderPlugin.getPlugin().getActivePump();
+
+ removePumpCustomActions();
+
+ if (activePump == null) {
+ return;
+ }
+
+ List customActions = activePump.getCustomActions();
+
+ if (customActions != null && customActions.size()>0) {
+
+ LinearLayout ll = actionsFragmentView.findViewById(R.id.action_buttons_layout);
+
+ for (CustomAction customAction : customActions) {
+
+ SingleClickButton btn = new SingleClickButton(getContext(), null, android.R.attr.buttonStyle);
+ btn.setText(MainApp.gs(customAction.getName()));
+
+ LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(
+ LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT, 0.5f);
+ layoutParams.setMargins(20, 8, 20, 8); // 10,3,10,3
+
+ btn.setLayoutParams(layoutParams);
+ btn.setOnClickListener(pumpCustomActionsListener);
+
+ Drawable top = getResources().getDrawable(customAction.getIconResourceId());
+ btn.setCompoundDrawablesWithIntrinsicBounds(null, top, null, null);
+
+ ll.addView(btn);
+
+ this.pumpCustomActions.put(MainApp.gs(customAction.getName()), customAction);
+ this.pumpCustomButtons.add(btn);
+
+ }
+ }
+
+ }
+
+
+ private void removePumpCustomActions() {
+
+ if (pumpCustomActions.size()==0)
+ return;
+
+ LinearLayout ll = actionsFragmentView.findViewById(R.id.action_buttons_layout);
+
+ for (SingleClickButton customButton : pumpCustomButtons) {
+ ll.removeView(customButton);
+ }
+
+ pumpCustomButtons.clear();
+ pumpCustomActions.clear();
+ }
+
+
@Override
public void onClick(View view) {
FragmentManager manager = getFragmentManager();
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/defs/CustomAction.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/defs/CustomAction.java
new file mode 100644
index 0000000000..e5e119baad
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/defs/CustomAction.java
@@ -0,0 +1,47 @@
+package info.nightscout.androidaps.plugins.general.actions.defs;
+
+import info.nightscout.androidaps.R;
+
+/**
+ * Created by andy on 9/20/18.
+ */
+
+public class CustomAction {
+
+ private int name;
+ private String iconName;
+ private CustomActionType customActionType;
+ private int iconResourceId;
+
+
+ public CustomAction(int nameResourceId, CustomActionType actionType) {
+ this.name = nameResourceId;
+ this.customActionType = actionType;
+ this.iconResourceId = R.drawable.icon_actions_profileswitch;
+ }
+
+ public CustomAction(int nameResourceId, CustomActionType actionType, int iconResourceId) {
+ this.name = nameResourceId;
+ this.customActionType = actionType;
+ this.iconResourceId = iconResourceId;
+ }
+
+
+ public int getName() {
+
+ return name;
+ }
+
+
+
+
+ public CustomActionType getCustomActionType() {
+
+ return customActionType;
+ }
+
+
+ public int getIconResourceId() {
+ return iconResourceId;
+ }
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/defs/CustomActionType.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/defs/CustomActionType.java
new file mode 100644
index 0000000000..74ecf3c0e3
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/defs/CustomActionType.java
@@ -0,0 +1,11 @@
+package info.nightscout.androidaps.plugins.general.actions.defs;
+
+/**
+ * Created by andy on 9/20/18.
+ */
+
+public interface CustomActionType {
+
+ String getKey();
+
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/CareportalFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/CareportalFragment.java
index 058c31b0b5..991fc962ee 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/CareportalFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/CareportalFragment.java
@@ -229,8 +229,8 @@ public class CareportalFragment extends SubscriberFragment implements View.OnCli
double sageWarn = nsSettings.getExtendedWarnValue("sage", "warn", 164);
handleAge(sage, CareportalEvent.SENSORCHANGE, sageWarn, sageUrgent);
- double pbageUrgent = nsSettings.getExtendedWarnValue("pgage", "urgent", 360);
- double pbageWarn = nsSettings.getExtendedWarnValue("pgage", "warn", 240);
+ double pbageUrgent = nsSettings.getExtendedWarnValue("bage", "urgent", 360);
+ double pbageWarn = nsSettings.getExtendedWarnValue("bage", "warn", 240);
handleAge(pbage, CareportalEvent.PUMPBATTERYCHANGE, pbageWarn, pbageUrgent);
}
);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/Dialogs/NewNSTreatmentDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/Dialogs/NewNSTreatmentDialog.java
index 1e38a0131a..e4eccd18d9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/Dialogs/NewNSTreatmentDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/Dialogs/NewNSTreatmentDialog.java
@@ -722,7 +722,7 @@ public class NewNSTreatmentDialog extends DialogFragment implements View.OnClick
public void createNSTreatment(JSONObject data) {
if (options.executeProfileSwitch) {
if (data.has("profile")) {
- doProfileSwitch(profileStore, JsonHelper.safeGetString(data, "profile"), JsonHelper.safeGetInt(data, "duration"), JsonHelper.safeGetInt(data, "percentage"), JsonHelper.safeGetInt(data, "timeshift"));
+ ProfileFunctions.doProfileSwitch(profileStore, JsonHelper.safeGetString(data, "profile"), JsonHelper.safeGetInt(data, "duration"), JsonHelper.safeGetInt(data, "percentage"), JsonHelper.safeGetInt(data, "timeshift"));
}
} else if (options.executeTempTarget) {
final int duration = JsonHelper.safeGetInt(data, "duration");
@@ -746,7 +746,7 @@ public class NewNSTreatmentDialog extends DialogFragment implements View.OnClick
}
} else {
if (JsonHelper.safeGetString(data, "eventType").equals(CareportalEvent.PROFILESWITCH)) {
- ProfileSwitch profileSwitch = prepareProfileSwitch(
+ ProfileSwitch profileSwitch = ProfileFunctions.prepareProfileSwitch(
profileStore,
JsonHelper.safeGetString(data, "profile"),
JsonHelper.safeGetInt(data, "duration"),
@@ -762,46 +762,6 @@ public class NewNSTreatmentDialog extends DialogFragment implements View.OnClick
}
}
- public static ProfileSwitch prepareProfileSwitch(final ProfileStore profileStore, final String profileName, final int duration, final int percentage, final int timeshift, long date) {
- ProfileSwitch profileSwitch = new ProfileSwitch();
- profileSwitch.date = date;
- profileSwitch.source = Source.USER;
- profileSwitch.profileName = profileName;
- profileSwitch.profileJson = profileStore.getSpecificProfile(profileName).getData().toString();
- profileSwitch.profilePlugin = ConfigBuilderPlugin.getPlugin().getActiveProfileInterface().getClass().getName();
- profileSwitch.durationInMinutes = duration;
- profileSwitch.isCPP = percentage != 100 || timeshift != 0;
- profileSwitch.timeshift = timeshift;
- profileSwitch.percentage = percentage;
- return profileSwitch;
- }
-
- public static void doProfileSwitch(final ProfileStore profileStore, final String profileName, final int duration, final int percentage, final int timeshift) {
- ProfileSwitch profileSwitch = prepareProfileSwitch(profileStore, profileName, duration, percentage, timeshift, System.currentTimeMillis());
- TreatmentsPlugin.getPlugin().addToHistoryProfileSwitch(profileSwitch);
- FabricPrivacy.getInstance().logCustom(new CustomEvent("ProfileSwitch"));
- }
-
- public static void doProfileSwitch(final int duration, final int percentage, final int timeshift) {
- ProfileSwitch profileSwitch = TreatmentsPlugin.getPlugin().getProfileSwitchFromHistory(System.currentTimeMillis());
- if (profileSwitch != null) {
- profileSwitch = new ProfileSwitch();
- profileSwitch.date = System.currentTimeMillis();
- profileSwitch.source = Source.USER;
- profileSwitch.profileName = ProfileFunctions.getInstance().getProfileName(System.currentTimeMillis(), false);
- profileSwitch.profileJson = ProfileFunctions.getInstance().getProfile().getData().toString();
- profileSwitch.profilePlugin = ConfigBuilderPlugin.getPlugin().getActiveProfileInterface().getClass().getName();
- profileSwitch.durationInMinutes = duration;
- profileSwitch.isCPP = percentage != 100 || timeshift != 0;
- profileSwitch.timeshift = timeshift;
- profileSwitch.percentage = percentage;
- TreatmentsPlugin.getPlugin().addToHistoryProfileSwitch(profileSwitch);
- FabricPrivacy.getInstance().logCustom(new CustomEvent("ProfileSwitch"));
- } else {
- log.error("No profile switch existing");
- }
- }
-
@Override
public void onSaveInstanceState(Bundle savedInstanceState) {
savedInstanceState.putString("notesEdit", notesEdit.getText().toString());
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NsClientReceiverDelegate.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NsClientReceiverDelegate.java
index 07d76d90fe..8eeee8c43c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NsClientReceiverDelegate.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NsClientReceiverDelegate.java
@@ -48,9 +48,7 @@ class NsClientReceiverDelegate {
bus.post(event);
context.registerReceiver(chargingStateReceiver,
- new IntentFilter(Intent.ACTION_POWER_CONNECTED));
- context.registerReceiver(chargingStateReceiver,
- new IntentFilter(Intent.ACTION_POWER_DISCONNECTED));
+ new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
EventChargingState eventChargingState = chargingStateReceiver.grabChargingState(context);
if (eventChargingState != null)
@@ -97,7 +95,7 @@ class NsClientReceiverDelegate {
}
void processStateChange() {
- boolean newAllowedState = allowedChargingState && allowedNetworkState;
+ boolean newAllowedState = allowedChargingState && allowedNetworkState;
if (newAllowedState != allowed) {
allowed = newAllowedState;
bus.post(new EventPreferenceChange(R.string.key_nsclientinternal_paused));
@@ -109,7 +107,9 @@ class NsClientReceiverDelegate {
boolean newAllowedState = true;
- if (!ev.isCharging && chargingOnly) newAllowedState = false;
+ if (!ev.isCharging && chargingOnly) {
+ newAllowedState = false;
+ }
return newAllowedState;
}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/Dialogs/WizardDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/Dialogs/WizardDialog.java
index d357bf9f06..33b3019668 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/Dialogs/WizardDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/Dialogs/WizardDialog.java
@@ -51,17 +51,16 @@ import info.nightscout.androidaps.db.DatabaseHelper;
import info.nightscout.androidaps.db.Source;
import info.nightscout.androidaps.db.TempTarget;
import info.nightscout.androidaps.events.EventFeatureRunning;
-import info.nightscout.androidaps.events.EventNewBG;
import info.nightscout.androidaps.events.EventRefreshOverview;
import info.nightscout.androidaps.interfaces.Constraint;
import info.nightscout.androidaps.interfaces.PluginType;
import info.nightscout.androidaps.interfaces.PumpInterface;
+import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin;
import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.CobInfo;
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventAutosensCalculationFinished;
-import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin;
import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
import info.nightscout.androidaps.queue.Callback;
import info.nightscout.androidaps.utils.BolusWizard;
@@ -165,18 +164,6 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
}
- @Subscribe
- public void onStatusEvent(final EventNewBG e) {
- Activity activity = getActivity();
- if (activity != null)
- activity.runOnUiThread(new Runnable() {
- @Override
- public void run() {
- calculateInsulin();
- }
- });
- }
-
@Subscribe
public void onStatusEvent(final EventAutosensCalculationFinished e) {
Activity activity = getActivity();
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/Notification.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/Notification.java
index 5477963240..3b6bcf615d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/Notification.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/Notification.java
@@ -73,6 +73,7 @@ public class Notification {
public static final int INSIGHT_TIMEOUT_DURING_HANDSHAKE = 48;
public static final int DST_LOOP_DISABLED = 49;
public static final int DST_IN_24H = 50;
+ public static final int DISKFULL = 51;
public int id;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.java
index 04d5e9ffbe..0287c21260 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.java
@@ -27,7 +27,6 @@ import info.nightscout.androidaps.db.DatabaseHelper;
import info.nightscout.androidaps.db.TemporaryBasal;
import info.nightscout.androidaps.events.EventExtendedBolusChange;
import info.nightscout.androidaps.events.EventInitializationChanged;
-import info.nightscout.androidaps.events.EventNewBG;
import info.nightscout.androidaps.events.EventNewBasalProfile;
import info.nightscout.androidaps.events.EventPreferenceChange;
import info.nightscout.androidaps.events.EventRefreshOverview;
@@ -39,6 +38,7 @@ import info.nightscout.androidaps.interfaces.PluginType;
import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventAutosensCalculationFinished;
import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
import info.nightscout.androidaps.utils.DecimalFormatter;
@@ -283,7 +283,7 @@ public class PersistentNotificationPlugin extends PluginBase {
}
@Subscribe
- public void onStatusEvent(final EventNewBG ev) {
+ public void onStatusEvent(final EventAutosensCalculationFinished ev) {
triggerNotificationUpdate();
}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/AuthRequest.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/AuthRequest.java
new file mode 100644
index 0000000000..4b05072eb1
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/AuthRequest.java
@@ -0,0 +1,59 @@
+package info.nightscout.androidaps.plugins.general.smsCommunicator;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import info.nightscout.androidaps.Constants;
+import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.utils.DateUtil;
+
+class AuthRequest {
+ private static Logger log = LoggerFactory.getLogger(L.SMS);
+
+ Sms requester;
+ String confirmCode;
+ private Runnable action;
+
+ private long date;
+
+ private boolean processed;
+ private SmsCommunicatorPlugin plugin;
+
+ AuthRequest(SmsCommunicatorPlugin plugin, Sms requester, String requestText, String confirmCode, SmsAction action) {
+ this.requester = requester;
+ this.confirmCode = confirmCode;
+ this.action = action;
+ this.plugin = plugin;
+
+ this.date = DateUtil.now();
+
+ plugin.sendSMS(new Sms(requester.phoneNumber, requestText));
+ }
+
+ void action(String codeReceived) {
+ if (processed) {
+ if (L.isEnabled(L.SMS))
+ log.debug("Already processed");
+ return;
+ }
+ if (!confirmCode.equals(codeReceived)) {
+ processed = true;
+ if (L.isEnabled(L.SMS))
+ log.debug("Wrong code");
+ plugin.sendSMS(new Sms(requester.phoneNumber, R.string.sms_wrongcode));
+ return;
+ }
+ if (DateUtil.now() - date < Constants.SMS_CONFIRM_TIMEOUT) {
+ processed = true;
+ if (L.isEnabled(L.SMS))
+ log.debug("Processing confirmed SMS: " + requester.text);
+ if (action != null)
+ action.run();
+ return;
+ }
+ if (L.isEnabled(L.SMS))
+ log.debug("Timed out SMS: " + requester.text);
+ }
+
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/Sms.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/Sms.java
new file mode 100644
index 0000000000..2eedfa0a51
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/Sms.java
@@ -0,0 +1,42 @@
+package info.nightscout.androidaps.plugins.general.smsCommunicator;
+
+import android.telephony.SmsMessage;
+
+import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.utils.DateUtil;
+
+class Sms {
+ String phoneNumber;
+ String text;
+ long date;
+ boolean received = false;
+ boolean sent = false;
+ boolean processed = false;
+ boolean ignored = false;
+
+ Sms(SmsMessage message) {
+ phoneNumber = message.getOriginatingAddress();
+ text = message.getMessageBody();
+ date = message.getTimestampMillis();
+ received = true;
+ }
+
+ Sms(String phoneNumber, String text) {
+ this.phoneNumber = phoneNumber;
+ this.text = text;
+ this.date = DateUtil.now();
+ sent = true;
+ }
+
+ Sms(String phoneNumber, int textId) {
+ this.phoneNumber = phoneNumber;
+ this.text = MainApp.gs(textId);
+ this.date = DateUtil.now();
+ sent = true;
+ }
+
+ public String toString() {
+ return "SMS from " + phoneNumber + ": " + text;
+ }
+}
+
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsAction.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsAction.java
new file mode 100644
index 0000000000..6b5d5b8747
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsAction.java
@@ -0,0 +1,33 @@
+package info.nightscout.androidaps.plugins.general.smsCommunicator;
+
+abstract class SmsAction implements Runnable {
+ Double aDouble;
+ Integer anInteger;
+ Integer secondInteger;
+ String aString;
+
+ SmsAction() {}
+
+ SmsAction(Double aDouble) {
+ this.aDouble = aDouble;
+ }
+
+ SmsAction(Double aDouble, Integer secondInteger) {
+ this.aDouble = aDouble;
+ this.secondInteger = secondInteger;
+ }
+
+ SmsAction(String aString, Integer secondInteger) {
+ this.aString = aString;
+ this.secondInteger = secondInteger;
+ }
+
+ SmsAction(Integer anInteger) {
+ this.anInteger = anInteger;
+ }
+
+ SmsAction(Integer anInteger, Integer secondInteger) {
+ this.anInteger = anInteger;
+ this.secondInteger = secondInteger;
+ }
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorFragment.java
index 8e46159bd9..d1c4adf5fe 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorFragment.java
@@ -3,7 +3,6 @@ package info.nightscout.androidaps.plugins.general.smsCommunicator;
import android.app.Activity;
import android.os.Bundle;
-import android.support.v4.app.Fragment;
import android.text.Html;
import android.view.LayoutInflater;
import android.view.View;
@@ -12,9 +11,6 @@ import android.widget.TextView;
import com.squareup.otto.Subscribe;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import java.util.Collections;
import java.util.Comparator;
@@ -22,14 +18,8 @@ import info.nightscout.androidaps.R;
import info.nightscout.androidaps.plugins.common.SubscriberFragment;
import info.nightscout.androidaps.plugins.general.smsCommunicator.events.EventSmsCommunicatorUpdateGui;
import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.FabricPrivacy;
-/**
- * A simple {@link Fragment} subclass.
- */
public class SmsCommunicatorFragment extends SubscriberFragment {
- private static Logger log = LoggerFactory.getLogger(SmsCommunicatorFragment.class);
-
TextView logView;
public SmsCommunicatorFragment() {
@@ -39,18 +29,11 @@ public class SmsCommunicatorFragment extends SubscriberFragment {
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
- try {
- View view = inflater.inflate(R.layout.smscommunicator_fragment, container, false);
+ View view = inflater.inflate(R.layout.smscommunicator_fragment, container, false);
- logView = (TextView) view.findViewById(R.id.smscommunicator_log);
+ logView = (TextView) view.findViewById(R.id.smscommunicator_log);
- updateGUI();
- return view;
- } catch (Exception e) {
- FabricPrivacy.logException(e);
- }
-
- return null;
+ return view;
}
@Subscribe
@@ -58,35 +41,33 @@ public class SmsCommunicatorFragment extends SubscriberFragment {
updateGUI();
}
-
@Override
protected void updateGUI() {
Activity activity = getActivity();
if (activity != null)
- activity.runOnUiThread(new Runnable() {
- @Override
- public void run() {
- class CustomComparator implements Comparator {
- public int compare(SmsCommunicatorPlugin.Sms object1, SmsCommunicatorPlugin.Sms object2) {
- return (int) (object1.date - object2.date);
- }
+ activity.runOnUiThread(() -> {
+ class CustomComparator implements Comparator {
+ public int compare(Sms object1, Sms object2) {
+ return (int) (object1.date - object2.date);
}
- Collections.sort(SmsCommunicatorPlugin.getPlugin().messages, new CustomComparator());
- int messagesToShow = 40;
-
- int start = Math.max(0, SmsCommunicatorPlugin.getPlugin().messages.size() - messagesToShow);
-
- String logText = "";
- for (int x = start; x < SmsCommunicatorPlugin.getPlugin().messages.size(); x++) {
- SmsCommunicatorPlugin.Sms sms = SmsCommunicatorPlugin.getPlugin().messages.get(x);
- if (sms.received) {
- logText += DateUtil.timeString(sms.date) + " <<< " + (sms.processed ? "● " : "○ ") + sms.phoneNumber + " " + sms.text + "
";
- } else if (sms.sent) {
- logText += DateUtil.timeString(sms.date) + " >>> " + (sms.processed ? "● " : "○ ") + sms.phoneNumber + " " + sms.text + "
";
- }
- }
- logView.setText(Html.fromHtml(logText));
}
+ Collections.sort(SmsCommunicatorPlugin.getPlugin().messages, new CustomComparator());
+ int messagesToShow = 40;
+
+ int start = Math.max(0, SmsCommunicatorPlugin.getPlugin().messages.size() - messagesToShow);
+
+ String logText = "";
+ for (int x = start; x < SmsCommunicatorPlugin.getPlugin().messages.size(); x++) {
+ Sms sms = SmsCommunicatorPlugin.getPlugin().messages.get(x);
+ if (sms.ignored) {
+ logText += DateUtil.timeString(sms.date) + " <<< " + "░ " + sms.phoneNumber + " " + sms.text + "
";
+ } else if (sms.received) {
+ logText += DateUtil.timeString(sms.date) + " <<< " + (sms.processed ? "● " : "○ ") + sms.phoneNumber + " " + sms.text + "
";
+ } else if (sms.sent) {
+ logText += DateUtil.timeString(sms.date) + " >>> " + (sms.processed ? "● " : "○ ") + sms.phoneNumber + " " + sms.text + "
";
+ }
+ }
+ logView.setText(Html.fromHtml(logText));
});
}
}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.java
index 95ceccab3d..e4ec65df11 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.java
@@ -3,30 +3,27 @@ package info.nightscout.androidaps.plugins.general.smsCommunicator;
import android.content.Intent;
import android.content.pm.ResolveInfo;
import android.os.Bundle;
-import android.os.SystemClock;
import android.telephony.SmsManager;
import android.telephony.SmsMessage;
-import com.crashlytics.android.answers.CustomEvent;
import com.squareup.otto.Subscribe;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.text.Normalizer;
import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
import info.nightscout.androidaps.Constants;
import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
-import info.nightscout.androidaps.services.Intents;
import info.nightscout.androidaps.data.DetailedBolusInfo;
import info.nightscout.androidaps.data.GlucoseStatus;
import info.nightscout.androidaps.data.IobTotal;
import info.nightscout.androidaps.data.Profile;
+import info.nightscout.androidaps.data.ProfileStore;
import info.nightscout.androidaps.db.BgReading;
import info.nightscout.androidaps.db.DatabaseHelper;
import info.nightscout.androidaps.db.Source;
@@ -36,27 +33,32 @@ import info.nightscout.androidaps.interfaces.Constraint;
import info.nightscout.androidaps.interfaces.PluginBase;
import info.nightscout.androidaps.interfaces.PluginDescription;
import info.nightscout.androidaps.interfaces.PluginType;
+import info.nightscout.androidaps.interfaces.ProfileInterface;
import info.nightscout.androidaps.interfaces.PumpInterface;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
+import info.nightscout.androidaps.logging.L;
import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin;
+import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
+import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
import info.nightscout.androidaps.plugins.general.smsCommunicator.events.EventSmsCommunicatorUpdateGui;
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.CobInfo;
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
import info.nightscout.androidaps.queue.Callback;
+import info.nightscout.androidaps.services.Intents;
+import info.nightscout.androidaps.utils.DateUtil;
import info.nightscout.androidaps.utils.DecimalFormatter;
-import info.nightscout.androidaps.utils.FabricPrivacy;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
import info.nightscout.androidaps.utils.SP;
import info.nightscout.androidaps.utils.SafeParse;
-import info.nightscout.androidaps.utils.T;
import info.nightscout.androidaps.utils.XdripCalibrations;
/**
* Created by mike on 05.08.2016.
*/
public class SmsCommunicatorPlugin extends PluginBase {
- private static Logger log = LoggerFactory.getLogger(SmsCommunicatorPlugin.class);
+ private static Logger log = LoggerFactory.getLogger(L.SMS);
private static SmsCommunicatorPlugin smsCommunicatorPlugin;
@@ -68,59 +70,15 @@ public class SmsCommunicatorPlugin extends PluginBase {
return smsCommunicatorPlugin;
}
- private List allowedNumbers = new ArrayList<>();
+ List allowedNumbers = new ArrayList<>();
- class Sms {
- String phoneNumber;
- String text;
- long date;
- boolean received = false;
- boolean sent = false;
- boolean processed = false;
+ AuthRequest messageToConfirm = null;
- String confirmCode;
- double bolusRequested = 0d;
- double tempBasal = 0d;
- double calibrationRequested = 0d;
- int duration = 0;
-
- Sms(SmsMessage message) {
- phoneNumber = message.getOriginatingAddress();
- text = message.getMessageBody();
- date = message.getTimestampMillis();
- received = true;
- }
-
- Sms(String phoneNumber, String text, long date) {
- this.phoneNumber = phoneNumber;
- this.text = text;
- this.date = date;
- sent = true;
- }
-
- Sms(String phoneNumber, String text, long date, String confirmCode) {
- this.phoneNumber = phoneNumber;
- this.text = text;
- this.date = date;
- this.confirmCode = confirmCode;
- sent = true;
- }
-
- public String toString() {
- return "SMS from " + phoneNumber + ": " + text;
- }
- }
-
- private Sms cancelTempBasalWaitingForConfirmation = null;
- private Sms tempBasalWaitingForConfirmation = null;
- private Sms bolusWaitingForConfirmation = null;
- private Sms calibrationWaitingForConfirmation = null;
- private Sms suspendWaitingForConfirmation = null;
- private Date lastRemoteBolusTime = new Date(0);
+ long lastRemoteBolusTime = 0;
ArrayList messages = new ArrayList<>();
- private SmsCommunicatorPlugin() {
+ SmsCommunicatorPlugin() {
super(new PluginDescription()
.mainType(PluginType.GENERAL)
.fragmentClass(SmsCommunicatorFragment.class.getName())
@@ -159,7 +117,26 @@ public class SmsCommunicatorPlugin extends PluginBase {
}
}
- private boolean isAllowedNumber(String number) {
+ boolean isCommand(String command, String number) {
+ switch(command.toUpperCase()) {
+ case "BG":
+ case "LOOP":
+ case "TREATMENTS":
+ case "NSCLIENT":
+ case "PUMP":
+ case "BASAL":
+ case "BOLUS":
+ case "EXTENDED":
+ case "CAL":
+ case "PROFILE":
+ return true;
+ }
+ if (messageToConfirm != null && messageToConfirm.requester.phoneNumber.equals(number))
+ return true;
+ return false;
+ }
+
+ boolean isAllowedNumber(String number) {
for (String num : allowedNumbers) {
if (num.equals(number)) return true;
}
@@ -180,367 +157,103 @@ public class SmsCommunicatorPlugin extends PluginBase {
}
}
- private void processSms(final Sms receivedSms) {
+ void processSms(final Sms receivedSms) {
if (!isEnabled(PluginType.GENERAL)) {
log.debug("Ignoring SMS. Plugin disabled.");
return;
}
if (!isAllowedNumber(receivedSms.phoneNumber)) {
log.debug("Ignoring SMS from: " + receivedSms.phoneNumber + ". Sender not allowed");
+ receivedSms.ignored = true;
+ messages.add(receivedSms);
+ MainApp.bus().post(new EventSmsCommunicatorUpdateGui());
return;
}
- String reply = "";
-
messages.add(receivedSms);
log.debug(receivedSms.toString());
- String[] splited = receivedSms.text.split("\\s+");
- Double amount;
- Double tempBasal;
- int duration = 0;
- String passCode;
+ String[] splitted = receivedSms.text.split("\\s+");
boolean remoteCommandsAllowed = SP.getBoolean(R.string.key_smscommunicator_remotecommandsallowed, false);
- if (splited.length > 0) {
- switch (splited[0].toUpperCase()) {
+ if (splitted.length > 0 && isCommand(splitted[0].toUpperCase(), receivedSms.phoneNumber)) {
+ switch (splitted[0].toUpperCase()) {
case "BG":
- BgReading actualBG = DatabaseHelper.actualBg();
- BgReading lastBG = DatabaseHelper.lastBg();
-
- String units = ProfileFunctions.getInstance().getProfileUnits();
-
- if (actualBG != null) {
- reply = MainApp.gs(R.string.sms_actualbg) + " " + actualBG.valueToUnitsToString(units) + ", ";
- } else if (lastBG != null) {
- Long agoMsec = System.currentTimeMillis() - lastBG.date;
- int agoMin = (int) (agoMsec / 60d / 1000d);
- reply = MainApp.gs(R.string.sms_lastbg) + " " + lastBG.valueToUnitsToString(units) + " " + String.format(MainApp.gs(R.string.sms_minago), agoMin) + ", ";
- }
- GlucoseStatus glucoseStatus = GlucoseStatus.getGlucoseStatusData();
- if (glucoseStatus != null)
- reply += MainApp.gs(R.string.sms_delta) + " " + Profile.toUnitsString(glucoseStatus.delta, glucoseStatus.delta * Constants.MGDL_TO_MMOLL, units) + " " + units + ", ";
-
- TreatmentsPlugin.getPlugin().updateTotalIOBTreatments();
- IobTotal bolusIob = TreatmentsPlugin.getPlugin().getLastCalculationTreatments().round();
- TreatmentsPlugin.getPlugin().updateTotalIOBTempBasals();
- IobTotal basalIob = TreatmentsPlugin.getPlugin().getLastCalculationTempBasals().round();
-
- reply += MainApp.gs(R.string.sms_iob) + " " + DecimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob) + "U ("
- + MainApp.gs(R.string.sms_bolus) + " " + DecimalFormatter.to2Decimal(bolusIob.iob) + "U "
- + MainApp.gs(R.string.sms_basal) + " " + DecimalFormatter.to2Decimal(basalIob.basaliob) + "U)";
-
- sendSMS(new Sms(receivedSms.phoneNumber, reply, System.currentTimeMillis()));
- receivedSms.processed = true;
- FabricPrivacy.getInstance().logCustom(new CustomEvent("SMS_Bg"));
+ processBG(splitted, receivedSms);
break;
case "LOOP":
- if (splited.length > 1)
- switch (splited[1].toUpperCase()) {
- case "DISABLE":
- case "STOP":
- LoopPlugin loopPlugin = MainApp.getSpecificPlugin(LoopPlugin.class);
- if (loopPlugin != null && loopPlugin.isEnabled(PluginType.LOOP)) {
- loopPlugin.setPluginEnabled(PluginType.LOOP, false);
- ConfigBuilderPlugin.getPlugin().getCommandQueue().cancelTempBasal(true, new Callback() {
- @Override
- public void run() {
- MainApp.bus().post(new EventRefreshOverview("SMS_LOOP_STOP"));
- String reply = MainApp.gs(R.string.smscommunicator_loophasbeendisabled) + " " +
- MainApp.gs(result.success ? R.string.smscommunicator_tempbasalcanceled : R.string.smscommunicator_tempbasalcancelfailed);
- sendSMS(new Sms(receivedSms.phoneNumber, reply, System.currentTimeMillis()));
- }
- });
- }
- receivedSms.processed = true;
- FabricPrivacy.getInstance().logCustom(new CustomEvent("SMS_Loop_Stop"));
- break;
- case "ENABLE":
- case "START":
- loopPlugin = MainApp.getSpecificPlugin(LoopPlugin.class);
- if (loopPlugin != null && !loopPlugin.isEnabled(PluginType.LOOP)) {
- loopPlugin.setPluginEnabled(PluginType.LOOP, true);
- reply = MainApp.gs(R.string.smscommunicator_loophasbeenenabled);
- sendSMS(new Sms(receivedSms.phoneNumber, reply, System.currentTimeMillis()));
- MainApp.bus().post(new EventRefreshOverview("SMS_LOOP_START"));
- }
- receivedSms.processed = true;
- FabricPrivacy.getInstance().logCustom(new CustomEvent("SMS_Loop_Start"));
- break;
- case "STATUS":
- loopPlugin = MainApp.getSpecificPlugin(LoopPlugin.class);
- if (loopPlugin != null) {
- if (loopPlugin.isEnabled(PluginType.LOOP)) {
- if (loopPlugin.isSuspended())
- reply = String.format(MainApp.gs(R.string.loopsuspendedfor), loopPlugin.minutesToEndOfSuspend());
- else
- reply = MainApp.gs(R.string.smscommunicator_loopisenabled);
- } else {
- reply = MainApp.gs(R.string.smscommunicator_loopisdisabled);
- }
- sendSMS(new Sms(receivedSms.phoneNumber, reply, System.currentTimeMillis()));
- }
- receivedSms.processed = true;
- FabricPrivacy.getInstance().logCustom(new CustomEvent("SMS_Loop_Status"));
- break;
- case "RESUME":
- LoopPlugin.getPlugin().suspendTo(0);
- MainApp.bus().post(new EventRefreshOverview("SMS_LOOP_RESUME"));
- NSUpload.uploadOpenAPSOffline(0);
- reply = MainApp.gs(R.string.smscommunicator_loopresumed);
- sendSMSToAllNumbers(new Sms(receivedSms.phoneNumber, reply, System.currentTimeMillis()));
- FabricPrivacy.getInstance().logCustom(new CustomEvent("SMS_Loop_Resume"));
- break;
- case "SUSPEND":
- if (splited.length >= 3)
- duration = SafeParse.stringToInt(splited[2]);
- duration = Math.max(0, duration);
- duration = Math.min(180, duration);
- if (duration == 0) {
- reply = MainApp.gs(R.string.smscommunicator_wrongduration);
- sendSMS(new Sms(receivedSms.phoneNumber, reply, System.currentTimeMillis()));
- } else if (remoteCommandsAllowed) {
- passCode = generatePasscode();
- reply = String.format(MainApp.gs(R.string.smscommunicator_suspendreplywithcode), duration, passCode);
- receivedSms.processed = true;
- resetWaitingMessages();
- sendSMS(suspendWaitingForConfirmation = new Sms(receivedSms.phoneNumber, reply, System.currentTimeMillis(), passCode));
- suspendWaitingForConfirmation.duration = duration;
- FabricPrivacy.getInstance().logCustom(new CustomEvent("SMS_Loop_Suspend"));
- } else {
- reply = MainApp.gs(R.string.smscommunicator_remotecommandnotallowed);
- sendSMS(new Sms(receivedSms.phoneNumber, reply, System.currentTimeMillis()));
- }
- break;
- }
+ if (!remoteCommandsAllowed)
+ sendSMS(new Sms(receivedSms.phoneNumber, R.string.smscommunicator_remotecommandnotallowed));
+ else if (splitted.length == 2 || splitted.length == 3)
+ processLOOP(splitted, receivedSms);
+ else
+ sendSMS(new Sms(receivedSms.phoneNumber, R.string.wrongformat));
break;
case "TREATMENTS":
- if (splited.length > 1)
- switch (splited[1].toUpperCase()) {
- case "REFRESH":
- Intent restartNSClient = new Intent(Intents.ACTION_RESTART);
- TreatmentsPlugin.getPlugin().getService().resetTreatments();
- MainApp.instance().getApplicationContext().sendBroadcast(restartNSClient);
- List q = MainApp.instance().getApplicationContext().getPackageManager().queryBroadcastReceivers(restartNSClient, 0);
- reply = "TERATMENTS REFRESH " + q.size() + " receivers";
- sendSMS(new Sms(receivedSms.phoneNumber, reply, System.currentTimeMillis()));
- receivedSms.processed = true;
- FabricPrivacy.getInstance().logCustom(new CustomEvent("SMS_Treatments_Refresh"));
- break;
- }
+ if (splitted.length == 2)
+ processTREATMENTS(splitted, receivedSms);
+ else
+ sendSMS(new Sms(receivedSms.phoneNumber, R.string.wrongformat));
break;
case "NSCLIENT":
- if (splited.length > 1)
- switch (splited[1].toUpperCase()) {
- case "RESTART":
- Intent restartNSClient = new Intent(Intents.ACTION_RESTART);
- MainApp.instance().getApplicationContext().sendBroadcast(restartNSClient);
- List q = MainApp.instance().getApplicationContext().getPackageManager().queryBroadcastReceivers(restartNSClient, 0);
- reply = "NSCLIENT RESTART " + q.size() + " receivers";
- sendSMS(new Sms(receivedSms.phoneNumber, reply, System.currentTimeMillis()));
- receivedSms.processed = true;
- FabricPrivacy.getInstance().logCustom(new CustomEvent("SMS_Nsclient_Restart"));
- break;
- }
+ if (splitted.length == 2)
+ processNSCLIENT(splitted, receivedSms);
+ else
+ sendSMS(new Sms(receivedSms.phoneNumber, R.string.wrongformat));
break;
case "PUMP":
- case "DANAR":
- ConfigBuilderPlugin.getPlugin().getCommandQueue().readStatus("SMS", new Callback() {
- @Override
- public void run() {
- PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
- if (result.success) {
- if (pump != null) {
- String reply = pump.shortStatus(true);
- sendSMSToAllNumbers(new Sms(receivedSms.phoneNumber, reply, System.currentTimeMillis()));
- }
- } else {
- String reply = MainApp.gs(R.string.readstatusfailed);
- sendSMS(new Sms(receivedSms.phoneNumber, reply, System.currentTimeMillis()));
- }
- }
- });
- receivedSms.processed = true;
- FabricPrivacy.getInstance().logCustom(new CustomEvent("SMS_Pump"));
+ processPUMP(splitted, receivedSms);
+ break;
+ case "PROFILE":
+ if (!remoteCommandsAllowed)
+ sendSMS(new Sms(receivedSms.phoneNumber, R.string.smscommunicator_remotecommandnotallowed));
+ else if (splitted.length == 2 || splitted.length == 3)
+ processPROFILE(splitted, receivedSms);
+ else
+ sendSMS(new Sms(receivedSms.phoneNumber, R.string.wrongformat));
break;
case "BASAL":
- if (splited.length > 1) {
- if (splited[1].toUpperCase().equals("CANCEL") || splited[1].toUpperCase().equals("STOP")) {
- if (remoteCommandsAllowed) {
- passCode = generatePasscode();
- reply = String.format(MainApp.gs(R.string.smscommunicator_basalstopreplywithcode), passCode);
- receivedSms.processed = true;
- resetWaitingMessages();
- sendSMS(cancelTempBasalWaitingForConfirmation = new Sms(receivedSms.phoneNumber, reply, System.currentTimeMillis(), passCode));
- FabricPrivacy.getInstance().logCustom(new CustomEvent("SMS_Basal"));
- } else {
- reply = MainApp.gs(R.string.smscommunicator_remotebasalnotallowed);
- sendSMS(new Sms(receivedSms.phoneNumber, reply, System.currentTimeMillis()));
- }
- } else {
- tempBasal = SafeParse.stringToDouble(splited[1]);
- Profile profile = ProfileFunctions.getInstance().getProfile();
- if (profile == null) {
- reply = MainApp.gs(R.string.noprofile);
- sendSMS(new Sms(receivedSms.phoneNumber, reply, System.currentTimeMillis()));
- } else {
- tempBasal = MainApp.getConstraintChecker().applyBasalConstraints(new Constraint<>(tempBasal), profile).value();
- if (remoteCommandsAllowed) {
- passCode = generatePasscode();
- reply = String.format(MainApp.gs(R.string.smscommunicator_basalreplywithcode), tempBasal, passCode);
- receivedSms.processed = true;
- resetWaitingMessages();
- sendSMS(tempBasalWaitingForConfirmation = new Sms(receivedSms.phoneNumber, reply, System.currentTimeMillis(), passCode));
- tempBasalWaitingForConfirmation.tempBasal = tempBasal;
- FabricPrivacy.getInstance().logCustom(new CustomEvent("SMS_Basal"));
- } else {
- reply = MainApp.gs(R.string.smscommunicator_remotebasalnotallowed);
- sendSMS(new Sms(receivedSms.phoneNumber, reply, System.currentTimeMillis()));
- }
- }
- }
- }
+ if (!remoteCommandsAllowed)
+ sendSMS(new Sms(receivedSms.phoneNumber, R.string.smscommunicator_remotecommandnotallowed));
+ else if (splitted.length == 2 || splitted.length == 3)
+ processBASAL(splitted, receivedSms);
+ else
+ sendSMS(new Sms(receivedSms.phoneNumber, R.string.wrongformat));
+ break;
+ case "EXTENDED":
+ if (!remoteCommandsAllowed)
+ sendSMS(new Sms(receivedSms.phoneNumber, R.string.smscommunicator_remotecommandnotallowed));
+ else if (splitted.length == 2 || splitted.length == 3)
+ processEXTENDED(splitted, receivedSms);
+ else
+ sendSMS(new Sms(receivedSms.phoneNumber, R.string.wrongformat));
break;
case "BOLUS":
- if (System.currentTimeMillis() - lastRemoteBolusTime.getTime() < Constants.remoteBolusMinDistance) {
- reply = MainApp.gs(R.string.smscommunicator_remotebolusnotallowed);
- sendSMS(new Sms(receivedSms.phoneNumber, reply, System.currentTimeMillis()));
- } else if (ConfigBuilderPlugin.getPlugin().getActivePump().isSuspended()) {
- reply = MainApp.gs(R.string.pumpsuspended);
- sendSMS(new Sms(receivedSms.phoneNumber, reply, System.currentTimeMillis()));
- } else if (splited.length > 1) {
- amount = SafeParse.stringToDouble(splited[1]);
- amount = MainApp.getConstraintChecker().applyBolusConstraints(new Constraint<>(amount)).value();
- if (amount > 0d && remoteCommandsAllowed) {
- passCode = generatePasscode();
- reply = String.format(MainApp.gs(R.string.smscommunicator_bolusreplywithcode), amount, passCode);
- receivedSms.processed = true;
- resetWaitingMessages();
- sendSMS(bolusWaitingForConfirmation = new Sms(receivedSms.phoneNumber, reply, System.currentTimeMillis(), passCode));
- bolusWaitingForConfirmation.bolusRequested = amount;
- FabricPrivacy.getInstance().logCustom(new CustomEvent("SMS_Bolus"));
- } else {
- reply = MainApp.gs(R.string.smscommunicator_remotebolusnotallowed);
- sendSMS(new Sms(receivedSms.phoneNumber, reply, System.currentTimeMillis()));
- }
- }
+ if (!remoteCommandsAllowed)
+ sendSMS(new Sms(receivedSms.phoneNumber, R.string.smscommunicator_remotecommandnotallowed));
+ else if (splitted.length == 2 && DateUtil.now() - lastRemoteBolusTime < Constants.remoteBolusMinDistance)
+ sendSMS(new Sms(receivedSms.phoneNumber, R.string.smscommunicator_remotebolusnotallowed));
+ else if (splitted.length == 2 && ConfigBuilderPlugin.getPlugin().getActivePump().isSuspended())
+ sendSMS(new Sms(receivedSms.phoneNumber, R.string.pumpsuspended));
+ else if (splitted.length == 2)
+ processBOLUS(splitted, receivedSms);
+ else
+ sendSMS(new Sms(receivedSms.phoneNumber, R.string.wrongformat));
break;
case "CAL":
- if (splited.length > 1) {
- amount = SafeParse.stringToDouble(splited[1]);
- if (amount > 0d && remoteCommandsAllowed) {
- passCode = generatePasscode();
- reply = String.format(MainApp.gs(R.string.smscommunicator_calibrationreplywithcode), amount, passCode);
- receivedSms.processed = true;
- resetWaitingMessages();
- sendSMS(calibrationWaitingForConfirmation = new Sms(receivedSms.phoneNumber, reply, System.currentTimeMillis(), passCode));
- calibrationWaitingForConfirmation.calibrationRequested = amount;
- FabricPrivacy.getInstance().logCustom(new CustomEvent("SMS_Cal"));
- } else {
- reply = MainApp.gs(R.string.smscommunicator_remotecalibrationnotallowed);
- sendSMS(new Sms(receivedSms.phoneNumber, reply, System.currentTimeMillis()));
- }
- }
+ if (!remoteCommandsAllowed)
+ sendSMS(new Sms(receivedSms.phoneNumber, R.string.smscommunicator_remotecommandnotallowed));
+ else if (splitted.length == 2)
+ processCAL(splitted, receivedSms);
+ else
+ sendSMS(new Sms(receivedSms.phoneNumber, R.string.wrongformat));
break;
default: // expect passCode here
- if (bolusWaitingForConfirmation != null && !bolusWaitingForConfirmation.processed &&
- bolusWaitingForConfirmation.confirmCode.equals(splited[0]) && System.currentTimeMillis() - bolusWaitingForConfirmation.date < Constants.SMS_CONFIRM_TIMEOUT) {
- bolusWaitingForConfirmation.processed = true;
- DetailedBolusInfo detailedBolusInfo = new DetailedBolusInfo();
- detailedBolusInfo.insulin = bolusWaitingForConfirmation.bolusRequested;
- detailedBolusInfo.source = Source.USER;
- ConfigBuilderPlugin.getPlugin().getCommandQueue().bolus(detailedBolusInfo, new Callback() {
- @Override
- public void run() {
- PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
- if (result.success) {
- SystemClock.sleep(T.secs(15).msecs()); // wait some time to get history
- String reply = String.format(MainApp.gs(R.string.smscommunicator_bolusdelivered), result.bolusDelivered);
- if (pump != null)
- reply += "\n" + pump.shortStatus(true);
- lastRemoteBolusTime = new Date();
- sendSMSToAllNumbers(new Sms(receivedSms.phoneNumber, reply, System.currentTimeMillis()));
- } else {
- SystemClock.sleep(T.secs(60).msecs()); // wait some time to get history
- String reply = MainApp.gs(R.string.smscommunicator_bolusfailed);
- if (pump != null)
- reply += "\n" + pump.shortStatus(true);
- sendSMS(new Sms(receivedSms.phoneNumber, reply, System.currentTimeMillis()));
- }
- }
- });
- } else if (tempBasalWaitingForConfirmation != null && !tempBasalWaitingForConfirmation.processed &&
- tempBasalWaitingForConfirmation.confirmCode.equals(splited[0]) && System.currentTimeMillis() - tempBasalWaitingForConfirmation.date < Constants.SMS_CONFIRM_TIMEOUT) {
- tempBasalWaitingForConfirmation.processed = true;
- Profile profile = ProfileFunctions.getInstance().getProfile();
- if (profile != null)
- ConfigBuilderPlugin.getPlugin().getCommandQueue().tempBasalAbsolute(tempBasalWaitingForConfirmation.tempBasal, 30, true, profile, new Callback() {
- @Override
- public void run() {
- if (result.success) {
- String reply = String.format(MainApp.gs(R.string.smscommunicator_tempbasalset), result.absolute, result.duration);
- reply += "\n" + ConfigBuilderPlugin.getPlugin().getActivePump().shortStatus(true);
- sendSMSToAllNumbers(new Sms(receivedSms.phoneNumber, reply, System.currentTimeMillis()));
- } else {
- String reply = MainApp.gs(R.string.smscommunicator_tempbasalfailed);
- reply += "\n" + ConfigBuilderPlugin.getPlugin().getActivePump().shortStatus(true);
- sendSMS(new Sms(receivedSms.phoneNumber, reply, System.currentTimeMillis()));
- }
- }
- });
- } else if (cancelTempBasalWaitingForConfirmation != null && !cancelTempBasalWaitingForConfirmation.processed &&
- cancelTempBasalWaitingForConfirmation.confirmCode.equals(splited[0]) && System.currentTimeMillis() - cancelTempBasalWaitingForConfirmation.date < Constants.SMS_CONFIRM_TIMEOUT) {
- cancelTempBasalWaitingForConfirmation.processed = true;
- ConfigBuilderPlugin.getPlugin().getCommandQueue().cancelTempBasal(true, new Callback() {
- @Override
- public void run() {
- if (result.success) {
- String reply = MainApp.gs(R.string.smscommunicator_tempbasalcanceled);
- reply += "\n" + ConfigBuilderPlugin.getPlugin().getActivePump().shortStatus(true);
- sendSMSToAllNumbers(new Sms(receivedSms.phoneNumber, reply, System.currentTimeMillis()));
- } else {
- String reply = MainApp.gs(R.string.smscommunicator_tempbasalcancelfailed);
- reply += "\n" + ConfigBuilderPlugin.getPlugin().getActivePump().shortStatus(true);
- sendSMS(new Sms(receivedSms.phoneNumber, reply, System.currentTimeMillis()));
- }
- }
- });
- } else if (calibrationWaitingForConfirmation != null && !calibrationWaitingForConfirmation.processed &&
- calibrationWaitingForConfirmation.confirmCode.equals(splited[0]) && System.currentTimeMillis() - calibrationWaitingForConfirmation.date < Constants.SMS_CONFIRM_TIMEOUT) {
- calibrationWaitingForConfirmation.processed = true;
- boolean result = XdripCalibrations.sendIntent(calibrationWaitingForConfirmation.calibrationRequested);
- if (result) {
- reply = MainApp.gs(R.string.smscommunicator_calibrationsent);
- sendSMSToAllNumbers(new Sms(receivedSms.phoneNumber, reply, System.currentTimeMillis()));
- } else {
- reply = MainApp.gs(R.string.smscommunicator_calibrationfailed);
- sendSMS(new Sms(receivedSms.phoneNumber, reply, System.currentTimeMillis()));
- }
- } else if (suspendWaitingForConfirmation != null && !suspendWaitingForConfirmation.processed &&
- suspendWaitingForConfirmation.confirmCode.equals(splited[0]) && System.currentTimeMillis() - suspendWaitingForConfirmation.date < Constants.SMS_CONFIRM_TIMEOUT) {
- suspendWaitingForConfirmation.processed = true;
- final int dur = suspendWaitingForConfirmation.duration;
- ConfigBuilderPlugin.getPlugin().getCommandQueue().cancelTempBasal(true, new Callback() {
- @Override
- public void run() {
- if (result.success) {
- LoopPlugin.getPlugin().suspendTo(System.currentTimeMillis() + dur * 60L * 1000);
- NSUpload.uploadOpenAPSOffline(dur * 60);
- MainApp.bus().post(new EventRefreshOverview("SMS_LOOP_SUSPENDED"));
- String reply = MainApp.gs(R.string.smscommunicator_loopsuspended) + " " +
- MainApp.gs(result.success ? R.string.smscommunicator_tempbasalcanceled : R.string.smscommunicator_tempbasalcancelfailed);
- sendSMSToAllNumbers(new Sms(receivedSms.phoneNumber, reply, System.currentTimeMillis()));
- } else {
- String reply = MainApp.gs(R.string.smscommunicator_tempbasalcancelfailed);
- reply += "\n" + ConfigBuilderPlugin.getPlugin().getActivePump().shortStatus(true);
- sendSMS(new Sms(receivedSms.phoneNumber, reply, System.currentTimeMillis()));
- }
- }
- });
- } else {
- sendSMS(new Sms(receivedSms.phoneNumber, MainApp.gs(R.string.smscommunicator_unknowncommand), System.currentTimeMillis()));
- }
- resetWaitingMessages();
+ if (messageToConfirm != null && messageToConfirm.requester.phoneNumber.equals(receivedSms.phoneNumber)) {
+ messageToConfirm.action(splitted[0]);
+ messageToConfirm = null;
+ } else
+ sendSMS(new Sms(receivedSms.phoneNumber, R.string.smscommunicator_unknowncommand));
break;
}
}
@@ -548,9 +261,491 @@ public class SmsCommunicatorPlugin extends PluginBase {
MainApp.bus().post(new EventSmsCommunicatorUpdateGui());
}
+ @SuppressWarnings("unused")
+ private void processBG(String[] splitted, Sms receivedSms) {
+ BgReading actualBG = DatabaseHelper.actualBg();
+ BgReading lastBG = DatabaseHelper.lastBg();
+
+ String reply = "";
+
+ String units = ProfileFunctions.getInstance().getProfileUnits();
+
+ if (actualBG != null) {
+ reply = MainApp.gs(R.string.sms_actualbg) + " " + actualBG.valueToUnitsToString(units) + ", ";
+ } else if (lastBG != null) {
+ Long agoMsec = System.currentTimeMillis() - lastBG.date;
+ int agoMin = (int) (agoMsec / 60d / 1000d);
+ reply = MainApp.gs(R.string.sms_lastbg) + " " + lastBG.valueToUnitsToString(units) + " " + String.format(MainApp.gs(R.string.sms_minago), agoMin) + ", ";
+ }
+ GlucoseStatus glucoseStatus = GlucoseStatus.getGlucoseStatusData();
+ if (glucoseStatus != null)
+ reply += MainApp.gs(R.string.sms_delta) + " " + Profile.toUnitsString(glucoseStatus.delta, glucoseStatus.delta * Constants.MGDL_TO_MMOLL, units) + " " + units + ", ";
+
+ TreatmentsPlugin.getPlugin().updateTotalIOBTreatments();
+ IobTotal bolusIob = TreatmentsPlugin.getPlugin().getLastCalculationTreatments().round();
+ TreatmentsPlugin.getPlugin().updateTotalIOBTempBasals();
+ IobTotal basalIob = TreatmentsPlugin.getPlugin().getLastCalculationTempBasals().round();
+
+ String cobText = MainApp.gs(R.string.value_unavailable_short);
+ CobInfo cobInfo = IobCobCalculatorPlugin.getPlugin().getCobInfo(false, "SMS COB");
+
+ reply += MainApp.gs(R.string.sms_iob) + " " + DecimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob) + "U ("
+ + MainApp.gs(R.string.sms_bolus) + " " + DecimalFormatter.to2Decimal(bolusIob.iob) + "U "
+ + MainApp.gs(R.string.sms_basal) + " " + DecimalFormatter.to2Decimal(basalIob.basaliob) + "U), "
+ + MainApp.gs(R.string.cob) + ": " + cobInfo.generateCOBString();
+
+ sendSMS(new Sms(receivedSms.phoneNumber, reply));
+ receivedSms.processed = true;
+ }
+
+ private void processLOOP(String[] splitted, Sms receivedSms) {
+ String reply;
+ switch (splitted[1].toUpperCase()) {
+ case "DISABLE":
+ case "STOP":
+ LoopPlugin loopPlugin = MainApp.getSpecificPlugin(LoopPlugin.class);
+ if (loopPlugin != null && loopPlugin.isEnabled(PluginType.LOOP)) {
+ loopPlugin.setPluginEnabled(PluginType.LOOP, false);
+ ConfigBuilderPlugin.getPlugin().getCommandQueue().cancelTempBasal(true, new Callback() {
+ @Override
+ public void run() {
+ MainApp.bus().post(new EventRefreshOverview("SMS_LOOP_STOP"));
+ String reply = MainApp.gs(R.string.smscommunicator_loophasbeendisabled) + " " +
+ MainApp.gs(result.success ? R.string.smscommunicator_tempbasalcanceled : R.string.smscommunicator_tempbasalcancelfailed);
+ sendSMS(new Sms(receivedSms.phoneNumber, reply));
+ }
+ });
+ } else {
+ sendSMS(new Sms(receivedSms.phoneNumber, R.string.smscommunicator_loopisdisabled));
+ }
+ receivedSms.processed = true;
+ break;
+ case "ENABLE":
+ case "START":
+ loopPlugin = MainApp.getSpecificPlugin(LoopPlugin.class);
+ if (loopPlugin != null && !loopPlugin.isEnabled(PluginType.LOOP)) {
+ loopPlugin.setPluginEnabled(PluginType.LOOP, true);
+ sendSMS(new Sms(receivedSms.phoneNumber, R.string.smscommunicator_loophasbeenenabled));
+ MainApp.bus().post(new EventRefreshOverview("SMS_LOOP_START"));
+ } else {
+ sendSMS(new Sms(receivedSms.phoneNumber, R.string.smscommunicator_loopisenabled));
+ }
+ receivedSms.processed = true;
+ break;
+ case "STATUS":
+ loopPlugin = MainApp.getSpecificPlugin(LoopPlugin.class);
+ if (loopPlugin != null) {
+ if (loopPlugin.isEnabled(PluginType.LOOP)) {
+ if (loopPlugin.isSuspended())
+ reply = String.format(MainApp.gs(R.string.loopsuspendedfor), loopPlugin.minutesToEndOfSuspend());
+ else
+ reply = MainApp.gs(R.string.smscommunicator_loopisenabled);
+ } else {
+ reply = MainApp.gs(R.string.smscommunicator_loopisdisabled);
+ }
+ sendSMS(new Sms(receivedSms.phoneNumber, reply));
+ }
+ receivedSms.processed = true;
+ break;
+ case "RESUME":
+ LoopPlugin.getPlugin().suspendTo(0);
+ MainApp.bus().post(new EventRefreshOverview("SMS_LOOP_RESUME"));
+ NSUpload.uploadOpenAPSOffline(0);
+ sendSMSToAllNumbers(new Sms(receivedSms.phoneNumber, R.string.smscommunicator_loopresumed));
+ break;
+ case "SUSPEND":
+ int duration = 0;
+ if (splitted.length == 3)
+ duration = SafeParse.stringToInt(splitted[2]);
+ duration = Math.max(0, duration);
+ duration = Math.min(180, duration);
+ if (duration == 0) {
+ receivedSms.processed = true;
+ sendSMS(new Sms(receivedSms.phoneNumber, R.string.smscommunicator_wrongduration));
+ return;
+ } else {
+ String passCode = generatePasscode();
+ reply = String.format(MainApp.gs(R.string.smscommunicator_suspendreplywithcode), duration, passCode);
+ receivedSms.processed = true;
+ messageToConfirm = new AuthRequest(this, receivedSms, reply, passCode, new SmsAction(duration) {
+ @Override
+ public void run() {
+ ConfigBuilderPlugin.getPlugin().getCommandQueue().cancelTempBasal(true, new Callback() {
+ @Override
+ public void run() {
+ if (result.success) {
+ LoopPlugin.getPlugin().suspendTo(System.currentTimeMillis() + anInteger * 60L * 1000);
+ NSUpload.uploadOpenAPSOffline(anInteger * 60);
+ MainApp.bus().post(new EventRefreshOverview("SMS_LOOP_SUSPENDED"));
+ String reply = MainApp.gs(R.string.smscommunicator_loopsuspended) + " " +
+ MainApp.gs(result.success ? R.string.smscommunicator_tempbasalcanceled : R.string.smscommunicator_tempbasalcancelfailed);
+ sendSMSToAllNumbers(new Sms(receivedSms.phoneNumber, reply));
+ } else {
+ String reply = MainApp.gs(R.string.smscommunicator_tempbasalcancelfailed);
+ reply += "\n" + ConfigBuilderPlugin.getPlugin().getActivePump().shortStatus(true);
+ sendSMS(new Sms(receivedSms.phoneNumber, reply));
+ }
+ }
+ });
+
+ }
+ });
+ }
+ break;
+ default:
+ sendSMS(new Sms(receivedSms.phoneNumber, R.string.wrongformat));
+ break;
+ }
+ }
+
+ private void processTREATMENTS(String[] splitted, Sms receivedSms) {
+ if (splitted[1].toUpperCase().equals("REFRESH")) {
+ Intent restartNSClient = new Intent(Intents.ACTION_RESTART);
+ TreatmentsPlugin.getPlugin().getService().resetTreatments();
+ MainApp.instance().getApplicationContext().sendBroadcast(restartNSClient);
+ List q = MainApp.instance().getApplicationContext().getPackageManager().queryBroadcastReceivers(restartNSClient, 0);
+ String reply = "TREATMENTS REFRESH " + q.size() + " receivers";
+ sendSMS(new Sms(receivedSms.phoneNumber, reply));
+ receivedSms.processed = true;
+ } else
+ sendSMS(new Sms(receivedSms.phoneNumber, R.string.wrongformat));
+ }
+
+ private void processNSCLIENT(String[] splitted, Sms receivedSms) {
+ if (splitted[1].toUpperCase().equals("RESTART")) {
+ Intent restartNSClient = new Intent(Intents.ACTION_RESTART);
+ MainApp.instance().getApplicationContext().sendBroadcast(restartNSClient);
+ List q = MainApp.instance().getApplicationContext().getPackageManager().queryBroadcastReceivers(restartNSClient, 0);
+ String reply = "NSCLIENT RESTART " + q.size() + " receivers";
+ sendSMS(new Sms(receivedSms.phoneNumber, reply));
+ receivedSms.processed = true;
+ } else
+ sendSMS(new Sms(receivedSms.phoneNumber, R.string.wrongformat));
+ }
+
+ @SuppressWarnings("unused")
+ private void processPUMP(String[] splitted, Sms receivedSms) {
+ ConfigBuilderPlugin.getPlugin().getCommandQueue().readStatus("SMS", new Callback() {
+ @Override
+ public void run() {
+ PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
+ if (result.success) {
+ if (pump != null) {
+ String reply = pump.shortStatus(true);
+ sendSMS(new Sms(receivedSms.phoneNumber, reply));
+ }
+ } else {
+ String reply = MainApp.gs(R.string.readstatusfailed);
+ sendSMS(new Sms(receivedSms.phoneNumber, reply));
+ }
+ }
+ });
+ receivedSms.processed = true;
+ }
+
+ private void processPROFILE(String[] splitted, Sms receivedSms) {
+ // load profiles
+ ProfileInterface anInterface = ConfigBuilderPlugin.getPlugin().getActiveProfileInterface();
+ if (anInterface == null) {
+ sendSMS(new Sms(receivedSms.phoneNumber, R.string.notconfigured));
+ receivedSms.processed = true;
+ return;
+ }
+ ProfileStore store = anInterface.getProfile();
+ if (store == null) {
+ sendSMS(new Sms(receivedSms.phoneNumber, R.string.notconfigured));
+ receivedSms.processed = true;
+ return;
+ }
+ final ArrayList list = store.getProfileList();
+
+ if (splitted[1].toUpperCase().equals("STATUS")) {
+ sendSMS(new Sms(receivedSms.phoneNumber, ProfileFunctions.getInstance().getProfileName()));
+ } else if (splitted[1].toUpperCase().equals("LIST")) {
+ if (list.isEmpty())
+ sendSMS(new Sms(receivedSms.phoneNumber, R.string.invalidprofile));
+ else {
+ String reply = "";
+ for (int i = 0; i < list.size(); i++) {
+ if (i > 0)
+ reply += "\n";
+ reply += (i + 1) + ". ";
+ reply += list.get(i);
+ }
+ sendSMS(new Sms(receivedSms.phoneNumber, reply));
+ }
+ } else {
+
+ int pindex = SafeParse.stringToInt(splitted[1]);
+ int percentage = 100;
+ if (splitted.length > 2)
+ percentage = SafeParse.stringToInt(splitted[2]);
+
+ if (pindex > list.size())
+ sendSMS(new Sms(receivedSms.phoneNumber, R.string.wrongformat));
+ else if (percentage == 0)
+ sendSMS(new Sms(receivedSms.phoneNumber, R.string.wrongformat));
+ else if (pindex == 0)
+ sendSMS(new Sms(receivedSms.phoneNumber, R.string.wrongformat));
+ else {
+ final Profile profile = store.getSpecificProfile((String) list.get(pindex - 1));
+ if (profile == null)
+ sendSMS(new Sms(receivedSms.phoneNumber, R.string.noprofile));
+ else {
+ String passCode = generatePasscode();
+ String reply = String.format(MainApp.gs(R.string.smscommunicator_profilereplywithcode), list.get(pindex - 1), percentage, passCode);
+ receivedSms.processed = true;
+ int finalPercentage = percentage;
+ messageToConfirm = new AuthRequest(this, receivedSms, reply, passCode, new SmsAction((String) list.get(pindex - 1), finalPercentage) {
+ @Override
+ public void run() {
+ ProfileFunctions.doProfileSwitch(store, (String) list.get(pindex - 1), 0, finalPercentage, 0);
+ sendSMS(new Sms(receivedSms.phoneNumber, R.string.profileswitchcreated));
+ }
+ });
+ }
+ }
+ }
+ receivedSms.processed = true;
+ }
+
+ private void processBASAL(String[] splitted, Sms receivedSms) {
+ if (splitted[1].toUpperCase().equals("CANCEL") || splitted[1].toUpperCase().equals("STOP")) {
+ String passCode = generatePasscode();
+ String reply = String.format(MainApp.gs(R.string.smscommunicator_basalstopreplywithcode), passCode);
+ receivedSms.processed = true;
+ messageToConfirm = new AuthRequest(this, receivedSms, reply, passCode, new SmsAction() {
+ @Override
+ public void run() {
+ ConfigBuilderPlugin.getPlugin().getCommandQueue().cancelTempBasal(true, new Callback() {
+ @Override
+ public void run() {
+ if (result.success) {
+ String reply = MainApp.gs(R.string.smscommunicator_tempbasalcanceled);
+ reply += "\n" + ConfigBuilderPlugin.getPlugin().getActivePump().shortStatus(true);
+ sendSMSToAllNumbers(new Sms(receivedSms.phoneNumber, reply));
+ } else {
+ String reply = MainApp.gs(R.string.smscommunicator_tempbasalcancelfailed);
+ reply += "\n" + ConfigBuilderPlugin.getPlugin().getActivePump().shortStatus(true);
+ sendSMS(new Sms(receivedSms.phoneNumber, reply));
+ }
+ }
+ });
+ }
+ });
+ } else if (splitted[1].endsWith("%")) {
+ int tempBasalPct = SafeParse.stringToInt(StringUtils.removeEnd(splitted[1], "%"));
+ int duration = 30;
+ if (splitted.length > 2)
+ duration = SafeParse.stringToInt(splitted[2]);
+ final Profile profile = ProfileFunctions.getInstance().getProfile();
+
+ if (profile == null)
+ sendSMS(new Sms(receivedSms.phoneNumber, R.string.noprofile));
+ else if (tempBasalPct == 0 && !splitted[1].equals("0%"))
+ sendSMS(new Sms(receivedSms.phoneNumber, R.string.wrongformat));
+ else if (duration == 0)
+ sendSMS(new Sms(receivedSms.phoneNumber, R.string.wrongformat));
+ else {
+ tempBasalPct = MainApp.getConstraintChecker().applyBasalPercentConstraints(new Constraint<>(tempBasalPct), profile).value();
+ String passCode = generatePasscode();
+ String reply = String.format(MainApp.gs(R.string.smscommunicator_basalpctreplywithcode), tempBasalPct, duration, passCode);
+ receivedSms.processed = true;
+ messageToConfirm = new AuthRequest(this, receivedSms, reply, passCode, new SmsAction(tempBasalPct, duration) {
+ @Override
+ public void run() {
+ ConfigBuilderPlugin.getPlugin().getCommandQueue().tempBasalPercent(anInteger, secondInteger, true, profile, new Callback() {
+ @Override
+ public void run() {
+ if (result.success) {
+ String reply;
+ if (result.isPercent)
+ reply = String.format(MainApp.gs(R.string.smscommunicator_tempbasalset_percent), result.percent, result.duration);
+ else
+ reply = String.format(MainApp.gs(R.string.smscommunicator_tempbasalset), result.absolute, result.duration);
+ reply += "\n" + ConfigBuilderPlugin.getPlugin().getActivePump().shortStatus(true);
+ sendSMSToAllNumbers(new Sms(receivedSms.phoneNumber, reply));
+ } else {
+ String reply = MainApp.gs(R.string.smscommunicator_tempbasalfailed);
+ reply += "\n" + ConfigBuilderPlugin.getPlugin().getActivePump().shortStatus(true);
+ sendSMS(new Sms(receivedSms.phoneNumber, reply));
+ }
+ }
+ });
+ }
+ });
+ }
+ } else {
+ Double tempBasal = SafeParse.stringToDouble(splitted[1]);
+ int duration = 30;
+ if (splitted.length > 2)
+ duration = SafeParse.stringToInt(splitted[2]);
+ final Profile profile = ProfileFunctions.getInstance().getProfile();
+ if (profile == null)
+ sendSMS(new Sms(receivedSms.phoneNumber, R.string.noprofile));
+ else if (tempBasal == 0 && !splitted[1].equals("0"))
+ sendSMS(new Sms(receivedSms.phoneNumber, R.string.wrongformat));
+ else if (duration == 0)
+ sendSMS(new Sms(receivedSms.phoneNumber, R.string.wrongformat));
+ else {
+ tempBasal = MainApp.getConstraintChecker().applyBasalConstraints(new Constraint<>(tempBasal), profile).value();
+ String passCode = generatePasscode();
+ String reply = String.format(MainApp.gs(R.string.smscommunicator_basalreplywithcode), tempBasal, duration, passCode);
+ receivedSms.processed = true;
+ messageToConfirm = new AuthRequest(this, receivedSms, reply, passCode, new SmsAction(tempBasal, duration) {
+ @Override
+ public void run() {
+ ConfigBuilderPlugin.getPlugin().getCommandQueue().tempBasalAbsolute(aDouble, secondInteger, true, profile, new Callback() {
+ @Override
+ public void run() {
+ if (result.success) {
+ String reply;
+ if (result.isPercent)
+ reply = String.format(MainApp.gs(R.string.smscommunicator_tempbasalset_percent), result.percent, result.duration);
+ else
+ reply = String.format(MainApp.gs(R.string.smscommunicator_tempbasalset), result.absolute, result.duration);
+ reply += "\n" + ConfigBuilderPlugin.getPlugin().getActivePump().shortStatus(true);
+ sendSMSToAllNumbers(new Sms(receivedSms.phoneNumber, reply));
+ } else {
+ String reply = MainApp.gs(R.string.smscommunicator_tempbasalfailed);
+ reply += "\n" + ConfigBuilderPlugin.getPlugin().getActivePump().shortStatus(true);
+ sendSMS(new Sms(receivedSms.phoneNumber, reply));
+ }
+ }
+ });
+ }
+ });
+ }
+ }
+ }
+
+ private void processEXTENDED(String[] splitted, Sms receivedSms) {
+ if (splitted[1].toUpperCase().equals("CANCEL") || splitted[1].toUpperCase().equals("STOP")) {
+ String passCode = generatePasscode();
+ String reply = String.format(MainApp.gs(R.string.smscommunicator_extendedstopreplywithcode), passCode);
+ receivedSms.processed = true;
+ messageToConfirm = new AuthRequest(this, receivedSms, reply, passCode, new SmsAction() {
+ @Override
+ public void run() {
+ ConfigBuilderPlugin.getPlugin().getCommandQueue().cancelExtended(new Callback() {
+ @Override
+ public void run() {
+ if (result.success) {
+ String reply = MainApp.gs(R.string.smscommunicator_extendedcanceled);
+ reply += "\n" + ConfigBuilderPlugin.getPlugin().getActivePump().shortStatus(true);
+ sendSMSToAllNumbers(new Sms(receivedSms.phoneNumber, reply));
+ } else {
+ String reply = MainApp.gs(R.string.smscommunicator_extendedcancelfailed);
+ reply += "\n" + ConfigBuilderPlugin.getPlugin().getActivePump().shortStatus(true);
+ sendSMS(new Sms(receivedSms.phoneNumber, reply));
+ }
+ }
+ });
+ }
+ });
+ } else if (splitted.length != 3) {
+ sendSMS(new Sms(receivedSms.phoneNumber, R.string.wrongformat));
+ } else {
+ Double extended = SafeParse.stringToDouble(splitted[1]);
+ int duration = SafeParse.stringToInt(splitted[2]);
+ extended = MainApp.getConstraintChecker().applyExtendedBolusConstraints(new Constraint<>(extended)).value();
+ if (extended == 0 || duration == 0)
+ sendSMS(new Sms(receivedSms.phoneNumber, R.string.wrongformat));
+ else {
+ String passCode = generatePasscode();
+ String reply = String.format(MainApp.gs(R.string.smscommunicator_extendedreplywithcode), extended, duration, passCode);
+ receivedSms.processed = true;
+ messageToConfirm = new AuthRequest(this, receivedSms, reply, passCode, new SmsAction(extended, duration) {
+ @Override
+ public void run() {
+ ConfigBuilderPlugin.getPlugin().getCommandQueue().extendedBolus(aDouble, secondInteger, new Callback() {
+ @Override
+ public void run() {
+ if (result.success) {
+ String reply = String.format(MainApp.gs(R.string.smscommunicator_extendedset), aDouble, duration);
+ reply += "\n" + ConfigBuilderPlugin.getPlugin().getActivePump().shortStatus(true);
+ sendSMSToAllNumbers(new Sms(receivedSms.phoneNumber, reply));
+ } else {
+ String reply = MainApp.gs(R.string.smscommunicator_extendedfailed);
+ reply += "\n" + ConfigBuilderPlugin.getPlugin().getActivePump().shortStatus(true);
+ sendSMS(new Sms(receivedSms.phoneNumber, reply));
+ }
+ }
+ });
+ }
+ });
+ }
+ }
+ }
+
+
+ private void processBOLUS(String[] splitted, Sms receivedSms) {
+ Double bolus = SafeParse.stringToDouble(splitted[1]);
+ bolus = MainApp.getConstraintChecker().applyBolusConstraints(new Constraint<>(bolus)).value();
+ if (bolus > 0d) {
+ String passCode = generatePasscode();
+ String reply = String.format(MainApp.gs(R.string.smscommunicator_bolusreplywithcode), bolus, passCode);
+ receivedSms.processed = true;
+ messageToConfirm = new AuthRequest(this, receivedSms, reply, passCode, new SmsAction(bolus) {
+ @Override
+ public void run() {
+ DetailedBolusInfo detailedBolusInfo = new DetailedBolusInfo();
+ detailedBolusInfo.insulin = aDouble;
+ detailedBolusInfo.source = Source.USER;
+ ConfigBuilderPlugin.getPlugin().getCommandQueue().bolus(detailedBolusInfo, new Callback() {
+ @Override
+ public void run() {
+ final boolean resultSuccess = result.success;
+ final double resultBolusDelivered = result.bolusDelivered;
+ ConfigBuilderPlugin.getPlugin().getCommandQueue().readStatus("SMS", new Callback() {
+ @Override
+ public void run() {
+ PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
+ if (resultSuccess) {
+ String reply = String.format(MainApp.gs(R.string.smscommunicator_bolusdelivered), resultBolusDelivered);
+ if (pump != null)
+ reply += "\n" + pump.shortStatus(true);
+ lastRemoteBolusTime = DateUtil.now();
+ sendSMSToAllNumbers(new Sms(receivedSms.phoneNumber, reply));
+ } else {
+ String reply = MainApp.gs(R.string.smscommunicator_bolusfailed);
+ if (pump != null)
+ reply += "\n" + pump.shortStatus(true);
+ sendSMS(new Sms(receivedSms.phoneNumber, reply));
+ }
+ }
+ });
+ }
+ });
+ }
+ });
+ } else
+ sendSMS(new Sms(receivedSms.phoneNumber, R.string.wrongformat));
+ }
+
+ private void processCAL(String[] splitted, Sms receivedSms) {
+ Double cal = SafeParse.stringToDouble(splitted[1]);
+ if (cal > 0d) {
+ String passCode = generatePasscode();
+ String reply = String.format(MainApp.gs(R.string.smscommunicator_calibrationreplywithcode), cal, passCode);
+ receivedSms.processed = true;
+ messageToConfirm = new AuthRequest(this, receivedSms, reply, passCode, new SmsAction() {
+ @Override
+ public void run() {
+ boolean result = XdripCalibrations.sendIntent(aDouble);
+ if (result)
+ sendSMSToAllNumbers(new Sms(receivedSms.phoneNumber, R.string.smscommunicator_calibrationsent));
+ else
+ sendSMS(new Sms(receivedSms.phoneNumber, R.string.smscommunicator_calibrationfailed));
+ }
+ });
+ } else
+ sendSMS(new Sms(receivedSms.phoneNumber, R.string.wrongformat));
+ }
+
public void sendNotificationToAllNumbers(String text) {
for (int i = 0; i < allowedNumbers.size(); i++) {
- Sms sms = new Sms(allowedNumbers.get(i), text, System.currentTimeMillis());
+ Sms sms = new Sms(allowedNumbers.get(i), text);
sendSMS(sms);
}
}
@@ -562,12 +757,13 @@ public class SmsCommunicatorPlugin extends PluginBase {
}
}
- private void sendSMS(Sms sms) {
+ void sendSMS(Sms sms) {
SmsManager smsManager = SmsManager.getDefault();
sms.text = stripAccents(sms.text);
if (sms.text.length() > 140) sms.text = sms.text.substring(0, 139);
try {
- log.debug("Sending SMS to " + sms.phoneNumber + ": " + sms.text);
+ if (L.isEnabled(L.SMS))
+ log.debug("Sending SMS to " + sms.phoneNumber + ": " + sms.text);
smsManager.sendTextMessage(sms.phoneNumber, null, sms.text, null, null);
messages.add(sms);
} catch (IllegalArgumentException e) {
@@ -577,6 +773,7 @@ public class SmsCommunicatorPlugin extends PluginBase {
Notification notification = new Notification(Notification.MISSING_SMS_PERMISSION, MainApp.gs(R.string.smscommunicator_missingsmspermission), Notification.NORMAL);
MainApp.bus().post(new EventNewNotification(notification));
}
+ MainApp.bus().post(new EventSmsCommunicatorUpdateGui());
}
private String generatePasscode() {
@@ -586,17 +783,10 @@ public class SmsCommunicatorPlugin extends PluginBase {
passCode += Character.toString((char) (startChar2 + Math.random() * ('z' - 'a' + 1)));
int startChar3 = Math.random() > 0.5 ? 'a' : 'A';
passCode += Character.toString((char) (startChar3 + Math.random() * ('z' - 'a' + 1)));
+ passCode.replace('l', 'k').replace('I', 'J');
return passCode;
}
- private void resetWaitingMessages() {
- tempBasalWaitingForConfirmation = null;
- cancelTempBasalWaitingForConfirmation = null;
- bolusWaitingForConfirmation = null;
- calibrationWaitingForConfirmation = null;
- suspendWaitingForConfirmation = null;
- }
-
private static String stripAccents(String s) {
s = Normalizer.normalize(s, Normalizer.Form.NFD);
s = s.replaceAll("[\\p{InCombiningDiacriticalMarks}]", "");
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.java
index aef742b49b..b92410d67f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.java
@@ -693,7 +693,7 @@ public class ActionStringHandler {
//send profile to pumpe
new NewNSTreatmentDialog(); //init
- NewNSTreatmentDialog.doProfileSwitch(0, percentage, timeshift);
+ ProfileFunctions.doProfileSwitch(0, percentage, timeshift);
}
private static void generateTempTarget(int duration, double low, double high) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/WearPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/WearPlugin.java
index ca24c4ed9e..2d7f13f221 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/WearPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/WearPlugin.java
@@ -2,6 +2,7 @@ package info.nightscout.androidaps.plugins.general.wear;
import android.content.Context;
import android.content.Intent;
+import android.util.Log;
import com.squareup.otto.Subscribe;
@@ -9,7 +10,6 @@ import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.R;
import info.nightscout.androidaps.events.EventBolusRequested;
import info.nightscout.androidaps.events.EventExtendedBolusChange;
-import info.nightscout.androidaps.events.EventNewBG;
import info.nightscout.androidaps.events.EventNewBasalProfile;
import info.nightscout.androidaps.events.EventPreferenceChange;
import info.nightscout.androidaps.events.EventRefreshOverview;
@@ -23,6 +23,7 @@ import info.nightscout.androidaps.plugins.aps.openAPSMA.events.EventOpenAPSUpdat
import info.nightscout.androidaps.plugins.general.overview.events.EventDismissBolusprogressIfRunning;
import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress;
import info.nightscout.androidaps.plugins.general.wear.wearintegration.WatchUpdaterService;
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventAutosensCalculationFinished;
import info.nightscout.androidaps.utils.SP;
/**
@@ -35,6 +36,8 @@ public class WearPlugin extends PluginBase {
private final Context ctx;
private static WearPlugin wearPlugin;
+ private static String TAG = "WearPlugin";
+
public static WearPlugin getPlugin() {
return wearPlugin;
@@ -76,7 +79,10 @@ public class WearPlugin extends PluginBase {
}
private void sendDataToWatch(boolean status, boolean basals, boolean bgValue) {
- if (isEnabled(getType())) { //only start service when this plugin is enabled
+
+ //Log.d(TAG, "WR: WearPlugin:sendDataToWatch (status=" + status + ",basals=" + basals + ",bgValue=" + bgValue + ")");
+
+ if (isEnabled(getType())) { // only start service when this plugin is enabled
if (bgValue) {
ctx.startService(new Intent(ctx, WatchUpdaterService.class));
@@ -93,15 +99,20 @@ public class WearPlugin extends PluginBase {
}
void resendDataToWatch() {
+ //Log.d(TAG, "WR: WearPlugin:resendDataToWatch");
ctx.startService(new Intent(ctx, WatchUpdaterService.class).setAction(WatchUpdaterService.ACTION_RESEND));
}
void openSettings() {
+ //Log.d(TAG, "WR: WearPlugin:openSettings");
ctx.startService(new Intent(ctx, WatchUpdaterService.class).setAction(WatchUpdaterService.ACTION_OPEN_SETTINGS));
}
void requestNotificationCancel(String actionstring) {
- Intent intent = new Intent(ctx, WatchUpdaterService.class).setAction(WatchUpdaterService.ACTION_CANCEL_NOTIFICATION);
+ //Log.d(TAG, "WR: WearPlugin:requestNotificationCancel");
+
+ Intent intent = new Intent(ctx, WatchUpdaterService.class)
+ .setAction(WatchUpdaterService.ACTION_CANCEL_NOTIFICATION);
intent.putExtra("actionstring", actionstring);
ctx.startService(intent);
}
@@ -136,7 +147,7 @@ public class WearPlugin extends PluginBase {
}
@Subscribe
- public void onStatusEvent(final EventNewBG ev) {
+ public void onStatusEvent(final EventAutosensCalculationFinished ev) {
sendDataToWatch(true, true, true);
}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/SendToDataLayerThread.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/SendToDataLayerThread.java
index d935bafec6..aa6498563d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/SendToDataLayerThread.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/SendToDataLayerThread.java
@@ -13,40 +13,127 @@ import com.google.android.gms.wearable.PutDataRequest;
import com.google.android.gms.wearable.Wearable;
import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.ReentrantLock;
/**
* Created by emmablack on 12/26/14.
*/
class SendToDataLayerThread extends AsyncTask {
private GoogleApiClient googleApiClient;
- private static final String TAG = "SendDataThread";
- String path;
+ private static final String TAG = "SendToDataLayerThread";
+ private String path;
+ private String logPrefix = ""; // "WR: ";
+ private static int concurrency = 0;
+ private static int state = 0;
+ private static final ReentrantLock lock = new ReentrantLock();
+ private static long lastlock = 0;
+ private static final boolean testlockup = false; // always false in production
+
SendToDataLayerThread(String path, GoogleApiClient pGoogleApiClient) {
+ // Log.d(TAG, logPrefix + "SendToDataLayerThread: " + path);
this.path = path;
googleApiClient = pGoogleApiClient;
}
+
+ @Override
+ protected void onPreExecute() {
+ concurrency++;
+ if ((concurrency > 12) || ((concurrency > 3 && (lastlock != 0) && (tsl() - lastlock) > 300000))) {
+ // error if 9 concurrent threads or lock held for >5 minutes with concurrency of 4
+ final String err = "Wear Integration deadlock detected!! " + ((lastlock != 0) ? "locked" : "") + " state:"
+ + state + " @" + hourMinuteString(tsl());
+ // Home.toaststaticnext(err);
+ Log.e(TAG, logPrefix + err);
+ }
+ if (concurrency < 0)
+ Log.d(TAG, logPrefix + "Wear Integration impossible concurrency!!");
+
+ Log.d(TAG, logPrefix + "SendDataToLayerThread pre-execute concurrency: " + concurrency);
+ }
+
+
@Override
protected Void doInBackground(DataMap... params) {
- try {
- final NodeApi.GetConnectedNodesResult nodes = Wearable.NodeApi.getConnectedNodes(googleApiClient).await(15, TimeUnit.SECONDS);
- for (Node node : nodes.getNodes()) {
- for (DataMap dataMap : params) {
- PutDataMapRequest putDMR = PutDataMapRequest.create(path);
- putDMR.getDataMap().putAll(dataMap);
- PutDataRequest request = putDMR.asPutDataRequest();
- DataApi.DataItemResult result = Wearable.DataApi.putDataItem(googleApiClient, request).await(15, TimeUnit.SECONDS);
- if (result.getStatus().isSuccess()) {
- Log.d(TAG, "DataMap: " + dataMap + " sent to: " + node.getDisplayName());
- } else {
- Log.d(TAG, "ERROR: failed to send DataMap");
- }
- }
+ if (testlockup) {
+ try {
+ Log.e(TAG, logPrefix + "WARNING RUNNING TEST LOCK UP CODE - NEVER FOR PRODUCTION");
+ Thread.sleep(1000000); // DEEEBBUUGGGG
+ } catch (Exception e) {
}
- } catch (Exception e) {
- Log.e(TAG, "Got exception sending data to wear: " + e.toString());
}
+ sendToWear(params);
+ concurrency--;
+ Log.d(TAG, logPrefix + "SendDataToLayerThread post-execute concurrency: " + concurrency);
return null;
}
+
+
+ // Debug function to expose where it might be locking up
+ private synchronized void sendToWear(final DataMap... params) {
+ if (!lock.tryLock()) {
+ Log.d(TAG, logPrefix + "Concurrent access - waiting for thread unlock");
+ lock.lock(); // enforce single threading
+ Log.d(TAG, logPrefix + "Thread unlocked - proceeding");
+ }
+ lastlock = tsl();
+ try {
+ if (state != 0) {
+ Log.e(TAG, logPrefix + "WEAR STATE ERROR: state=" + state);
+ }
+ state = 1;
+ final NodeApi.GetConnectedNodesResult nodes = Wearable.NodeApi.getConnectedNodes(googleApiClient).await(15,
+ TimeUnit.SECONDS);
+
+ Log.d(TAG, logPrefix + "Nodes: " + nodes);
+
+ state = 2;
+ for (Node node : nodes.getNodes()) {
+ state = 3;
+ for (DataMap dataMap : params) {
+ state = 4;
+ PutDataMapRequest putDMR = PutDataMapRequest.create(path);
+ state = 5;
+ putDMR.getDataMap().putAll(dataMap);
+ putDMR.setUrgent();
+ state = 6;
+ PutDataRequest request = putDMR.asPutDataRequest();
+ state = 7;
+ DataApi.DataItemResult result = Wearable.DataApi.putDataItem(googleApiClient, request).await(15,
+ TimeUnit.SECONDS);
+ state = 8;
+ if (result.getStatus().isSuccess()) {
+ Log.d(TAG, logPrefix + "DataMap: " + dataMap + " sent to: " + node.getDisplayName());
+ } else {
+ Log.e(TAG, logPrefix + "ERROR: failed to send DataMap");
+ result = Wearable.DataApi.putDataItem(googleApiClient, request).await(30, TimeUnit.SECONDS);
+ if (result.getStatus().isSuccess()) {
+ Log.d(TAG, logPrefix + "DataMap retry: " + dataMap + " sent to: " + node.getDisplayName());
+ } else {
+ Log.e(TAG, logPrefix + "ERROR on retry: failed to send DataMap: "
+ + result.getStatus().toString());
+ }
+ }
+ state = 9;
+ }
+ }
+ state = 0;
+ } catch (Exception e) {
+ Log.e(TAG, logPrefix + "Got exception in sendToWear: " + e.toString());
+ } finally {
+ lastlock = 0;
+ lock.unlock();
+ }
+ }
+
+
+ private static long tsl() {
+ return System.currentTimeMillis();
+ }
+
+
+ private static String hourMinuteString(long timestamp) {
+ return android.text.format.DateFormat.format("kk:mm", timestamp).toString();
+ }
}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java
index 12dc116895..52dbeed75c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java
@@ -1,9 +1,17 @@
package info.nightscout.androidaps.plugins.general.wear.wearintegration;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.SharedPreferences;
+import android.os.AsyncTask;
import android.os.BatteryManager;
import android.os.Bundle;
import android.os.Handler;
@@ -14,8 +22,11 @@ import android.util.Log;
import com.google.android.gms.common.ConnectionResult;
import com.google.android.gms.common.api.GoogleApiClient;
+import com.google.android.gms.wearable.CapabilityApi;
+import com.google.android.gms.wearable.CapabilityInfo;
import com.google.android.gms.wearable.DataMap;
import com.google.android.gms.wearable.MessageEvent;
+import com.google.android.gms.wearable.Node;
import com.google.android.gms.wearable.PutDataMapRequest;
import com.google.android.gms.wearable.PutDataRequest;
import com.google.android.gms.wearable.Wearable;
@@ -42,21 +53,24 @@ import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorP
import info.nightscout.androidaps.plugins.treatments.Treatment;
import info.nightscout.androidaps.interfaces.PluginType;
import info.nightscout.androidaps.interfaces.TreatmentsInterface;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin;
+import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
import info.nightscout.androidaps.plugins.general.nsclient.data.NSDeviceStatus;
import info.nightscout.androidaps.plugins.general.overview.OverviewPlugin;
import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
import info.nightscout.androidaps.plugins.general.wear.ActionStringHandler;
import info.nightscout.androidaps.plugins.general.wear.WearPlugin;
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
+import info.nightscout.androidaps.plugins.treatments.Treatment;
+import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
import info.nightscout.androidaps.utils.DecimalFormatter;
import info.nightscout.androidaps.utils.SP;
import info.nightscout.androidaps.utils.SafeParse;
import info.nightscout.androidaps.utils.ToastUtils;
-public class WatchUpdaterService extends WearableListenerService implements
- GoogleApiClient.ConnectionCallbacks,
- GoogleApiClient.OnConnectionFailedListener {
+public class WatchUpdaterService extends WearableListenerService implements GoogleApiClient.ConnectionCallbacks, GoogleApiClient.OnConnectionFailedListener {
+
public static final String ACTION_RESEND = WatchUpdaterService.class.getName().concat(".Resend");
public static final String ACTION_OPEN_SETTINGS = WatchUpdaterService.class.getName().concat(".OpenSettings");
public static final String ACTION_SEND_STATUS = WatchUpdaterService.class.getName().concat(".SendStatus");
@@ -91,6 +105,17 @@ public class WatchUpdaterService extends WearableListenerService implements
private Handler handler;
+ // Phone
+ private static final String CAPABILITY_PHONE_APP = "phone_app_sync_bgs";
+ private static final String MESSAGE_PATH_PHONE = "/phone_message_path";
+ // Wear
+ private static final String CAPABILITY_WEAR_APP = "wear_app_sync_bgs";
+ private static final String MESSAGE_PATH_WEAR = "/wear_message_path";
+ private String mWearNodeId = null;
+ private String localnode = null;
+ private String logPrefix = ""; // "WR: "
+
+
@Override
public void onCreate() {
mPrefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
@@ -112,24 +137,24 @@ public class WatchUpdaterService extends WearableListenerService implements
public void setSettings() {
wear_integration = WearPlugin.getPlugin().isEnabled(PluginType.GENERAL);
+ // Log.d(TAG, "WR: wear_integration=" + wear_integration);
if (wear_integration) {
googleApiConnect();
}
}
- public void googleApiConnect() {
+
+ private void googleApiConnect() {
if (googleApiClient != null && (googleApiClient.isConnected() || googleApiClient.isConnecting())) {
googleApiClient.disconnect();
}
- googleApiClient = new GoogleApiClient.Builder(this)
- .addConnectionCallbacks(this)
- .addOnConnectionFailedListener(this)
- .addApi(Wearable.API)
- .build();
+ googleApiClient = new GoogleApiClient.Builder(this).addConnectionCallbacks(this)
+ .addOnConnectionFailedListener(this).addApi(Wearable.API).build();
Wearable.MessageApi.addListener(googleApiClient, this);
if (googleApiClient.isConnected()) {
- Log.d("WatchUpdater", "API client is connected");
+ log.debug(logPrefix + "API client is connected");
} else {
+ // Log.d("WatchUpdater", logPrefix + "API client is not connected and is trying to connect");
googleApiClient.connect();
}
}
@@ -138,6 +163,8 @@ public class WatchUpdaterService extends WearableListenerService implements
public int onStartCommand(Intent intent, int flags, int startId) {
String action = intent != null ? intent.getAction() : null;
+ // Log.d(TAG, logPrefix + "onStartCommand: " + action);
+
if (wear_integration) {
handler.post(() -> {
if (googleApiClient.isConnected()) {
@@ -177,13 +204,63 @@ public class WatchUpdaterService extends WearableListenerService implements
}
+ private void updateWearSyncBgsCapability(CapabilityInfo capabilityInfo) {
+ Log.d("WatchUpdaterService", logPrefix + "CabilityInfo: " + capabilityInfo);
+ Set connectedNodes = capabilityInfo.getNodes();
+ mWearNodeId = pickBestNodeId(connectedNodes);
+ }
+
+
+ private String pickBestNodeId(Set nodes) {
+ String bestNodeId = null;
+ // Find a nearby node or pick one arbitrarily
+ for (Node node : nodes) {
+ if (node.isNearby()) {
+ return node.getId();
+ }
+ bestNodeId = node.getId();
+ }
+ return bestNodeId;
+ }
+
+
@Override
public void onConnected(Bundle connectionHint) {
+ CapabilityApi.CapabilityListener capabilityListener = capabilityInfo -> {
+ updateWearSyncBgsCapability(capabilityInfo);
+ // Log.d(TAG, logPrefix + "onConnected onCapabilityChanged mWearNodeID:" + mWearNodeId);
+ // new CheckWearableConnected().execute();
+ };
+
+ Wearable.CapabilityApi.addCapabilityListener(googleApiClient, capabilityListener, CAPABILITY_WEAR_APP);
sendData();
}
+
+ @Override
+ public void onPeerConnected(com.google.android.gms.wearable.Node peer) {// KS
+ super.onPeerConnected(peer);
+ String id = peer.getId();
+ String name = peer.getDisplayName();
+ // Log.d(TAG, logPrefix + "onPeerConnected peer name & ID: " + name + "|" + id);
+ }
+
+
+ @Override
+ public void onPeerDisconnected(com.google.android.gms.wearable.Node peer) {// KS
+ super.onPeerDisconnected(peer);
+ String id = peer.getId();
+ String name = peer.getDisplayName();
+ // Log.d(TAG, logPrefix + "onPeerDisconnected peer name & ID: " + name + "|" + id);
+ SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+ }
+
+
@Override
public void onMessageReceived(MessageEvent event) {
+
+ // Log.d(TAG, logPrefix + "onMessageRecieved: " + event);
+
if (wear_integration) {
if (event != null && event.getPath().equals(WEARABLE_RESEND_PATH)) {
resendData();
@@ -214,6 +291,7 @@ public class WatchUpdaterService extends WearableListenerService implements
private void sendData() {
BgReading lastBG = DatabaseHelper.lastBg();
+ // Log.d(TAG, logPrefix + "LastBg=" + lastBG);
if (lastBG != null) {
GlucoseStatus glucoseStatus = GlucoseStatus.getGlucoseStatusData();
@@ -228,18 +306,19 @@ public class WatchUpdaterService extends WearableListenerService implements
return;
}
- new SendToDataLayerThread(WEARABLE_DATA_PATH, googleApiClient).execute(dataMap);
+ executeTask(new SendToDataLayerThread(WEARABLE_DATA_PATH, googleApiClient), dataMap);
}
}
}
+
private DataMap dataMapSingleBG(BgReading lastBG, GlucoseStatus glucoseStatus) {
String units = ProfileFunctions.getInstance().getProfileUnits();
Double lowLine = SafeParse.stringToDouble(mPrefs.getString("low_mark", "0"));
Double highLine = SafeParse.stringToDouble(mPrefs.getString("high_mark", "0"));
- //convert to mg/dl
+ // convert to mg/dl
if (!units.equals(Constants.MGDL)) {
lowLine *= Constants.MMOLL_TO_MGDL;
highLine *= Constants.MMOLL_TO_MGDL;
@@ -287,7 +366,6 @@ public class WatchUpdaterService extends WearableListenerService implements
deltastring += "+";
} else {
deltastring += "-";
-
}
boolean detailed = SP.getBoolean("wear_detailed_delta", false);
@@ -352,7 +430,7 @@ public class WatchUpdaterService extends WearableListenerService implements
}
}
entries.putDataMapArrayList("entries", dataMaps);
- new SendToDataLayerThread(WEARABLE_DATA_PATH, googleApiClient).execute(entries);
+ executeTask(new SendToDataLayerThread(WEARABLE_DATA_PATH, googleApiClient), entries);
}
sendPreferences();
sendBasals();
@@ -501,7 +579,7 @@ public class WatchUpdaterService extends WearableListenerService implements
dm.putDataMapArrayList("boluses", boluses);
dm.putDataMapArrayList("predictions", predictions);
- new SendToDataLayerThread(BASAL_DATA_PATH, googleApiClient).execute(dm);
+ executeTask(new SendToDataLayerThread(BASAL_DATA_PATH, googleApiClient), dm);
}
private DataMap tempDatamap(long startTime, double startBasal, long to, double toBasal, double amount) {
@@ -548,6 +626,7 @@ public class WatchUpdaterService extends WearableListenerService implements
dataMapRequest.getDataMap().putLong("timestamp", System.currentTimeMillis());
dataMapRequest.getDataMap().putString("openSettings", "openSettings");
PutDataRequest putDataRequest = dataMapRequest.asPutDataRequest();
+ debugData("sendNotification", putDataRequest);
Wearable.DataApi.putDataItem(googleApiClient, putDataRequest);
} else {
Log.e("OpenSettings", "No connection to wearable available!");
@@ -563,6 +642,7 @@ public class WatchUpdaterService extends WearableListenerService implements
dataMapRequest.getDataMap().putString("progressstatus", status);
dataMapRequest.getDataMap().putInt("progresspercent", progresspercent);
PutDataRequest putDataRequest = dataMapRequest.asPutDataRequest();
+ debugData("sendBolusProgress", putDataRequest);
Wearable.DataApi.putDataItem(googleApiClient, putDataRequest);
} else {
Log.e("BolusProgress", "No connection to wearable available!");
@@ -582,6 +662,7 @@ public class WatchUpdaterService extends WearableListenerService implements
log.debug("Requesting confirmation from wear: " + actionstring);
PutDataRequest putDataRequest = dataMapRequest.asPutDataRequest();
+ debugData("sendActionConfirmationRequest", putDataRequest);
Wearable.DataApi.putDataItem(googleApiClient, putDataRequest);
} else {
Log.e("confirmationRequest", "No connection to wearable available!");
@@ -601,6 +682,7 @@ public class WatchUpdaterService extends WearableListenerService implements
log.debug("Requesting confirmation from wear: " + actionstring);
PutDataRequest putDataRequest = dataMapRequest.asPutDataRequest();
+ debugData("sendChangeConfirmationRequest", putDataRequest);
Wearable.DataApi.putDataItem(googleApiClient, putDataRequest);
} else {
Log.e("changeConfirmRequest", "No connection to wearable available!");
@@ -618,9 +700,10 @@ public class WatchUpdaterService extends WearableListenerService implements
log.debug("Canceling notification on wear: " + actionstring);
PutDataRequest putDataRequest = dataMapRequest.asPutDataRequest();
+ debugData("sendCancelNotificationRequest", putDataRequest);
Wearable.DataApi.putDataItem(googleApiClient, putDataRequest);
} else {
- Log.e("cancelNotificationRequest", "No connection to wearable available!");
+ Log.e("cancelNotificationReq", "No connection to wearable available!");
}
}
@@ -683,6 +766,7 @@ public class WatchUpdaterService extends WearableListenerService implements
dataMapRequest.getDataMap().putBoolean("showBgi", mPrefs.getBoolean("wear_showbgi", false));
dataMapRequest.getDataMap().putInt("batteryLevel", (phoneBattery >= 30) ? 1 : 0);
PutDataRequest putDataRequest = dataMapRequest.asPutDataRequest();
+ debugData("sendStatus", putDataRequest);
Wearable.DataApi.putDataItem(googleApiClient, putDataRequest);
} else {
Log.e("SendStatus", "No connection to wearable available!");
@@ -699,12 +783,29 @@ public class WatchUpdaterService extends WearableListenerService implements
dataMapRequest.getDataMap().putLong("timestamp", System.currentTimeMillis());
dataMapRequest.getDataMap().putBoolean("wearcontrol", wearcontrol);
PutDataRequest putDataRequest = dataMapRequest.asPutDataRequest();
+ debugData("sendPreferences", putDataRequest);
Wearable.DataApi.putDataItem(googleApiClient, putDataRequest);
} else {
Log.e("SendStatus", "No connection to wearable available!");
}
}
+
+ private void debugData(String source, Object data) {
+ // Log.d(TAG, "WR: " + source + " " + data);
+ }
+
+
+ private void executeTask(AsyncTask task, DataMap... parameters) {
+ task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, (Object[])parameters);
+ // if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
+ // task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+ // } else {
+ // task.execute();
+ // }
+ }
+
+
@NonNull
private String generateStatusString(Profile profile, String currentBasal, String iobSum, String iobDetail, String bgiString) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/xdripStatusline/StatuslinePlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/xdripStatusline/StatuslinePlugin.java
index d0794bf4d5..fe89cc8304 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/xdripStatusline/StatuslinePlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/xdripStatusline/StatuslinePlugin.java
@@ -17,7 +17,6 @@ import info.nightscout.androidaps.db.TemporaryBasal;
import info.nightscout.androidaps.events.EventAppInitialized;
import info.nightscout.androidaps.events.EventConfigBuilderChange;
import info.nightscout.androidaps.events.EventExtendedBolusChange;
-import info.nightscout.androidaps.events.EventNewBG;
import info.nightscout.androidaps.events.EventPreferenceChange;
import info.nightscout.androidaps.events.EventRefreshOverview;
import info.nightscout.androidaps.events.EventTempBasalChange;
@@ -26,10 +25,11 @@ import info.nightscout.androidaps.interfaces.PluginBase;
import info.nightscout.androidaps.interfaces.PluginDescription;
import info.nightscout.androidaps.interfaces.PluginType;
import info.nightscout.androidaps.interfaces.TreatmentsInterface;
+import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin;
import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
-import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin;
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventAutosensCalculationFinished;
import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
import info.nightscout.androidaps.utils.DecimalFormatter;
@@ -115,7 +115,7 @@ public class StatuslinePlugin extends PluginBase {
if (ConfigBuilderPlugin.getPlugin().getActivePump() == null)
return "";
-
+
LoopPlugin loopPlugin = LoopPlugin.getPlugin();
if (!loopPlugin.isEnabled(PluginType.LOOP)) {
@@ -138,7 +138,7 @@ public class StatuslinePlugin extends PluginBase {
IobTotal bolusIob = treatmentsInterface.getLastCalculationTreatments().round();
treatmentsInterface.updateTotalIOBTempBasals();
IobTotal basalIob = treatmentsInterface.getLastCalculationTempBasals().round();
- status += DecimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob)+"U";
+ status += DecimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob) + "U";
if (mPrefs.getBoolean("xdripstatus_detailediob", true)) {
@@ -182,7 +182,7 @@ public class StatuslinePlugin extends PluginBase {
}
@Subscribe
- public void onStatusEvent(final EventNewBG ev) {
+ public void onStatusEvent(final EventAutosensCalculationFinished ev) {
sendStatus();
}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java
index d08485dd1a..aac0985fba 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java
@@ -65,8 +65,6 @@ public class IobCobCalculatorPlugin extends PluginBase {
private volatile List bgReadings = null; // newest at index 0
private volatile List bucketed_data = null;
- private double dia = Constants.defaultDIA;
-
final Object dataLock = new Object();
boolean stopCalculationTrigger = false;
@@ -118,11 +116,22 @@ public class IobCobCalculatorPlugin extends PluginBase {
return rounded;
}
- void loadBgData(long now) {
- long start = (long) (now - 60 * 60 * 1000L * (24 + dia));
- bgReadings = MainApp.getDbHelper().getBgreadingsDataFromTime(start, now, false);
- if (L.isEnabled(L.AUTOSENS))
- log.debug("BG data loaded. Size: " + bgReadings.size() + " Start date: " + DateUtil.dateAndTimeString(start) + " End date: " + DateUtil.dateAndTimeString(now));
+ void loadBgData(long to) {
+ Profile profile = ProfileFunctions.getInstance().getProfile(to);
+ double dia = Constants.defaultDIA;
+ if (profile != null) dia = profile.getDia();
+ long start = to - T.hours((long) (24 + dia)).msecs();
+ if (DateUtil.isCloseToNow(to)) {
+ // if close to now expect there can be some readings with time in close future (caused by wrong time setting)
+ // so read all records
+ bgReadings = MainApp.getDbHelper().getBgreadingsDataFromTime(start, false);
+ if (L.isEnabled(L.AUTOSENS))
+ log.debug("BG data loaded. Size: " + bgReadings.size() + " Start date: " + DateUtil.dateAndTimeString(start));
+ } else {
+ bgReadings = MainApp.getDbHelper().getBgreadingsDataFromTime(start, to, false);
+ if (L.isEnabled(L.AUTOSENS))
+ log.debug("BG data loaded. Size: " + bgReadings.size() + " Start date: " + DateUtil.dateAndTimeString(start) + " End date: " + DateUtil.dateAndTimeString(to));
+ }
}
public boolean isAbout5minData() {
@@ -608,10 +617,6 @@ public class IobCobCalculatorPlugin extends PluginBase {
}
if (ConfigBuilderPlugin.getPlugin() == null)
return; // app still initializing
- Profile profile = ProfileFunctions.getInstance().getProfile();
- if (profile == null)
- return; // app still initializing
- dia = profile.getDia();
if (ev == null) { // on init no need of reset
return;
}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Thread.java b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Thread.java
index fa590c9c0e..6dcb35ef9b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Thread.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Thread.java
@@ -41,6 +41,7 @@ import info.nightscout.androidaps.utils.FabricPrivacy;
import info.nightscout.androidaps.utils.MidnightTime;
import info.nightscout.androidaps.utils.Profiler;
import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.T;
import static info.nightscout.androidaps.utils.DateUtil.now;
import static java.util.Calendar.MINUTE;
@@ -61,7 +62,7 @@ public class IobCobOref1Thread extends Thread {
private PowerManager.WakeLock mWakeLock;
- public IobCobOref1Thread(IobCobCalculatorPlugin plugin, String from, long end, boolean bgDataReload, boolean limitDataToOldestAvailable, Event cause) {
+ IobCobOref1Thread(IobCobCalculatorPlugin plugin, String from, long end, boolean bgDataReload, boolean limitDataToOldestAvailable, Event cause) {
super();
this.iobCobCalculatorPlugin = plugin;
@@ -72,13 +73,15 @@ public class IobCobOref1Thread extends Thread {
this.end = end;
PowerManager powerManager = (PowerManager) MainApp.instance().getApplicationContext().getSystemService(Context.POWER_SERVICE);
- mWakeLock = powerManager.newWakeLock(PowerManager.SCREEN_DIM_WAKE_LOCK, "iobCobThread");
+ if (powerManager != null)
+ mWakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, MainApp.gs(R.string.app_name) + ":iobCobThread");
}
@Override
public final void run() {
long start = DateUtil.now();
- mWakeLock.acquire();
+ if (mWakeLock != null)
+ mWakeLock.acquire(T.mins(10).msecs());
try {
if (L.isEnabled(L.AUTOSENS))
log.debug("AUTOSENSDATA thread started: " + from);
@@ -173,7 +176,7 @@ public class IobCobOref1Thread extends Thread {
double bgi = -iob.activity * sens * 5;
double deviation = delta - bgi;
- double avgDeviation = Math.round((avgDelta - bgi) * 1000) / 1000;
+ double avgDeviation = Math.round((avgDelta - bgi) * 1000) / 1000d;
double slopeFromMaxDeviation = 0;
double slopeFromMinDeviation = 999;
@@ -395,7 +398,8 @@ public class IobCobOref1Thread extends Thread {
MainApp.bus().post(new EventAutosensCalculationFinished(cause));
}).start();
} finally {
- mWakeLock.release();
+ if (mWakeLock != null)
+ mWakeLock.release();
MainApp.bus().post(new EventIobCalculationProgress(""));
if (L.isEnabled(L.AUTOSENS)) {
log.debug("AUTOSENSDATA thread ended: " + from);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobThread.java b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobThread.java
index 89bc0a6606..2970f07aca 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobThread.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobThread.java
@@ -41,6 +41,7 @@ import info.nightscout.androidaps.utils.FabricPrivacy;
import info.nightscout.androidaps.utils.MidnightTime;
import info.nightscout.androidaps.utils.Profiler;
import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.T;
import static info.nightscout.androidaps.utils.DateUtil.now;
@@ -60,7 +61,7 @@ public class IobCobThread extends Thread {
private PowerManager.WakeLock mWakeLock;
- public IobCobThread(IobCobCalculatorPlugin plugin, String from, long end, boolean bgDataReload, boolean limitDataToOldestAvailable, Event cause) {
+ IobCobThread(IobCobCalculatorPlugin plugin, String from, long end, boolean bgDataReload, boolean limitDataToOldestAvailable, Event cause) {
super();
this.iobCobCalculatorPlugin = plugin;
@@ -71,13 +72,15 @@ public class IobCobThread extends Thread {
this.end = end;
PowerManager powerManager = (PowerManager) MainApp.instance().getApplicationContext().getSystemService(Context.POWER_SERVICE);
- mWakeLock = powerManager.newWakeLock(PowerManager.SCREEN_DIM_WAKE_LOCK, "iobCobThread");
+ if (powerManager != null)
+ mWakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, MainApp.gs(R.string.app_name) + ":iobCobThread");
}
@Override
public final void run() {
long start = DateUtil.now();
- mWakeLock.acquire();
+ if (mWakeLock != null)
+ mWakeLock.acquire(T.mins(10).msecs());
try {
if (L.isEnabled(L.AUTOSENS))
log.debug("AUTOSENSDATA thread started: " + from);
@@ -172,7 +175,7 @@ public class IobCobThread extends Thread {
double bgi = -iob.activity * sens * 5;
double deviation = delta - bgi;
- double avgDeviation = Math.round((avgDelta - bgi) * 1000) / 1000;
+ double avgDeviation = Math.round((avgDelta - bgi) * 1000) / 1000d;
double slopeFromMaxDeviation = 0;
double slopeFromMinDeviation = 999;
@@ -321,7 +324,8 @@ public class IobCobThread extends Thread {
MainApp.bus().post(new EventAutosensCalculationFinished(cause));
}).start();
} finally {
- mWakeLock.release();
+ if (mWakeLock != null)
+ mWakeLock.release();
MainApp.bus().post(new EventIobCalculationProgress(""));
if (L.isEnabled(L.AUTOSENS)) {
log.debug("AUTOSENSDATA thread ended: " + from);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/profile/ns/NSProfileFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/profile/ns/NSProfileFragment.java
index 913f6a1d12..66b895839d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/profile/ns/NSProfileFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/profile/ns/NSProfileFragment.java
@@ -22,7 +22,6 @@ import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.R;
import info.nightscout.androidaps.data.Profile;
import info.nightscout.androidaps.data.ProfileStore;
-import info.nightscout.androidaps.plugins.general.careportal.Dialogs.NewNSTreatmentDialog;
import info.nightscout.androidaps.plugins.common.SubscriberFragment;
import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
import info.nightscout.androidaps.plugins.profile.ns.events.EventNSProfileUpdateGUI;
@@ -157,7 +156,7 @@ public class NSProfileFragment extends SubscriberFragment {
Profile profile = store.getSpecificProfile(name);
if (profile != null) {
OKDialog.showConfirmation(getActivity(), MainApp.gs(R.string.activate_profile) + ": " + name + " ?", () ->
- NewNSTreatmentDialog.doProfileSwitch(store, name, 0, 100, 0)
+ ProfileFunctions.doProfileSwitch(store, name, 0, 100, 0)
);
}
}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java
index c666d18699..557ba42168 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java
@@ -42,6 +42,8 @@ import info.nightscout.androidaps.logging.L;
import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderFragment;
import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
+import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction;
+import info.nightscout.androidaps.plugins.general.actions.defs.CustomActionType;
import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;
import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress;
@@ -64,7 +66,6 @@ import info.nightscout.androidaps.plugins.treatments.Treatment;
import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
import info.nightscout.androidaps.utils.DateUtil;
import info.nightscout.androidaps.utils.SP;
-
/**
* Created by mike on 05.08.2016.
*/
@@ -1379,4 +1380,20 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
maxIob.setIfSmaller(0d, String.format(MainApp.gs(R.string.limitingmaxiob), 0d, MainApp.gs(R.string.unsafeusage)), this);
return maxIob;
}
+
+ @Override
+ public List getCustomActions() {
+ return null;
+ }
+
+ @Override
+ public void executeCustomAction(CustomActionType customActionType) {
+
+ }
+
+ @Override
+ public boolean canHandleDST() {
+ return false;
+ }
+
}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/AbstractDanaRPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/AbstractDanaRPlugin.java
index dcc98bc9c0..749307e1a7 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/AbstractDanaRPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/AbstractDanaRPlugin.java
@@ -8,6 +8,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.Date;
+import java.util.List;
import info.nightscout.androidaps.BuildConfig;
import info.nightscout.androidaps.MainApp;
@@ -27,6 +28,8 @@ import info.nightscout.androidaps.interfaces.ProfileInterface;
import info.nightscout.androidaps.interfaces.PumpDescription;
import info.nightscout.androidaps.interfaces.PumpInterface;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction;
+import info.nightscout.androidaps.plugins.general.actions.defs.CustomActionType;
import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;
import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
@@ -473,4 +476,24 @@ public abstract class AbstractDanaRPlugin extends PluginBase implements PumpInte
}
// TODO: daily total constraint
+
+ @Override
+ public List getCustomActions() {
+ return null;
+ }
+
+
+ @Override
+ public void executeCustomAction(CustomActionType customActionType) {
+
+ }
+
+ @Override
+ public boolean canHandleDST() {
+ return false;
+ }
+
+
+
+
}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.java
index 681e13eb8c..ddbb8547ae 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.java
@@ -16,6 +16,8 @@ import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.List;
+
import info.nightscout.androidaps.BuildConfig;
import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.R;
@@ -39,6 +41,8 @@ import info.nightscout.androidaps.logging.L;
import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderFragment;
import info.nightscout.androidaps.plugins.configBuilder.DetailedBolusInfoStorage;
import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
+import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction;
+import info.nightscout.androidaps.plugins.general.actions.defs.CustomActionType;
import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;
import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
@@ -813,4 +817,19 @@ public class DanaRSPlugin extends PluginBase implements PumpInterface, DanaRInte
return loadHistory(RecordTypes.RECORD_TYPE_DAILY);
}
+ @Override
+ public List getCustomActions() {
+ return null;
+ }
+
+ @Override
+ public void executeCustomAction(CustomActionType customActionType) {
+
+ }
+
+ @Override
+ public boolean canHandleDST() {
+ return false;
+ }
+
}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2Plugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2Plugin.java
index 438142f5f1..9e3ca499d0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2Plugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2Plugin.java
@@ -19,9 +19,11 @@ import info.nightscout.androidaps.db.TemporaryBasal;
import info.nightscout.androidaps.events.EventAppExit;
import info.nightscout.androidaps.interfaces.Constraint;
import info.nightscout.androidaps.logging.L;
+
import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderFragment;
import info.nightscout.androidaps.plugins.configBuilder.DetailedBolusInfoStorage;
import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
+
import info.nightscout.androidaps.plugins.pump.danaR.AbstractDanaRPlugin;
import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgBolusStartWithSpeed;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java
index 4aefd391c1..26f5180f47 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java
@@ -298,4 +298,4 @@ public class LocalInsightFragment extends SubscriberFragment implements View.OnC
statusItems.add(getStatusItem(label, MainApp.gs(R.string.eb_formatter, activeBolus.getRemainingAmount(), activeBolus.getInitialAmount(), activeBolus.getRemainingDuration())));
}
}
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
index 1ef940aeb9..ccc38c1b9b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
@@ -8,6 +8,10 @@ import android.os.Handler;
import android.os.IBinder;
import android.os.Looper;
+import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction;
+import info.nightscout.androidaps.plugins.general.actions.defs.CustomActionType;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks.*;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.*;
import org.json.JSONException;
import org.json.JSONObject;
import org.slf4j.Logger;
@@ -69,12 +73,6 @@ import info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history
import info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events.StartOfTBREvent;
import info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events.TotalDailyDoseEvent;
import info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events.TubeFilledEvent;
-import info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks.BRProfile1Block;
-import info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks.BRProfileBlock;
-import info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks.FactoryMinBolusAmountBlock;
-import info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks.MaxBasalAmountBlock;
-import info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks.MaxBolusAmountBlock;
-import info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks.TBROverNotificationBlock;
import info.nightscout.androidaps.plugins.pump.insight.app_layer.remote_control.CancelBolusMessage;
import info.nightscout.androidaps.plugins.pump.insight.app_layer.remote_control.CancelTBRMessage;
import info.nightscout.androidaps.plugins.pump.insight.app_layer.remote_control.ChangeTBRMessage;
@@ -98,18 +96,6 @@ import info.nightscout.androidaps.plugins.pump.insight.connection_service.Insigh
import info.nightscout.androidaps.plugins.pump.insight.database.InsightBolusID;
import info.nightscout.androidaps.plugins.pump.insight.database.InsightHistoryOffset;
import info.nightscout.androidaps.plugins.pump.insight.database.InsightPumpID;
-import info.nightscout.androidaps.plugins.pump.insight.descriptors.ActiveBasalRate;
-import info.nightscout.androidaps.plugins.pump.insight.descriptors.ActiveBolus;
-import info.nightscout.androidaps.plugins.pump.insight.descriptors.ActiveTBR;
-import info.nightscout.androidaps.plugins.pump.insight.descriptors.AlertType;
-import info.nightscout.androidaps.plugins.pump.insight.descriptors.BasalProfileBlock;
-import info.nightscout.androidaps.plugins.pump.insight.descriptors.BatteryStatus;
-import info.nightscout.androidaps.plugins.pump.insight.descriptors.BolusType;
-import info.nightscout.androidaps.plugins.pump.insight.descriptors.CartridgeStatus;
-import info.nightscout.androidaps.plugins.pump.insight.descriptors.InsightState;
-import info.nightscout.androidaps.plugins.pump.insight.descriptors.OperatingMode;
-import info.nightscout.androidaps.plugins.pump.insight.descriptors.PumpTime;
-import info.nightscout.androidaps.plugins.pump.insight.descriptors.TotalDailyDose;
import info.nightscout.androidaps.plugins.pump.insight.exceptions.InsightException;
import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.AppLayerErrorException;
import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.NoActiveTBRToCanceLException;
@@ -152,6 +138,7 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
private final Object $bolusLock = new Object[0];
private int bolusID;
private boolean bolusCancelled;
+ private BasalProfile activeBasalProfile;
private List profileBlocks;
private boolean limitsFetched;
private double maximumBolusAmount;
@@ -345,6 +332,7 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
}
private void fetchBasalProfile() throws Exception {
+ activeBasalProfile = ParameterBlockUtil.readParameterBlock(connectionService, Service.CONFIGURATION, ActiveBRProfileBlock.class).getActiveBasalProfile();
profileBlocks = ParameterBlockUtil.readParameterBlock(connectionService, Service.CONFIGURATION, BRProfile1Block.class).getProfileBlocks();
}
@@ -438,6 +426,10 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
profileBlocks.add(profileBlock);
}
try {
+ ActiveBRProfileBlock activeBRProfileBlock = new ActiveBRProfileBlock();
+ activeBRProfileBlock.setActiveBasalProfile(BasalProfile.PROFILE_1);
+ ParameterBlockUtil.writeConfigurationBlock(connectionService, activeBRProfileBlock);
+ activeBasalProfile = BasalProfile.PROFILE_1;
BRProfileBlock profileBlock = new BRProfile1Block();
profileBlock.setProfileBlocks(profileBlocks);
ParameterBlockUtil.writeConfigurationBlock(connectionService, profileBlock);
@@ -475,6 +467,7 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
public boolean isThisProfileSet(Profile profile) {
if (!isInitialized() || profileBlocks == null) return true;
if (profile.getBasalValues().length != profileBlocks.size()) return false;
+ if (activeBasalProfile != BasalProfile.PROFILE_1) return false;
for (int i = 0; i < profileBlocks.size(); i++) {
BasalProfileBlock profileBlock = profileBlocks.get(i);
Profile.BasalValue basalValue = profile.getBasalValues()[i];
@@ -1068,6 +1061,16 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
return new PumpEnactResult().success(true);
}
+ @Override
+ public List getCustomActions() {
+ return null;
+ }
+
+ @Override
+ public void executeCustomAction(CustomActionType customActionType) {
+
+ }
+
private void readHistory() {
try {
PumpTime pumpTime = connectionService.requestMessage(new GetDateTimeMessage()).await().getPumpTime();
@@ -1566,4 +1569,9 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
Notification notification = new Notification(Notification.INSIGHT_TIMEOUT_DURING_HANDSHAKE, MainApp.gs(R.string.timeout_during_handshake), Notification.URGENT);
new Handler(Looper.getMainLooper()).post(() -> MainApp.bus().post(new EventNewNotification(notification)));
}
-}
+
+ @Override
+ public boolean canHandleDST() {
+ return true;
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/mdi/MDIPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/mdi/MDIPlugin.java
index b717cda71f..89d1184581 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/mdi/MDIPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/mdi/MDIPlugin.java
@@ -5,6 +5,8 @@ import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.List;
+
import info.nightscout.androidaps.BuildConfig;
import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.R;
@@ -17,9 +19,12 @@ import info.nightscout.androidaps.interfaces.PluginType;
import info.nightscout.androidaps.interfaces.PumpDescription;
import info.nightscout.androidaps.interfaces.PumpInterface;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction;
+import info.nightscout.androidaps.plugins.general.actions.defs.CustomActionType;
import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
import info.nightscout.androidaps.utils.DateUtil;
+
/**
* Created by mike on 05.08.2016.
*/
@@ -137,14 +142,10 @@ public class MDIPlugin extends PluginBase implements PumpInterface {
}
@Override
- public double getReservoirLevel() {
- return -1;
- }
+ public double getReservoirLevel() { return -1; }
@Override
- public int getBatteryLevel() {
- return -1;
- }
+ public int getBatteryLevel() { return -1; }
@Override
public PumpEnactResult deliverTreatment(DetailedBolusInfo detailedBolusInfo) {
@@ -249,4 +250,19 @@ public class MDIPlugin extends PluginBase implements PumpInterface {
return deviceID();
}
+ @Override
+ public List getCustomActions() {
+ return null;
+ }
+
+ @Override
+ public void executeCustomAction(CustomActionType customActionType) {
+
+ }
+
+ @Override
+ public boolean canHandleDST() {
+ return true;
+ }
+
}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpFragment.java
index b03847182c..0b764f5382 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpFragment.java
@@ -20,11 +20,14 @@ import info.nightscout.androidaps.R;
import info.nightscout.androidaps.db.ExtendedBolus;
import info.nightscout.androidaps.db.TemporaryBasal;
import info.nightscout.androidaps.plugins.common.SubscriberFragment;
+import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction;
+import info.nightscout.androidaps.plugins.general.actions.defs.CustomActionType;
import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
import info.nightscout.androidaps.plugins.pump.virtual.events.EventVirtualPumpUpdateGui;
import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
import info.nightscout.androidaps.utils.FabricPrivacy;
+
public class VirtualPumpFragment extends SubscriberFragment {
private static Logger log = LoggerFactory.getLogger(VirtualPumpFragment.class);
@@ -119,4 +122,6 @@ public class VirtualPumpFragment extends SubscriberFragment {
}
});
}
+
+
}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPlugin.java
index 6ede588389..461f71c31d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPlugin.java
@@ -9,6 +9,8 @@ import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.List;
+
import info.nightscout.androidaps.BuildConfig;
import info.nightscout.androidaps.Config;
import info.nightscout.androidaps.MainApp;
@@ -27,6 +29,8 @@ import info.nightscout.androidaps.interfaces.PumpDescription;
import info.nightscout.androidaps.interfaces.PumpInterface;
import info.nightscout.androidaps.logging.L;
import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
+import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction;
+import info.nightscout.androidaps.plugins.general.actions.defs.CustomActionType;
import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress;
@@ -37,6 +41,7 @@ import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
import info.nightscout.androidaps.utils.DateUtil;
import info.nightscout.androidaps.utils.SP;
+
/**
* Created by mike on 05.08.2016.
*/
@@ -140,6 +145,16 @@ public class VirtualPumpPlugin extends PluginBase implements PumpInterface {
return new PumpEnactResult();
}
+ @Override
+ public List getCustomActions() {
+ return null;
+ }
+
+ @Override
+ public void executeCustomAction(CustomActionType customActionType) {
+
+ }
+
@Override
public boolean isInitialized() {
return true;
@@ -440,6 +455,11 @@ public class VirtualPumpPlugin extends PluginBase implements PumpInterface {
return pumpType;
}
+ @Override
+ public boolean canHandleDST() {
+ return true;
+ }
+
public void refreshConfiguration() {
String pumptype = SP.getString(R.string.key_virtualpump_type, "Generic AAPS");
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/BGSourceFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/source/BGSourceFragment.java
index 09e85b2417..211cbb0bb0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/BGSourceFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/BGSourceFragment.java
@@ -21,10 +21,10 @@ import info.nightscout.androidaps.Constants;
import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.R;
import info.nightscout.androidaps.db.BgReading;
-import info.nightscout.androidaps.events.EventNewBG;
import info.nightscout.androidaps.plugins.common.SubscriberFragment;
import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventAutosensCalculationFinished;
import info.nightscout.androidaps.utils.DateUtil;
import info.nightscout.androidaps.utils.FabricPrivacy;
import info.nightscout.androidaps.utils.T;
@@ -67,7 +67,7 @@ public class BGSourceFragment extends SubscriberFragment {
}
@Subscribe
- public void onStatusEvent(final EventNewBG unused) {
+ public void onStatusEvent(final EventAutosensCalculationFinished unused) {
updateGUI();
}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsBolusFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsBolusFragment.java
index 083b63c924..64e93f3f95 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsBolusFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsBolusFragment.java
@@ -28,12 +28,12 @@ import info.nightscout.androidaps.R;
import info.nightscout.androidaps.data.Iob;
import info.nightscout.androidaps.data.Profile;
import info.nightscout.androidaps.db.Source;
-import info.nightscout.androidaps.events.EventNewBG;
import info.nightscout.androidaps.events.EventTreatmentChange;
import info.nightscout.androidaps.plugins.common.SubscriberFragment;
import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
import info.nightscout.androidaps.plugins.general.nsclient.UploadQueue;
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventAutosensCalculationFinished;
import info.nightscout.androidaps.plugins.treatments.Treatment;
import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
import info.nightscout.androidaps.plugins.treatments.dialogs.WizardInfoDialog;
@@ -266,7 +266,7 @@ public class TreatmentsBolusFragment extends SubscriberFragment implements View.
}
@Subscribe
- public void onStatusEvent(final EventNewBG ev) {
+ public void onStatusEvent(final EventAutosensCalculationFinished ev) {
updateGUI();
}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsExtendedBolusesFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsExtendedBolusesFragment.java
index dbbf59311c..93f2a64006 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsExtendedBolusesFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsExtendedBolusesFragment.java
@@ -25,14 +25,14 @@ import info.nightscout.androidaps.data.IobTotal;
import info.nightscout.androidaps.db.ExtendedBolus;
import info.nightscout.androidaps.db.Source;
import info.nightscout.androidaps.events.EventExtendedBolusChange;
-import info.nightscout.androidaps.events.EventNewBG;
import info.nightscout.androidaps.plugins.common.SubscriberFragment;
+import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
import info.nightscout.androidaps.plugins.general.nsclient.UploadQueue;
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventAutosensCalculationFinished;
import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
import info.nightscout.androidaps.utils.DateUtil;
import info.nightscout.androidaps.utils.DecimalFormatter;
import info.nightscout.androidaps.utils.FabricPrivacy;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
public class TreatmentsExtendedBolusesFragment extends SubscriberFragment {
@@ -186,7 +186,7 @@ public class TreatmentsExtendedBolusesFragment extends SubscriberFragment {
}
@Subscribe
- public void onStatusEvent(final EventNewBG ev) {
+ public void onStatusEvent(final EventAutosensCalculationFinished ev) {
updateGUI();
}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTemporaryBasalsFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTemporaryBasalsFragment.java
index dbb6ff99d7..b928263ed5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTemporaryBasalsFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTemporaryBasalsFragment.java
@@ -25,16 +25,16 @@ import info.nightscout.androidaps.data.IobTotal;
import info.nightscout.androidaps.data.Profile;
import info.nightscout.androidaps.db.Source;
import info.nightscout.androidaps.db.TemporaryBasal;
-import info.nightscout.androidaps.events.EventNewBG;
import info.nightscout.androidaps.events.EventTempBasalChange;
import info.nightscout.androidaps.plugins.common.SubscriberFragment;
import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
+import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
import info.nightscout.androidaps.plugins.general.nsclient.UploadQueue;
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventAutosensCalculationFinished;
import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
import info.nightscout.androidaps.utils.DateUtil;
import info.nightscout.androidaps.utils.DecimalFormatter;
import info.nightscout.androidaps.utils.FabricPrivacy;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
public class TreatmentsTemporaryBasalsFragment extends SubscriberFragment {
@@ -212,7 +212,7 @@ public class TreatmentsTemporaryBasalsFragment extends SubscriberFragment {
}
@Subscribe
- public void onStatusEvent(final EventNewBG ignored) {
+ public void onStatusEvent(final EventAutosensCalculationFinished ignored) {
updateGUI();
}
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/DateUtil.java b/app/src/main/java/info/nightscout/androidaps/utils/DateUtil.java
index 943de83cef..7cc4424244 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/DateUtil.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/DateUtil.java
@@ -182,4 +182,9 @@ public class DateUtil {
public static long roundDateToSec(long date) {
return date - date % 1000;
}
+
+ public static boolean isCloseToNow(long date) {
+ long diff = Math.abs(date - now());
+ return diff < T.mins(2).msecs();
+ }
}
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/MidnightTime.java b/app/src/main/java/info/nightscout/androidaps/utils/MidnightTime.java
index d3d75feda3..668ca02e96 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/MidnightTime.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/MidnightTime.java
@@ -5,7 +5,7 @@ import android.util.LongSparseArray;
import java.util.Calendar;
public class MidnightTime {
- private static LongSparseArray times = new LongSparseArray();
+ private static final LongSparseArray times = new LongSparseArray<>();
private static long hits = 0;
private static long misses = 0;
@@ -20,20 +20,23 @@ public class MidnightTime {
}
public static long calc(long time) {
- Long m = (Long) times.get(time);
- if (m != null) {
- ++hits;
- return m;
+ Long m;
+ synchronized (times) {
+ m = times.get(time);
+ if (m != null) {
+ ++hits;
+ return m;
+ }
+ Calendar c = Calendar.getInstance();
+ c.setTimeInMillis(time);
+ c.set(Calendar.HOUR_OF_DAY, 0);
+ c.set(Calendar.MINUTE, 0);
+ c.set(Calendar.SECOND, 0);
+ c.set(Calendar.MILLISECOND, 0);
+ m = c.getTimeInMillis();
+ times.append(time, m);
+ ++misses;
}
- Calendar c = Calendar.getInstance();
- c.setTimeInMillis(time);
- c.set(Calendar.HOUR_OF_DAY, 0);
- c.set(Calendar.MINUTE, 0);
- c.set(Calendar.SECOND, 0);
- c.set(Calendar.MILLISECOND, 0);
- m = c.getTimeInMillis();
- times.append(time, m);
- ++misses;
return m;
}
diff --git a/app/src/main/res/layout/actions_fragment.xml b/app/src/main/res/layout/actions_fragment.xml
index d74c4b4cc2..3e809b3b02 100644
--- a/app/src/main/res/layout/actions_fragment.xml
+++ b/app/src/main/res/layout/actions_fragment.xml
@@ -9,6 +9,7 @@
android:layout_height="wrap_content">
diff --git a/app/src/main/res/layout/objectives_item.xml b/app/src/main/res/layout/objectives_item.xml
index b6029e5842..283195db23 100644
--- a/app/src/main/res/layout/objectives_item.xml
+++ b/app/src/main/res/layout/objectives_item.xml
@@ -65,6 +65,13 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/objectives_button_start" />
+
+
diff --git a/app/src/main/res/values-af/insight_alert_codes.xml b/app/src/main/res/values-af/insight_alert_codes.xml
index 70489fbc5e..2354269224 100644
--- a/app/src/main/res/values-af/insight_alert_codes.xml
+++ b/app/src/main/res/values-af/insight_alert_codes.xml
@@ -1,3 +1,30 @@
-
+
+ Herinner R1
+ Herinner R2
+ Herinner R3
+ Herinner R4
+ Herinner R7
+ Waarskuwing W31
+ Waarskuwing W33
+ Waarskuwing W33
+ Waarskuwing W34
+ Waarskuwing W36
+ Waarskuwing W38
+ Waarskuwing W39
+ Onderhoud M20
+ Onderhoud M21
+ Onderhoud M22
+ Onderhoud M23
+ Onderhoud M24
+ Onderhoud M25
+ Onderhoud M26
+ Onderhoud M27
+ Onderhoud M28
+ Onderhoud M29
+ Onderhoud M30
+ Fout E6
+ Fout E10
+ Fout E13
+
diff --git a/app/src/main/res/values-af/insight_alert_descriptions.xml b/app/src/main/res/values-af/insight_alert_descriptions.xml
index 70489fbc5e..f51118213c 100644
--- a/app/src/main/res/values-af/insight_alert_descriptions.xml
+++ b/app/src/main/res/values-af/insight_alert_descriptions.xml
@@ -1,3 +1,25 @@
-
+
+ %1$d%%\nDurasie: %2$s h]]>
+ %1$s U]]>
+ Verander battery.
+ Stel tyd/datum.
+ Kontak Accu-Chek ondersteuning.
+ %1$d%%
Durasie:%2$s h]]>
+ %1$s U
gelewer: %2$s U]]>
+ Voeg kasset.
+ Verander kasset.
+ Verander battery.
+ Kontroleer pomp status.
+ Verander infusie stel.
+ Kontak Accu-Chek ondersteuning.
+ Verander kasset.
+ Herhaal data aflaai.
+ Kontroleer pomp status.
+ Stel battery tipe.
+ Stel kasset tipe.
+ Verander battery en kasset.
+ Verander kasset.
+ Verander taal.
+
diff --git a/app/src/main/res/values-af/insight_alert_titles.xml b/app/src/main/res/values-af/insight_alert_titles.xml
index 70489fbc5e..891076258d 100644
--- a/app/src/main/res/values-af/insight_alert_titles.xml
+++ b/app/src/main/res/values-af/insight_alert_titles.xml
@@ -1,3 +1,30 @@
-
+
+ Lewer Bolus
+ Bolus Gemis
+ Wekker
+ Verander infusie stel
+ TBR voltooi
+ Kasset laag
+ Battery is amper leeg
+ Ongeldige tyd/datum
+ Einde van waarborg
+ TBR gekanselleer
+ Bolus gekanselleer
+ Leentyd waarskuwing
+ Kasset nie ingevoeg
+ Kasset leeg
+ Battery leeg
+ Outomaties af -pomp gestaak
+ Verstopping
+ Leentyd oor - einde van werking
+ Kasset verandering nie voltooi
+ Data aflaai gefaal
+ Wag modus verskrei
+ Battery tipe nie gestel nie
+ Kasset tipe nie gestel nie
+ Meganiese fout
+ Herlaai fout
+ Taal fout
+
diff --git a/app/src/main/res/values-af/insight_exceptions.xml b/app/src/main/res/values-af/insight_exceptions.xml
index 70489fbc5e..878c1f3008 100644
--- a/app/src/main/res/values-af/insight_exceptions.xml
+++ b/app/src/main/res/values-af/insight_exceptions.xml
@@ -1,3 +1,15 @@
-
+
+ Verbinding het misluk
+ Konneksie verloor
+ Maat verwerp
+ Sok skepping gefaal
+ Afsnytyd
+ Maksimum bolus nr reeds gelaai
+ Geen aktiewe TBR om te kanselleer
+ Geen aktiewe TBR om te verander
+ Geen sodanige bolus om te kanselleer
+ Pomp reeds in daardie staat
+ Loop modus nie toegelaat
+
diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
index 1230285370..61975f5e2d 100644
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@@ -44,6 +44,8 @@
Sensitiwiteit word bereken uit 8h data in die verlede en koolhidrate (indien nie geabsorbeer) is na die tyd vermeld in voorkeure gesny. Plugin bereken ook UAM.
Sensitiwiteit word bereken as \'n geweegde gemiddelde van dwalinge. Nuwer dwalinge het hoër gewig. Minimale karb absorpsie is bereken uit max karb absorpsie tyd vanaf voorkeure. Hierdie algoritme is die vinnigste om sensitiwiteit veranderinge te volg.
Ontvang BG waardes vanaf die gelapte Dexcom G5 app.
+ Ontvang BG waardes vanaf die gelapte Dexcom G6 toep.
+ Ontvang BG waardes uit die gelapte Eversense toep.
Ontvang BG waardes vanaf Glimp.
Onvang BG waardes vanaf die 600SeriesAndroidUploader.
Laai BG data af vanaf Nightscout
@@ -263,12 +265,7 @@
Om %1$.2fU bolus te lewer antwoord met kode %2$s
Om kalibrasie %1$.2f te stuur antwoord met kode %2$s
Bolus het misluk
- Bolus %.2fU suksesvol afgelewer
- Gaan %.2fU lewer
- Bolus %.2fU suksesvol afgelewer
- Lewering van %.2fU
Laat afstandbeheerde bevele toe via SMS
- Afstandbeheerde bolus nie toegelaat nie
Vinger
Sensor
Per hand
@@ -336,16 +333,12 @@
Lus geaktiveer
%1$.2f beperk tot %2$.2f
Waarde %s is uit harde perke
- Afstanbheerde basale instelling word nie toegelaat nie
Afstandbeheerde bevel word nie toegelaat nie
- Om %1$.2fU basale te aktiveer antwoord met kode %2$s
Om lus op te skort vir %1$d minute antwoord met kode %2$s
Temp basale %1$.2fU/h vir %2$d min suksesvol geaktiveerd
Tydelike basale aktivering het gefaal
- Stop tydelike basale antwoord met kode %s
Tydelike basale gekanselleer
Kansellassie van tydelike basale het gefaal
- Onbekende opdrag of verkeerd antwoord
SlimNutsman
SlimNutsman instellings
Knoppie teks:
@@ -408,6 +401,7 @@
Matriks van %1$d elemente. \nWerklike waarde:
Autosens data
Skrip foutopspoor
+ Gebruik autosens kenmerk
Verfris gebeure van NS
Skrap behandelings in die toekoms
Eet binnekort
@@ -468,7 +462,6 @@
Stuur kalibrasie %.1f to xDrip?
xDrip + nie geïnstalleerd nie
Kalibrasie gestuur na xDrip
- Afstandbeheerde bevel word nie toegelaat nie
Kalibrasie gestuur. Ontvang moet geaktiveer word in xDrip.
xDrip ontvang nie kalibrasies
Pomp opgeskort
@@ -549,6 +542,12 @@
INS
Ontsper superbolus in Ghoeroe
Ontsper superbolus funksionaliteit in Ghoeroe. Moenie aktiveer totdat jy leer wat dit werklik doen. DIT KAN \'n INSULIEN OORDOSIS VEROORSAAK AS BLINDELINGS GEBRUIK WORD!
+ Wys status vlae op tuisskerm
+ Wys status vlae vir cage, iage, sage, stoor en battery vlak op tuisskerm.
+ Drempel waarskuwings stoor vlak [U]
+ Drempel kritieke stoor vlak [U]
+ Drempel waarskuwing battery vlak [%]
+ Drempel kritieke battery vlak [%]
IAB
KOB
Firmware
@@ -703,7 +702,10 @@
BT Watchdog
Skakel asb die foon se bluetooth af vir een sekonde Indien geen verbinding met die pomp moontlik is nie. Dit mag help vir sommige selfone waar die bluetooth stapel vries.
DexcomG5 App (gelapte)
+ DexcomG6 App (gelapte)
+ Eversense App (bygewerk)
BG data oplaai na NS
+ BG oplaai instellings
Wys gedetailleerde delta
Wys delta met een meer desimale plek
Maks minute van basale beperk SMB tot
@@ -769,6 +771,7 @@
Lewering van die bolus en verifiëring van die pomp se geskiedenis het misluk, Kontroleer asseblief die pomp. As \'n bolus afgelewer is, sal dit bygevoeg word om behandelings gedurende die volgende verbinding met die pomp.
Nie genoeg insulien vir bolus oor in reserwe
Verlengde bolus afleweringsfout
+ Sig
Insight Pomp
Status
Verander
@@ -843,6 +846,7 @@
Data keuses
Fabric Upload
Laat outomatiese Foutverslagdoening en kenmerk data stuur na die ontwikkelaars via die fabric.io diens.
+ Hernuwe asseblief jou G5 toepassing na \'n ondersteunde weergawe
Begin aktiwiteit TT
Begin eet gou TT
TT
@@ -1008,6 +1012,7 @@
%1$d. Doelwit
Poctech
Ontvang BG waardes van Poctech toepassing
+ Ontvang BG waardes vanaf Tomato toep (MiaoMiao toestel)
Hoë tydelike doelwitte verhoog sensitiwiteit
= 100]]>
Lae tydelike doelwitte verlaag sensitiwiteit
@@ -1050,10 +1055,83 @@
Minimale versoek verandering [%]
Lus sal opspring en nuwe verandering versoek slegs as verandering is groter as hierdie waarde. Verstek waarde is 20%
Verbind asseblief jou pomp met jou selfoon!
+ Soek vir toestelle…
+ Wag asseblief…
+ Maats voltooi
+ Stem die kodes gewys op hierdie toestel en op jou pomp saam?
+ Insight maatjies
+ Accu-Chek Insight
+ %1$.2fU / %2$.2fU gelewer
+ %1$s:%2$s
+ Pyp verander
+ Pomp tyd opgedateer
+ Bevestig
+ Demp
+ Pomp alarm
+ Log ligging veranderings
+ Log voerpyp verandering
+ Log battery verandering
+ Log bedryf modus veranderinge
+ Log alarms
+ Skakel TBR emulasie aan
+ Gebruik uitgebreide boluses in plaas van TBRs om die 250% perk te omseil
+ Ontkoppel vertraging [s]
+ Reeksnommer
+ Vrygestelde sagteware weergawe
+ UI verwerker sagteware weergawe
+ PC verwerker sagteware weergawe
+ MD tel verwerker sagteware weergawe
+ Veiligheid verwerker sagteware weergawe
+ BT info bladsy weergawe
+ Bluetooth adres
+ Stelsel ID Aanhangsel
+ Vervaardigings datum
+ Verwyder maats
+ Maat inligting
+ Verfris status
+ Begin pomp
+ Stop pomp
+ Bedryf modus
+ Status
+ TDD Bolus
+ TDD basale
+ TDD totaal
+ Herstel
+ Nie gemaat
+ Laaste verbind
+ Begin
+ Gestaak
+ %1$d%% vir %2$d / %3$d min
+ Uitgebreide bolus
+ Multigolf bolus
+ %1$.2f / %2$.2f U vir %3$d min
+ Skakel kennisgewing van TBR einde\n(pomp instelling)
+ Deaktiveer kennisgewing van TBR einde\n(pomp instelling)
+ Verfris
+ Integrasie vir Accu-Chek Insight pompe
+ Nie ingesteek
+ Laaste kon: %1$d min gelede
+ TBR: %1$d%% vir %2$d / %3$d min
+ Verleng: %1$.2f / %2$.2f U vir %3$d min
+ Multigolf: %1$.2f / %2$.2f U vir %3$d min
+ TDD: %1$.2f
+ Stoor.: %1$.2fU
+ Bat.: %1$d%%
+ Max. herstel duur [s]
+ Min. herstel duur [s]
+ Herstel duur
+ Afsnytyd gedurende handskud - terugstel bluetooth
== ∑ %1$s U
U/h
g/U
/U
+ Log sensor verander na NS
+ Skep geleentheid \"sensor verandering\" in NS automaties op sensor begin
+ Tomato (MiaoMiao)
+ Tomato
+ Daglig spaar tyd verandering in 24 h of minder
+ interne berging beperking
+ Bevry ten minste %1$d MB van intene stoorspasie! Lus gedeaktiveer!
- %1$d dae
- %1$d dae
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 0dcbd3de43..7e381a49fb 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -54,6 +54,7 @@
Наблюдавайте и контролирайте AndroidAPS, от вашия WearOS часовник.
Покажи информация за вашия APS на xDrip + циферблат на часовник.
Дистанционно управление AndroidAPS чрез използване на SMS команди.
+ Назад
Стартирай
Провери
Единици
@@ -265,12 +266,7 @@
За да доставите болус от %1$.2fЕ отговорете с код %2$s
За да изпратите калибрация %1$.2f отговорете с код %2$s
Болус отказан
- Болус %.2fЕд беше подаден успешно
- Подава болус %.2fЕ
- Болус от %.2fЕ подаден успешно
- Подава %.2fЕ
Позволи отдалечени команди чрез SMS
- Отдалечено подаване на болус - забранено!
Пръст
Сензор
Друго
@@ -338,16 +334,12 @@
APS е включен
%1$.2f ограничен до %2$.2f
Стойността %s е извън границите
- Отдалечено прилагане на базал е забранено
Отдалеченото управление е забранено
- За да стартирате базал от %1$.2fЕ отговорете с код %2$s
За да спрете APS за %1$d минути отговорете с код %2$s
Временен базал от %1$.2fЕ/ч за %2$d мин стартиран успешно
Неуспешно стартиране на временен базал
- За да спрете времен базал отговорете с код %s
Временният базал е отменен
Спирането на временния базал е неуспешно
- Непозната команда или грешен отговор
Бърз болус
Настройки за бърз болус
Текст на бутона:
@@ -471,7 +463,6 @@
Изпрати калибрация %.1f към xDrip?
xDrip+ не е инсталиран
Калибрацията е изпратена към xDrip
- Не е разрешена отдалечена калибрация
Неуспешно. Получаването трябва да е разрешено в xDrip.
xDrip не получава калибрации
Помпата е спряна
@@ -1139,6 +1130,9 @@
Създаване на събитие \"Смяна на сеснзор\" в NS автоматично при старт на сензор
Tomato(MяоМяо)
Tomato
+ Смяна на времето след по-малко от 24ч
+ Ограничение поради липса на памет
+ Освободете поне %1$d Мб в паметта на телефона! Loop изключен!
- %1$d дeн
- %1$d дни
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 7a0db0dbdc..b22c883f5b 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -54,6 +54,7 @@
Zobrazování stavu a řízení AndroidAPS z hodinek s WearOS
Zobrazování informací o smyčce na xDrip+ watchface.
Vzdálené řízení pomocí SMS příkazů
+ Zpět
Začátek
Kontrola
Jednotky
@@ -265,12 +266,11 @@
K potvrzení bolusu %1$.2fU odpověz SMS s kódem %2$s
Odeslání kalibrace %1$.2f potvrďte kódem %2$s
Chyba při aplikování bolusu
- Bolus %.2fU aplikován úspěšně
- Spouštím dodávání %.2fU
- Bolus %.2fU aplikován úspěšně
- Aplikováno %.2fU
+ Bolus %1$.2fU aplikován úspěšně
+ Podávání %1$.2fU inzulínu
+ Bolus %1$.2fU aplikován úspěšně
+ Aplikováno %1$.2fU
Povolit posílání příkazů přes SMS
- Vzdálený bolus není momentálně povolen
Glukoměr
Senzor
Jiný
@@ -338,15 +338,24 @@
Smyčka je povolena
%1$.2f omezeno na %2$.2f
Hodnota %s je mimo přednastavený rozsah
- Vzdálené posílání příkazů není povoleno
Vzdálený příkaz není povolen
- Na spuštění bazálu %1$.2fU/h odpověz SMS s kódem %2$s
+ Vzdálený bolus není momentálně povolen. Zkuste to později.
+ Pro spuštění bazálu %1$.2fU/h na %2$d min odpovězte SMS s kódem %3$s
+ Pro přepnutí profilu na %1$s %2$d%% odpovězte SMS s kódem %3$s
+ Pro spuštění prodlouženého bolusu %1$.2fU na %2$d min odpovězte SMS s kódem %3$s
+ Pro spuštění bazálu %1$d%% na %2$d min odpovězte SMS s kódem %3$s
K pozastavení smyčky na %1$d minut odpověz SMS s kódem %2$s
Dočasný bazál %1$.2fU/h na %2$d minut spuštěn
+ Prodloužený bolus %1$.2fU na %2$d min úspěšně spuštěn
+ Dočasný bazál %1$d%% na %2$d minut úspěšně spuštěn
Spuštění dočasného bazálu selhalo
- Na ukončení bazálu odpověz SMS s kódem %s
+ Spuštění prodlouženého bolusu selhalo
+ Na zastavení dočasného bazálu odpovězte SMS s kódem %1$s
+ Na zastavení prodlouženého bolusu odpovězte SMS s kódem %1$s
Dočasný bazál zastaven
+ Prodloužený bolus zastaven
Rušení dočasného bazálu selhalo
+ Zastavení prodlouženého bolusu selhalo
Neznámý příkaz nebo chybná odpověď
Rychlý bolus
Nastavení rychlých bolusů
@@ -471,7 +480,6 @@
Poslat do xDripu kalibraci %.1f ?
xDrip+ není nainstalován
Kalibrace odeslána do xDripu
- Vzdálené kalibrace nejsou povoleny
Kalibrace odeslána. Příjem musí být v xDripu povolený.
xDrip nepřijímá kalibrace
Pumpa pozastavena
@@ -1140,7 +1148,12 @@
Tomato (MiaoMiao)
Tomato
Změna letního času za méně než 24 hodin
- Změna letního času za méně než 3 hodiny - Uzavřená smyčka zastavena
+ omezení vnitřního úložiště
+ Uvolněte alespoň %1$d MB z vnitřního úložiště! Smyčka zakázána!
+ Chybný formát
+ Nesprávný kód. Příkaz zrušen.
+ Není nakonfigurováno
+ Přepnutí profilu vytvořeno
- %1$d den
- %1$d dnů
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index d2ba3fd6ed..36c24aeed9 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -54,6 +54,7 @@
Überwache und steuere AndroidAPS mit Deiner WearOS-Smartwatch.
Zeige Loop-Informationen auf Deinem xDrip+-Watchface.
Steuere AndroiAPS fern mittels SMS-Anweisungen.
+ Zurück
Start
Bestätigen
Einheiten
@@ -265,12 +266,7 @@
Um einen Bolus von %1$.2f IE abzugeben, antworte mit dem Code %2$s.
Um die Kalibrierung %1$.2f zu senden, antworte mit dem Code %2$s.
Bolus fehlgeschlagen
- %.2f IE Bolus erfolgreich abgegeben
- Werde %.2f IE abgeben
- Bolus %.2f IE erfolgreich abgegeben
- Abgabe %1$.2f IE
Erlaube externe Befehle per SMS
- Ferngesteuerter Bolus ist nicht erlaubt
Finger
Sensor
Manuell
@@ -339,16 +335,12 @@ maxIOB = durchschnittlicher Essensbolus + 3 x maximale Basalrate
Loop ist aktiviert.
%1$.2f limitiert auf %2$.2f
Wert %1$s ist außerhalb des festen Limits.
- Ferngesteuerte Basal-Einstellungen sind nicht erlaubt.
Ferngesteuerte Befehle sind nicht erlaubt.
- Um eine BR mit %1$.2f IE/h zu starten, antworte mit dem Code %2$s.
Um das Loopen für %1$d Minuten zu pausieren, antworte mit dem Code %2$s.
TBR mit %1$.2f IE/h für %2$d min wurde erfolgreich gestartet.
Das Starten der TBR ist fehlgeschlagen.
- Um die TBR abzubrechen, antworte mit dem Code %s.
TBR abgebrochen
Das Abbrechen der TBR ist fehlgeschlagen.
- Unbekannter Befehl oder falsche Antwort
QuickWizard
QuickWizard-Einstellungen
Schaltflächen-Text:
@@ -472,7 +464,6 @@ maxIOB = durchschnittlicher Essensbolus + 3 x maximale Basalrate
Kalibrierung %1$.1f an xDrip+ senden?
xDrip+ nicht installiert
Kalibrierung an xDrip+ gesendet
- Fern-Kalibrierung ist nicht erlaubt.
Kalibrierung gesendet. Das Empfangen von Kalbrierungen muss in xDrip+ aktiviert sein.
xDrip+ hat die Kalbrierung nicht erhalten
Pumpe pausiert
@@ -1141,6 +1132,9 @@ Unerwartetes Verhalten.
Ereignis \"Sensorwechsel\" bei Sensorstart automatisch in NS erstellen
Tomato (MiaoMiao)
Tomato
+ Zeitumstellung in weniger als 24 Stunden
+ interne Speicherbegrenzung
+ Mindestens %1$d MB freier interer Speicher benötigt! Loop abgeschaltet!
- %1$d Tag
- %1$d Tage
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 4d6ce3af75..07bbadfa95 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -263,12 +263,7 @@
Για έγχυση bolus %1$.2fU στείλτε με κωδικό %2$s
Για αποστολή καλιμπραρίσματος %1$.2f στείλτε με κωδικό %2$s
Αποτυχία Bolus
- Bolus %.2fU παραδόθηκε επιτυχώς
- Προς έγχυση %.2fU
- Bolus %.2fU παραδόθηκε επιτυχώς
- Έγχυση %.2fU
Άδεια για απομακρυσμένες εντολές μέσω SMS
- Δεν επιτρέπεται απομακρυσμένο bolus
Δάκτυλο
Αισθητήρας
Χειροκίνητα
@@ -336,16 +331,12 @@
Κύκλωμα ενεργοποιημένο
Το %1$.2f περιορίζεται σε %2$.2f
Η τιμή %s είναι έξω από τα όρια
- Δεν επιτρέπεται η απομακρυσμένη ρύθμιση βασικού ρυθμού
Δεν επιτρέπεται απομακρυσμένη εντολή
- Για έναρξη βασικού %1$.2fU/h στείλτε με κωδικό %2$s
Για αναστολή κυκλκώματος για %1$d λεπτών στείλτε με κωδικό %2$s
Προσωρινός Ρυθμός %1$.2fU/h για %2$d λεπτά ξεκίνησε επιτυχώς
Εκκίνηση Προσωρινού Ρυθμού απέτυχε
- Για να σταματήσετε Προσωρινό Ρυθμό στείλτε με κωδικό %s
Ο Προσωρινός Ρυθμός ακυρώθηκε
Ακύρωση Προσωρινού Ρυθμού απέτυχε
- Άγνωστη εντολή ή λάθος απάντηση
Γρήγορος Οδηγός
Ρυθμίσεις Γρήγορου Οδηγού
Κείμενο στο πλήκτρο:
@@ -468,7 +459,6 @@
Να στείλω το καλιμπράρισμα %.1f στο xDrip;
xDrip+ μη εγκατεστημένο
Το καλιμπράρισμα εστάλει στο xDrip
- Δεν επιτρέπεται απομακρυσμένο καλιμπράρισμα
Το καλιμπράρισμα στάλθηκε. Η λήψη πρέπει να είναι ενεργοποιημένη στο xDrip.
το xDrip δεν λαμβάνει καλιμπραρίσματα
Η αντλία είναι σε παύση
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 0244a83870..2068dcaff0 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -265,12 +265,7 @@
Para entregar bolo %1$.2fU responder con código %2$s
Para enviar calibración %1$.2f responder con código %2$s
Bolo falló
- Bolo %.2fU entregado con éxito
- Entregaré %.2fU
- Bolo %.2fU enviado correctamente
- Entregando %.2fU
Permitir comandos remotos vía SMS
- Bolo remoto no permitido
Dedo
Sensor
Manualmente
@@ -338,16 +333,12 @@
Lazo activo
%1$.2f limitado a %2$.2f
Valor %s fuera de limites
- No permitidos ajustes basales remotos
Comando remoto no permitido
- Para iniciar basal %1$.2fU/h responder con código %2$s
Para cancelar lazo por %1$d minutos responde con código %2$s
Basal temporal %1$.2fU/h para %2$d min iniciada correctamente
Fallo inicio basal temporal
- Para parar basal temporal responder con código %s
Basal temporal cancelada
Fallo cancelación basal temporal
- Comando desconocido o respuesta incorrecta
Asistente
Asistente configuración
Botón Texto:
@@ -471,7 +462,6 @@
¿Mandar calibración %.1f a xDrip?
xDrip+ no instalado
Calibración mandada a xDrip
- Calibración remota no admitida
Calibración enviada. La recepción debe estar habilitada en xDrip.
xDrip no recibe calibraciones
Bomba parada
diff --git a/app/src/main/res/values-fr/insight_alert_codes.xml b/app/src/main/res/values-fr/insight_alert_codes.xml
index 70489fbc5e..ffa4d17711 100644
--- a/app/src/main/res/values-fr/insight_alert_codes.xml
+++ b/app/src/main/res/values-fr/insight_alert_codes.xml
@@ -1,3 +1,30 @@
-
+
+ Rappel R1
+ Rappel R2
+ Rappel R3
+ Rappel R4
+ Rappel R7
+ Avertissement W31
+ Avertissement W32
+ Avertissement W33
+ Avertissement W34
+ Avertissement W36
+ Avertissement W38
+ Avertissement W39
+ Maintenance M20
+ Maintenance M21
+ Maintenance M22
+ Maintenance M23
+ Maintenance M24
+ Maintenance M25
+ Maintenance M26
+ Maintenance M27
+ Maintenance M28
+ Maintenance M29
+ Maintenance M30
+ Erreur E6
+ Erreur E10
+ Erreur E13
+
diff --git a/app/src/main/res/values-fr/insight_alert_descriptions.xml b/app/src/main/res/values-fr/insight_alert_descriptions.xml
index 70489fbc5e..c1bc4abb26 100644
--- a/app/src/main/res/values-fr/insight_alert_descriptions.xml
+++ b/app/src/main/res/values-fr/insight_alert_descriptions.xml
@@ -1,3 +1,25 @@
-
+
+ %1$d%%\nDurée :%2$s h]]>
+ %1$s U]]>
+ Changer la batterie.
+ Régler heure/date.
+ Contacter l\'assistance Accu-Check.
+ %1$d%%
Durée : %2$s h]]>
+ %1$s U
Délivré : %2$s U]]>
+ Insérer le réservoir.
+ Changer le réservoir.
+ Changer la batterie.
+ Vérifier l\'état de la pompe.
+ Remplacer le dispositif de perfusion.
+ Contacter l\'assistance Accu-Check.
+ Changer le réservoir.
+ Recommencer le transfert des données.
+ Vérifier l\'état de la pompe.
+ Choisir le type de pile.
+ Choisir le type de réservoir.
+ Remplacer pile et réservoir.
+ Changer le réservoir.
+ Changer la langue.
+
diff --git a/app/src/main/res/values-fr/insight_alert_titles.xml b/app/src/main/res/values-fr/insight_alert_titles.xml
index 70489fbc5e..92b15f02db 100644
--- a/app/src/main/res/values-fr/insight_alert_titles.xml
+++ b/app/src/main/res/values-fr/insight_alert_titles.xml
@@ -1,3 +1,30 @@
-
+
+ Injecter le Bolus
+ Bolus oublié
+ Réveil
+ Remplacer le dispositif de perfusion
+ DBT terminé
+ Réservoir presque vide
+ Batterie faible
+ Heure/date incorrectes
+ Fin de garantie
+ DBT annulé
+ Bolus annulé
+ Avertissement fin prêt
+ Réservoir non inséré
+ Réservoir vide
+ Pile déchargée
+ Arrêt automatique - Pompe arrêtée
+ Occlusion
+ Fin du prêt - fin de fonctionnement
+ Changement de réservoir non terminé
+ Échec du transfert des données
+ Mode pause expiré
+ Type de pile non configuré
+ Type de réservoir non défini
+ Erreur mécanique
+ Erreur retour tige filetée
+ Erreur de langue
+
diff --git a/app/src/main/res/values-fr/insight_exceptions.xml b/app/src/main/res/values-fr/insight_exceptions.xml
index 70489fbc5e..359ba46cc5 100644
--- a/app/src/main/res/values-fr/insight_exceptions.xml
+++ b/app/src/main/res/values-fr/insight_exceptions.xml
@@ -1,3 +1,15 @@
-
+
+ Échec de connexion
+ Connexion perdue
+ Appairage rejeté
+ La création du Socket a échouée
+ Expiration
+ Nombre maximum de types de Bolus déjà en cours d\'exécution
+ Pas de DBT à annuler
+ Pas de DBT à changer
+ Aucun Bolus à annuler
+ Pompe déjà dans cet état
+ Mode d\'exécution non autorisé
+
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 59556b006a..ddc5a3bc49 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -44,6 +44,8 @@
Sensibilité est calculée à partir des données des dernières 8 heures et des glucides (si non absorbés) ne sont plus pris en compte après le temps spécifié dans les préférences. Plugin calcule également UAM.
Sensibilité est calculée comme une moyenne pondérée des écarts. Les écarts les plus récents ont un poids plus élevé. L\'absorption minimale des glucides est calculée à partir des temps d’absorption des glucides max du menu préférences. Cet algorithme est le plus rapide pour s\'adapter aux changements de sensibilité.
Recevoir les valeurs de glycémie de l’app Dexcom G5 patchée.
+ Recevoir les valeurs de glycémie de l’app Dexcom G6 patchée.
+ Recevoir les valeurs de glycémie de l’app Eversense patchée.
Recevoir les glycémies depuis Glimp.
Recevoir les glycémies depuis le 600SeriesAndroidUploder.
Télécharge les glycémies depuis Nightscout
@@ -52,6 +54,7 @@
Surveillez et contrôlez AndroidAPS en utilisant votre montre WearOS.
Afficher les informations de votre Boucle sur votre écran de montre xDrip+.
Commander à distance AndroidAPS en utilisant les commandes SMS.
+ Retour
Démarrer
Vérifier
Unités
@@ -264,12 +267,11 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
Renvoyer le code %2$s pour injecter le bolus %1$.2fU
Renvoyer le code %2$s pour envoyer la calibration %1$.2f
Échec du Bolus
- Bolus %.2fU délivré avec succès
- %.2fU va être injecté
- %.2fU de bolus injecté avec succès
- En train d\'injecter %.2fU
+ Bolus %1$.2fU délivré avec succès
+ %1$.2fU vont être injectées
+ Bolus %1$.2fU délivré avec succès
+ En train d\'injecter %1$.2fU
Autoriser les commandes à distance par SMS
- Bolus à distance non autorisé
Doigt
Capteur
Manuel
@@ -337,16 +339,25 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
La Boucle est activée
%1$.2f limité à %2$.2f
La valeur %s est hors des limites strictes
- Le réglage du basal à distance n\'est pas autorisé
La commande à distance n\'est pas autorisée
- Envoyer le code %2$s pour initier le basal %1$.2fU/h
+ Bolus à distance non disponible. Réessayez plus tard.
+ Pour démarrer Basal %1$.2fU/h pendant %2$d min, renvoyer le code %3$s
+ Pour changer le profil vers %1$s %2$d%%, renvoyer le code %3$s
+ Pour démarrer le Bolus étendu %1$.2fU pendant %2$d min, renvoyer le code %3$s
+ Pour démarrer le Basal %1$d% pendant %2$d min, renvoyer le code %3$s
Envoyer le code %2$s pour suspendre la Boucle pour %1$d minutes
Démarrage réussi pour %1$.2fU/h de basal temporaire pour %2$d min
+ Le Bolus étendu %1$.2fU pendant %2$d min a commencé avec succès
+ Démarrage réussi pour %1$d%% de Basal temporaire pour %2$d min
Le démarrage du basal temporaire a échoué
- Envoyer le code %s pour arrêter le basal temporaire
+ Le départ du Bolus étendu a échoué
+ Envoyer le code %1$s pour arrêter le Basal temporaire
+ Pour arrêter le Bolus étendu, renvoyer le code %1$s
Basal temporaire annulé
+ Bolus étendu annulé
Echec de l\'annulation du basal temporaire
- Commande inconnue ou fausse réponse
+ Échec de l\'annulation du Bolus étendu
+ Commande inconnue ou mauvaise réponse
Assistant Rapide
Paramètres de l\'Assistant Rapide
Texte du bouton :
@@ -409,6 +420,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
Tableau de %1$d éléments.\nValeur Actuelle :
Données Autosens
Débogage du Script
+ Utiliser la fonction Autosens
Actualiser les événements depuis NS
Supprimer les futurs traitements
Repas imminent
@@ -469,7 +481,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
Transmettre l\'étalonnage %.1f à xDrip ?
xDrip+ n\'est pas installé
Étalonnage envoyé à xDrip
- L\'étalonnage à distance n\'est pas autorisé
Étalonnage envoyé. La réception doit être activée dans xDrip.
xDrip ne reçoit pas les étalonnages
Pompe arrêtée
@@ -550,6 +561,12 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
INS
Activer les Superbolus dans l’Assistant
Activer la fonctionnalité SuperBolus dans l’Assistant. Ne pas l’activer avant de bien comprendre comment cela fonctionne réellement. IL PEUT PROVOQUER UNE OVERDOSE D’INSULINE SI UTILISÉ AVEUGLÉMENT !
+ Afficher les lumières d\'état sur l\'écran d\'accueil
+ Activer les lumières d\'état pour AgeC, AgeI, AgeS, niveaux du réservoir et de batterie sur l\'écran d\'accueil.
+ Seuil d\'avertissement de niveau du réservoir [U]
+ Seuil critique de niveau du réservoir [U]
+ Seuil d’avertissement du niveau de batterie [%]
+ Seuil critique du niveau de la batterie [%]
IA
GA
Firmware
@@ -704,7 +721,10 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
BT Watchdog
Ceci va arrêter le Bluetooth du téléphone pour une seconde si la connexion pompe n’est pas possible. Cela peut assister certains téléphones dont la connexion Bluetooth se bloque.
App Dexcom G5 (adaptée)
+ App DexcomG6 (patché)
+ App Eversense (patché)
Remonter les données glycémiques vers NS
+ Paramètres de téléchargement des glycémies
Afficher le delta détaillé
Afficher delta avec une décimale supplémentaire
Max. minutes de basal pour limiter le SMB
@@ -770,6 +790,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
L\'administration de bolus et la vérification de l\'historique de la pompe ont échoué. Vérifiez la pompe manuellement. Si un bolus a été administré, il sera ajouté aux traitements au cours de la prochaine connexion avec la pompe.
Pas assez d\'insuline dans le réservoir pour le bolus
Erreur administration bolus étendu
+ Vue
Pompe Insight
État
Modifié
@@ -844,6 +865,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
Choix de données
Téléchargement Fabric
Autoriser l\'envoi automatique des rapports d\'erreur et des données d\'utilisation aux développeurs via le service fabric.io
+ SVP actualisez votre app Dexcom vers une version compatible
Début Activités
Début Repas Imminent
Traitement
@@ -1009,6 +1031,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
%1$d. Objectif
Poctech
Recevoir les glycémies depuis l\'app Poctech
+ Recevoir les valeurs de glycémie de l\'application Tomato (appareil MiaoMiao)
Cible temp. haute élève la sensibilité
= 100]]>
Cible temp. basse abaisse la sensibilité
@@ -1051,10 +1074,87 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
Changement minimum possible [%]
Le fonctionnement de la Boucle demandera une confirmation uniquement si le changement est supérieur à cette valeur. Par défaut, la valeur est 20%
Appairez SVP votre pompe avec votre téléphone !
+ Recherche d\'appareils en cours…
+ Merci de patienter...
+ Appairage terminé
+ Les codes affichés sur cet appareil et sur la pompe sont-ils identiques ?
+ Appairage de Insight
+ Accu-Chek Insight
+ %1$.2fU / %2$.2fU injecté
+ %1$s : %2$s
+ Tubulure changée
+ Mise à jour de l\'heure de la pompe
+ Confirmer
+ Coupure son
+ Alerte de la pompe
+ Enreg. changement de site
+ Enreg. changement de tubulure
+ Enreg. changement batterie
+ Enreg. changement mode de fonctionnement
+ Enreg. alertes
+ Activer l’émulation de DBT
+ Utilisez des Bolus étendus au lieu de DBTs pour contourner la limite de 250%
+ Délai de déconnexion [s]
+ Numéro de série
+ Version du logiciel
+ Version du logiciel de processeur UI
+ Version du logiciel du processeur PC
+ Version du logiciel MD tel processeur
+ Version logicielle du processeur de sécurité
+ Version de la page d\'info BT
+ Adresse Bluetooth
+ Annexe ID Système
+ Date de fabrication
+ Supprimer l’appairage
+ Information sur l’appairage
+ Actualiser le status
+ Démarrer la pompe
+ Arrêter la pompe
+ Mode de fonctionnement
+ État
+ Bolus DTI
+ DTI basale
+ Total DTI
+ Récupération en cours.
+ Non appairé
+ Dernière connexion
+ Démarré
+ Arrêté
+ %1$d%% pour %2$d / %3$d min
+ Bolus étendu
+ Bolus mixte
+ %1$.2f / %2$.2f U pour %3$d min
+ Activer la notification de la fin DBT\n(réglage de pompe)
+ Activer la notification de la fin de DBT\n(réglage de pompe)
+ Actualiser
+ Intégration des pompes Accu-Chek Insight
+ Non inséré
+ Dernière conn : il y a %1$d min
+ DBT : %1$d%% pour %2$d / %3$d min
+ Étendue : %1$.2f / %2$.2f U pour %3$d min
+ Mixte : %1$.2f / %2$.2f U pour %3$d min
+ DTI : %1$.2f
+ Réserv. : %1$.2fU
+ Batt.: %1$d%%
+ Durée max. de récupération [s]
+ Durée min. de récupération [s]
+ Durée de récupération
+ Expiration pendant l\'appairage - réinitialiser le Bluetooth
== ∑ %1$s U
U/h
g/U
/U
+ Enreg. du changement de capteur sur NS
+ Créer automatiquement sur NS un événement \"Changement de capteur\" au démarrage du capteur
+ Tomato (MiaoMiao)
+ Tomato
+ Changement d\'heure d\'été dans moins de 24 heures
+ stockage interne limité
+ Boucle désactivée ! Libérez au moins %1$d Mo du stockage interne !
+ Format incorrect
+ Code incorrect. Commande annulée.
+ Non configuré
+ Changement de profil effectué
- %1$d jour
- %1$d jours
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 530caf0528..12ead731c5 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -263,12 +263,7 @@
Per fornire risposta %1$.2fU bolo con codice %2$s
Invia la taratura %1$.2f risposta con codice %2$s
Bolo fallito
- Bolo %.2fU inviato correttamente
- Inviando %.2fU
- Bolo %.2fU inviato correttamente
- Inviare %.2fU
Consenti comandi remoti tramite SMS
- Il bolo da remoto non e\' permesso
Dito
Sensore
Manuale
@@ -336,16 +331,12 @@
Loop abilitato
%1$.2f limitato a %2$.2f
Valore %s è fuori limiti massimi
- Impostare basale da remoto non e\' permesso
il comando da remoto non e\' permesso
- Per iniziare basale %1$.2fU/h risposta con codice %2$s
Sospendi il loop per %1$d minuti riprendi %2$s
Basale temporanea %1$.2fU/h for %2$d min avviata con successo
Avvio Basale temporanea fallita
- Per interrompere la risposta basale della temperatura con il codice %s
Baasale temporanea cancellata
Cancellazione temporanea fallita
- Comando errato
QuickWizard
Impostazioni QuickWizard
Tasto testo:
@@ -468,7 +459,6 @@
Invia calibrazione %.1f a xDrip?
xDrip non installato
Invio calibrazione xDrip
- La calibrazione da remoto non e\' permesso
La calibrazione è stata inviata. La ricezione deve essere abilitata in xDrip.
xDrip non ha ricevuto la calibrazione
Sospensione Micro
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 85d58bc1f5..05cb3f62f7 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -263,12 +263,7 @@
Bolus %1$.2fU 을 주입하려면 %2$s 를 입력하고 답장하세요
보정값 %1$.2f을 전송하려면 %2$s 를 입력하고 답장하세요
Bolus failed
- Bolus %.2fU이 주입되었습니다.
- %.2fU 주입 예정입니다.
- Bolus %.2fU delivered successfully
- %.2fU 주입중
SMS 원격 명령 사용하기
- 원격 Bolus 허용되지 않음
체혈
센서
수동
@@ -336,16 +331,12 @@
Loop가 실행중입니다.
%1$.2f, %2$.2f으로 제한됨
%s값이 하드한계(Hard Limit)를 벗어났습니다
- 원격 Basal 설정이 허가되지 않았습니다
원격 명령이 허가되지 않았습니다
- Basal %1$.2fU/h 을 주입하려면 %2$s 를 입력하고 답장하세요
%1$d분동안 Loop 일시중지하려면 %2$s 를 입력하고 답장하세요
Temp Basal %1$.2fU/h for %2$d min started successfully
Temp Basal start failed
- 임시Basal을 중지하려면 %s 를 입력하고 답장하세요
Temp Basal canceled
Canceling Temp Basal failed
- 알려지지 않은 명령이거나 잘못된 답장입니다.
빠른마법사
빠른마법사 설정
버튼명:
@@ -468,7 +459,6 @@
보정값 %.1f을 xDrip에 전송하시겠습니까?
xDrip+가 설치되지 않았습니다
보정이 xDrip으로 전송되었습니다
- 원격보정이 허용되지 않았습니다
보정 전송됨. xDrip에서 수신이 되도록 설정되어 있어야 합니다.
xDrip에서 보정을 받지 못합니다.
펌프 일시중지됨
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 212ff279f1..42c567f870 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -265,12 +265,7 @@
Om de bolus %1$.2fU toe te dienen antwoord met de code %2$s
Om calibratie %1$.2f te verzenden antwoord met de code %2$s
Bolus mislukt
- Bolus %.2fU succesvol toegediend
- Klaar om %.2fE toe te dienen
- Bolus %.2fU succesvol toegediend
- Toedienen %.2fU
Sta SMS commando\'s toe
- Bolus via sms niet toegestaan
Vingerprik
Sensor
Manueel
@@ -339,16 +334,12 @@ Stel in en gebruik tijdelijk en standaard tijdelijke streefdoelen (bv. bij sport
Loop is ingeschakeld
%1$.2f gelimiteerd tot %2$.2f
Waarde %s is buiten de toegestane limieten
- Basale instellingen op afstand zijn niet toegestaan
Commando\'s op afstand zijn niet toegestaan
- Om het basaal %1$.2fE/uur te starten antwoord met de code %2$s
Om de loop te onderbreken voor %1$d minuten antwoord met de code %2$s
Tijdelijk basaal %1$.2fE/u voor %2$d minuten succesvol gestart
Start tijdelijk basaal mislukt
- Om het tijdelijke basaal te stoppen antwoord met de code %s
Tijdelijk basaal afgebroken
Afbreken van tijdelijk basaal mislukt
- Onbekend commando of verkeerd antwoord
Vaste maaltijd
Vaste maaltijd instellingen
Naam:
@@ -472,7 +463,6 @@ Stel in en gebruik tijdelijk en standaard tijdelijke streefdoelen (bv. bij sport
Verzend calibratie %.1f naar xDrip?
xDrip+ niet geïnstalleerd
Kalibratie naar xDrip verzonden
- Kalibratie op afstand is niet toegestaan
Kalibratie verzonden. Het ontvangen van kalibraties moet actief zijn in xDrip.
XDrip ontvangt geen kalibraties
Pomp onderbreken
@@ -633,7 +623,7 @@ Stel in en gebruik tijdelijk en standaard tijdelijke streefdoelen (bv. bij sport
ACTIVITEIT & FEEDBACK
KOOLHYDRATEN & BOLUS
CGM & OPENAPS
- POMO
+ POMP
Basale waarde [E/uur]
Tijdsduur [min]
OpenAPS SMB
@@ -1141,7 +1131,8 @@ Stel in en gebruik tijdelijk en standaard tijdelijke streefdoelen (bv. bij sport
Tomato (MiaoMiao)
Tomato
Zomer/wintertijd omschakeling binnen 24 uur
- Zomer/wintertijd omschakeling in minder dan 3 uur - Closed loop gedeactiveerd
+ interne opslag bijna vol
+ Maak minstens %1$d MB vrij in interne opslag! Loop is uitgeschakeld!
- %1$d dag
- %1$d dag
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index e22715367b..303a53d678 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -265,12 +265,7 @@
Aby dostarczyć bolus %1$.2fU wprowadź kod %2$s
Aby wysłać kalibrację %1$.2f wprowadź kod %2$s
Bolus nieudany
- Bolus %.2fU dostarczony
- Zamierzam dostarczyć %.2fU
- Bolus %.2fU dostarczony
- Dostarczam %.2fU
Zezwalaj na komendy zdalne via SMS
- Bolus zdalny nie dozwolony
Palec
Sensor
Ręczne
@@ -338,16 +333,12 @@
Pętla (Loop) jest włączona
%1$.2f ograniczone do %2$.2f
Wartość %s jest poza dopuszczalną granicą
- Ustawienie zdalnej bazy nie jest dozwolone
Zdalne komendy nie są dozwolone
- Aby rozpocząć bazę %1$.2fU/h odpowiedz kodem %2$s
Aby wstrzymać pętle na %1$d minut odpowiedz kodem %2$s
Tymczasowa baza %1$.2fU/h przez %2$d min rozpoczęta
Rozpoczęcie tymczasowej bazy nie powiodło się
- Aby zatrzymać bazę tymczasową odpowiedz kodem %s
Baza tymczasowa anulowana
Anulowanie tymczasowej bazy nie powiodło się
- Nieznane polecenie lub błędna odpowiedź
Bolus zdefiniowany
Ustaw szybkie bolusy
Tekst przycisku:
@@ -471,7 +462,6 @@
Wysłać kalibrację %.1f do xDrip?
xDrip+ nie zainstalowany
Kalibracja przesłana do xDrip
- Zdalna kalibracja nie dozwolona
Kalibracja wysłana. Odbiór musi być dozwolony w xDrip.
xDrip nie odbiera kalibracji
Pompa wstrzymana
diff --git a/app/src/main/res/values-pt/insight_alert_codes.xml b/app/src/main/res/values-pt/insight_alert_codes.xml
index 70489fbc5e..16b73c4ddd 100644
--- a/app/src/main/res/values-pt/insight_alert_codes.xml
+++ b/app/src/main/res/values-pt/insight_alert_codes.xml
@@ -1,3 +1,30 @@
-
+
+ Lembrete R1
+ Lembrete R2
+ Lembrete R3
+ Lembrete R4
+ Lembrete R7
+ Aviso W31
+ Aviso W32
+ Aviso W33
+ Aviso W34
+ Aviso W36
+ Aviso W38
+ Aviso W39
+ Manutenção M20
+ Manutenção M21
+ Manutenção M22
+ Manutenção M23
+ Manutenção M24
+ Manutenção M25
+ Manutenção M26
+ Manutenção M27
+ Manutenção M28
+ Manutenção M29
+ Manutenção M30
+ Erro E6
+ Erro E10
+ Erro E13
+
diff --git a/app/src/main/res/values-pt/insight_alert_descriptions.xml b/app/src/main/res/values-pt/insight_alert_descriptions.xml
index 70489fbc5e..e5529e689e 100644
--- a/app/src/main/res/values-pt/insight_alert_descriptions.xml
+++ b/app/src/main/res/values-pt/insight_alert_descriptions.xml
@@ -1,3 +1,25 @@
-
+
+ %1$d%%\nDuração: %2$s h]]>
+ %1$s U]]>
+ Trocar a bateria.
+ Definir hora/data.
+ Contatar o suporte Accu-Chek.
+ %1$d%%
Duração: %2$s h]]>
+ %1$s U
Administrado: %2$s U]]>
+ Inserir cartucho.
+ Mudar cartucho.
+ Trocar a bateria.
+ Verificar estado da bomba.
+ Alterar o conjunto de infusão.
+ Contatar o suporte Accu-Chek.
+ Mudar cartucho.
+ Reiniciar download de dados.
+ Verificar estado da bomba.
+ Definir o tipo de bateria.
+ Definir tipo de cartucho.
+ Mudar bateria e cartucho.
+ Mudar cartucho.
+ Alterar Idioma.
+
diff --git a/app/src/main/res/values-pt/insight_alert_titles.xml b/app/src/main/res/values-pt/insight_alert_titles.xml
index f96cd0c75d..547fcd1101 100644
--- a/app/src/main/res/values-pt/insight_alert_titles.xml
+++ b/app/src/main/res/values-pt/insight_alert_titles.xml
@@ -1,9 +1,25 @@
+ Administrar bolus
+ Bolus não administrado
+ Alarme
+ Mudar o conjunto de infusão
+ Basal temporária concluída
+ Reservatório quase vazio
Bateria fraca
Hora/Data inválida
Fora da Garantia
+ Basal temporária cancelada
+ Bolus cancelado
Cartucho vazio
Bateria vazia
+ Oclusão
+ Mudança de Cartucho não concluída
+ Falha no download de dados
+ Tempo limite de modo de pausa
+ Tipo de bateria não definido
+ Tipo de Cartucho não definido
+ Erro mecânico
+ Erro de idioma
diff --git a/app/src/main/res/values-pt/insight_exceptions.xml b/app/src/main/res/values-pt/insight_exceptions.xml
index f9b50495a3..17c5828336 100644
--- a/app/src/main/res/values-pt/insight_exceptions.xml
+++ b/app/src/main/res/values-pt/insight_exceptions.xml
@@ -4,6 +4,12 @@
Ligação falhou
Ligação perdida
Emparelhamento rejeitado
+ Falha ao criar documento
Tempo expirou
Número máximo de bólus tipo já em execução
+ Sem basal temporária para cancelar
+ Sem basal temporária para alterar
+ Sem bolus para cancelar
+ A bomba já está nesse estado
+ Modo executar não autorizado
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index ef6cbff39f..c76c389920 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -54,6 +54,7 @@
Monitorizar e controlar o AndroidAPS usando o seu relógio WearOS.
Mostrar informações sobre o loop no watchface do xDrip+.
Controlar remotamente o AndroidAPS usando comandos SMS.
+ Anterior
Iniciar
Verificar
Unidades
@@ -265,12 +266,7 @@
Para dar bolus %1$.2fU responder com código %2$s
Para enviar calibração %1$.2f responder com código %2$s
Bólus falhado
- Bólus %.2fU enviado com êxito
- Vai ser enviado %.2fU
- Bólus %.2fU enviado com êxito
- A enviar %.2fU
Permitir comandos remotos via SMS
- Bólus remoto não permitido
Dedo
Sensor
Manual
@@ -338,16 +334,12 @@
Loop activado
%1$.2f limitado a %2$.2f
O valor %s está fora dos limites permitidos
- A configuração remota de basal não é permitida
O comando remoto não é permitido
- Para começar basal %1$.2fU/h responda com código %2$s
Para suspender o loop por %1$d minutos resposta com código %2$s
Basal temporária %1$.2fU/h para %2$d min iniciada com êxito
Início basal temp falhou
- Para parar a basal temporaria responda com o código %s
Basal temp cancelada
Não foi possivel cancelar a basal temp
- Comando desconhecido ou resposta errada
Assistente Rápido
Definições do Assistente Rápido
Texto do botão:
@@ -471,7 +463,6 @@
Enviar calibração %.1f para o xDrip?
xDrip+ não está instalado
Calibração enviada para o xDrip
- Calibração remota não permitida
Calibração enviada. Recepção têm de estar activada no xDrip.
O xDrip não esta a receber as calibrações
Bomba suspensa
@@ -553,6 +544,11 @@
Activar superbólus no assistente
Habilite a funcionalidade de superbolus no assistente. Não habilite até que aprenda o funcionamento. PODE CAUSAR OVERDOSE DE INSULINA SE USAR INDISCRIMINADAMENTE!
Mostrar luzes de estado no ecrã principal
+ Ativar as luzes de status para idade da cânula, idade da insulina, idade do sensor, reservatório e bateria no ecrã inicial.
+ Limite de aviso de nível de reservatório [U]
+ Limite crítico de nível de reservatório [U]
+ Limite de aviso de nível de bateria [%]
+ Limite crítico de nível de bateria [%]
IOB
COB
Firmware
@@ -1017,6 +1013,7 @@
%1$d. Objectivo
Poctech
Receber valores Glucose da app Poctech
+ Receber valores de Glicose da aplicação Tomato (dispositivo MiaoMiao)
Alto alvotempo aumenta sensibilidade
= 100]]>
Baixo alvotemp baixa sensibilidade
@@ -1062,6 +1059,7 @@
A pesquisar dispositivos…
Por favor aguarde…
Emparelhamento concluído
+ Os códigos exibidos neste dispositivo e na sua bomba correspondem?
Emparelhamento Insight
Accu-Chek Insight
%1$.2fU / %2$.2fU entregue
@@ -1071,9 +1069,13 @@
Confirmar
Silêncio
Alerta da Bomba
+ Registar alterações de local
+ Registar alterações de tubo
+ Registar mudanças de bateria
Alterações do modo de funcionamento de registo
Alertas de registo
Ativar a emulação TBR
+ Usar bolus estendidos em vez de TBRs para contornar o limite de 250%
Número de série
Lançar versão de software
Versão de software do processador de interface do utilizador
@@ -1089,17 +1091,43 @@
Parar Bomba
Modo de funcionamento
Estado
+ DDT de Bolus
+ DDT Basal
+ DDT Total
A recuperar
Não emparelhado
Última ligação
Iniciado
Parado
+ %1$d%% para %2$d / %3$d min
Bólus estendido
Bólus Multi-Onda
+ %1$.2f / %2$.2f U por %3$d min
+ Desativar notificação do fim da basal temporária\n(configuração da bomba)
+ Actualizar
+ Integração de bomba para bombas Accu-Chek Insight
+ Não inserido
+ Última conexão:%1$d minutos atrás
+ Basal temporária: %1$d%% para %2$d / %3$d minutos
+ Estendido: %1$.2f / %2$.2f U por %3$d min
+ Multionda: %1$.2f / %2$.2f U por %3$d min
+ Reser:%1$.2fU
+ Bat.: %1$d%%
+ Duração máxima da recuperação [s]
+ Duração mínima da recuperação [s]
+ Duração da recuperação
== ∑ %1$s U
U/h
g/U
/U
+ Registar mudança de sensor para NS
+ Criar evento \"Mudança de Sensor\" automaticamente no NS aquando do início do sensor
+ Tomato (MiaoMiao)
+ Tomato
+ restrição de armazenamento interno
+ Liberte pelo menos %1$d MB do armazenamento interno! Loop desativado!
+ Não configurado
+ Troca de perfil criada
- %1$d dia
- %1$d dias
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 792d7cb4eb..bca606bc90 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -265,12 +265,7 @@
Pentru a livra un bolus de %1$.2fU răspundeți cu codul %2$s
Pentru a trimite calibrarea cu %1$.2f răspundeți cu codul %2$s
Bolusare eșuată
- Bolusul de %.2fU livrat cu succes
- Se va livra un bolus de %.2fU
- Bolusul de %.2fU a fost livrat cu succes
- Se livrează %.2fU
Permite comenzi de la distanță, prin SMS
- Bolusarea prin comenzi de la distanță nu este permisă
Deget
Senzor
Manual
@@ -338,16 +333,12 @@
Bucla este activată
%1$.2f este limitată la %2$.2f
Valoarea %s este mai mare decât limita fizică
- Setarea de la distanță a bazalei nu este permisă
Comanda de la distanță nu este permisă
- Pentru pornirea bazalei de %1$.2fU/h trimiteți codul %2$s
Pentru suspendarea buclei pentru %1$d minute trimiteți codul %2$s
Bazala temporară %1$.2fU/h pentru %2$d minute a fost trimisă cu succes
Trimiterea bazalei temporare a eșuat
- Pentru oprirea bazalei temporare trimiteți codul %s
Bazala temporară a fost anulată
Renunțarea la bazala temporară a eșuat
- Comandă necunoscută sau răspuns greșit
AsistentRapid
Setări AsistentRapid
Text buton:
@@ -471,7 +462,6 @@
Trimite calibrarea %.1f către xDrip?
xDrip+ nu este instalat.
Calibrare trimisă către xDrip
- Calibrarea la distanță nu este permisă
Calibrare trimisă. Recepționarea trebuie să fie activată și în xDrip.
xDrip nu recepționează calibrări
Livrare de insulină suspendată
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 3c717cd826..a8311ca6a7 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -9,10 +9,10 @@
обнулить базы
Вы действительно хотите обнулить базы данных?
Выход
- Для величин >200% пользуйтесь удлиненным болюсом
+ Для величин >200% пользуйтесь пролонгированным болюсом
устройство блутус danaR
Всегда пользуйтесь абсолютными величинами для базала
- Пожалуйста перезагрузите телефон или перезапустите AndroidAPS из системных настроек \nиначе AndroidAPS не будет вести лог (важно для отслеживания и проверки алгоритмов)!
+ Пожалуйста перезагрузите телефон или перезапустите AndroidAPS из системных настроек \иначе AndroidAPS не будет вести лог (важно для отслеживания и проверки алгоритмов)!
Кнопки быстрого доступа к некоторым распространенным настройкам
Введите дополнительные записи логов.
Применяется для настройки активных плагинов
@@ -54,6 +54,7 @@
Мониторить и контролировать AndroidAPS при помощи часов WearOS.
Показать информацию о работе алгоритма ИПЖ на экране смарт-часов xDrip+.
Дистанционное управление AndroidAPS при помощи команд SMS.
+ Назад
старт
Верификация
единицы
@@ -265,12 +266,11 @@
Чтобы подать болюс %1$.2fU ответьте кодом %2$s
чтобы отправить калибровку %1$.2f ответьте кодом %2$s
Подача болюса не состоялась
- Болюс %.2fU подан успешно
- Начинается подача болюса %.2fU
- Болюс %.2fU дан успешно
- Подается болюс %.2fU
+ Болюс %1$.2fед. подан успешно
+ Начинается подача болюса %1$.2fед.
+ Болюс %1$.2fед. подан успешно
+ Подается болюс %1$.2fед.
разрешить команды через смс
- Команда на удаленный болюс не разрешена
палец
сенсор
вручную
@@ -338,16 +338,25 @@
зцикл работает
%1$.2f ограничено до %2$.2f
величина %s недопустима
- удаленная настройка базала не разрешена
удаленная команда не разрешена
- чтобы начать базал %1$.2fU/h ответьте кодом %2$s
+ Удаленный болюс недоступен, повторите попытку позже.
+ Чтобы подать базал %1$.2fед./ч в течение %2$d мин. ответьте кодом %3$s
+ Для переключения профиля на %1$s %2$d%% ответьте кодом %3$s
+ Для начала подачи пролонгированного болюса %1$.2fед. за %2$d мин. ответьте кодом %3$s
+ Для начала подачи базала %1$d%% на %2$d мин. ответьте кодом %3$s
для приостановки цикла на %1$d мин ответьте кодом %2$s
врем базал %1$.2fU/h на %2$d мин начат успешно
+ Пролонгированный болюс %1$.2fед. на %2$d мин. начат успешно
+ Врем. базал %1$d%% на %2$d мин. начат успешно
неуспех старта врем базала
- чтобы прекратить врем базал ответьте кодом %s
+ Не удалось начать подачу пролонгированного болюса
+ Для прекращения подачи врем. базала ответьте кодом %1$s
+ Для прекращения подачи пролонгированного болюса ответьте кодом %1$s
врем базал отменен
+ Пролонгированный болюс отменен
отмена врем базала не состоялась
- неизвестная команда или неверный ответ
+ Сбой отмены пролонгированного болюса
+ Неизвестная команда или неверный ответ
БыстрыйБолюс
БыстрыйБолюс настройки
текст на кнопке
@@ -404,7 +413,7 @@
%1$d мин. назад
%1$d мин. назад
локальный профиль
- Помощник болюса OpenAPS MA
+ Помощник болюса OpenAPS AMA
краткосрочная средняя дельта
Долгосрочная средняя дельта
Массив %1$d элементов. \nActual актуальная величина:
@@ -413,7 +422,7 @@
Пользоваться функцией Autosens
обновить данные из NS
Удалить назначения из будущего
- Близкий прием пищи
+ Ожидаемый прием пищи
Гипо
Нагрузка
удалить запись
@@ -471,7 +480,6 @@
отправить калибровку %.1f на xdrip?
xdrip+ не установлен
калибровка передается на xdrip
- удаленная калибровка не разрешена
калибровка отправлена. в xdrip должен быть активирован прием
xdrip не получает калибровок
Работа помпы остановлена
@@ -640,7 +648,7 @@
Включить непредвиденный прием пищи UAM
Включить супер микро болюс SMB
Для ускорения действия используйте супер микро болюсы SMB вместо временного базала
- Поиск непредвиденного приема пищи
+ Поиск незапланированного приема пищи
Время пика действующего инс IOB
время пика (в мин.)
Свободный от пиков Oref
@@ -858,7 +866,7 @@
Разрешить отправлять сообщения о неполадках и данные об использовании опций разработчикам при помощи сервиса fabric.io.
Пожалуйста, обновите приложение Dexcom до поддерживаемой версии
Включить временную цель TT Нагрузка
- Включить временную цель TT Скорый прием пищи
+ Включить временную цель TT Ожидаемый прием пищи
Временная цель (TT)
Не подавать болюс, только внести запись
Категория
@@ -1142,5 +1150,10 @@ Context | Edit Context
Томато (MiaoMiao)
Томато
Переход на летнее/зимнее время через 24 часа или менее
- Переход на летнее/зимнее время менее чем через 3 часа - замкнутый цикл отключен
+ ограничение по объему карты памяти
+ Освободите по крайней мере %1$d MB из внутренней памяти! Цикл остановлен!
+ Неверный формат
+ Неверный код. Команда отменена.
+ Не сконфигурировано
+ Переключатель профиля создан
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 7b8f5e050b..679f07518f 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -265,12 +265,7 @@
Pre podanie bolusu %1$.2fU odpovedz SMS kódom %2$s
Pre odoslanie kalibrácie %1$.2f odpovedz SMS kódom %2$s
Chyba pri aplikovaní bolusu
- Bolus %.2fU aplikovaný úspešne
- Spúšťam podávanie %.2fU
- Bolus %.2fU podaný úspešne
- Podané %.2fU
Povoliť príkazy na diaľku cez SMS
- Diaľkovo ovládaný bolus nie je povolený
Prst
Senzor
Iný
@@ -338,16 +333,12 @@
Uzavretý okruh je aktivovaný
%1$.2f obmedzené na %2$.2f
Hodnota %s je mimo prednastavený rozsah
- Ovládanie bazálu na diaľku nie je povolené
Príkazy na diaľku nie sú povolené
- Pre spustenie bazálu %1$.2fU/h odpovedaj SMS s kódom %2$s
Pre pozastavenie uzavretého okruhu na %1$d minút odpovedaj SMS s kódom %2$s
Dočasný bazál %1$.2fU/h spustený na %2$d minút
Spustenie dočasného bazálu zlyhalo
- Pre ukončenie dočasného bazálu odpovedaj SMS s kódom %s
Dočasný bazál zrušený
Zrušenie dočasného bazálu zlyhalo
- Neznámý príkaz alebo chybná odpoveď
Rýchly bolus
Nastavenie rýchleho bolusu
Text na tlačidle:
@@ -471,7 +462,6 @@
Poslať kalibráciu %.1f do xDripu?
xDrip+ nie je nainštalovaný
Kalibrácia odoslaná do xDripu
- Kalibrácia na diaľku nie je povolená
Kalibrácia odoslaná. Príjem kalibrácií musí byť v xDripe povolený.
xDrip neprijíma kalibrácie
Pumpa pozastavená
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 641dccd1c2..8c8a7ead52 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -266,12 +266,7 @@ Eversense-appen.
För att ge bolus %1$.2f enheter, svara med kod %2$s
För att skicka kalibrering %1$.2f, svara med kod %2$s
Bolus misslyckades
- Bolus %.2f enheter korrekt levererad
- Kommer att leverera %.2f enheter
- Bolus %.2f enheter levererad
- Levererar %.2f enheter
Tillåt fjärrstyrning via SMS
- Fjärrbolus är inte tillåtet
Finger
Sensor
Manuell
@@ -339,16 +334,12 @@ Eversense-appen.
Loop är aktiverad
%1$.2f begränsat till %2$.2f
Värdet %s är utanför hård begränsning
- Fjärrkommandon för att ändra basaler tillåts ej
Otillåtet fjärrkommando
- För att starta temp basal %1$.2f enheter/tim, svara med kod %2$s
För att pausa loop i %1$d minuter, svara med kod %2$s
Temp basal %1$.2f enheter/tim i %2$d min startad
Fel vid start av temp basal
- För att stoppa temp basal, svara med kod %s
Temp basal avbruten
Misslyckades med att avbryta temp basal
- Okänt kommando eller fel svar
Kalkylator
Kalkylatorinställningar
Knapptext:
@@ -472,7 +463,6 @@ Eversense-appen.
Skicka kalibrering %.1f till xDrip?
xDrip+ inte installerat
Kalibrering skickad till xDrip
- Kalibrering från andra källor inte tillåtna
Kalibrering skickad. Observera att xDrip måste vara inställd att ta emot kalibreringar.
xDrip tar inte emot kalibreringar
Pump pausad
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index f6e0e395fe..e75625a663 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -263,12 +263,7 @@
Bolus %1$.2fU gönderilecek, kod ile cevap ver %2$s
Kalibrasyon %1$.2f gönderilecek, kod ile cevap ver %2$s
Bolus başarısız oldu
- Bolus %.2fU başarıyla gönderildi
- %.2fU Gönderilecek
- Bolus %.2fU başarıyla gönderildi
- %.2fU Gönderiliyor
SMS ile uzaktan komutlara izin ver
- Uzaktan bolus\'a izin verilmiyor
Parmak
Sensör
Manuel
@@ -336,16 +331,12 @@
Döngü etkin
%1$.2f dan %2$.2f olarak sınırlı
Değer %s sabit sınırları dışında olduğunu
- Uzak bazal ayarına izin verilmez
Uzaktan komuta izin verilmez
- Bazal\'ı %1$.2fÜ/s başlatmak için kodu %2$s ile yanıtlayın
%1$d dakika için Döngü\'yü askıya almak için %2$s kodunu yanıtla
Geçici bazal %1$.2fÜ/s %2$d dakika için başarıyla başlatıldı
Temp bazal başlatma başarısız oldu
- Geçici bazal oranını iptal etmek için kodla %s yanıtla
Geçici bazal iptal
Geçici bazal iptali hata verdi
- Bilinmeyen komut veya yanlış cevap
Kurulum Sihirbazı
Kurulum Sihirbazı Ayarları
Düğme Metni:
@@ -469,7 +460,6 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
Kalibrasyon %.1f xDrip\'e gönderilsin mi?
xDrip+ uygulaması yüklenmemiş
Kalibrasyon xDrip+ a gönderildi
- Uzaktan kalibrasyona izin verilmiyor
Kalibrasyon gönderildi. Alma xDrip+\'ta etkinleştirilmelidir.
xDrip+ kalibrasyonları almıyor
Pompa durduldu
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 97e086deb4..a230e24174 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -265,12 +265,7 @@
要输注大剂量胰岛素%1$.2fU 回复如下代码 %2$s
要发送校准值 %1$.2f 回复如下代码 %2$s
大剂量输注失败
- 成功输注大剂量%.2fU
- 将要输注 %.2fU
- 成功输注大剂量%.2fU
- 正在输注 %.2fU
通过SMS短信允许远程命令
- 远程大剂量没有被允许
手指
传感器
手动
@@ -338,16 +333,12 @@
闭环被启用
%1$.2f 超过 %2$.2f的限制
值 %s 超过了硬限制
- 远程基础率设置没有被允许
远程命令没有被允许
- 要开始基础率 %1$.2fU/h 请回复如下代码 %2$s
要暂停闭环 %1$d 分钟请回复如下代码 %2$s
临时基础率 %1$.2fU/h 持续 %2$d 分钟启用成功了
开始临时基础率失败了
- 要停止临时基础率，请回复如下代码 %s
临时基础率取消了
取消临时基础率失败
- 未知的命令或错误的回复
快速向导
快速向导设置
按钮文本:
@@ -471,7 +462,6 @@
确认将校准值 %.1f 发送到 xDrip 吗？
没有安装xDrip+
校准发送到 xDrip
- 远程校准没有被允许
校准值发送了，必须在xDrip开启允许通过其他app使用它的校准功能
xDrip 没有收到校准
泵暂停了
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e610b4af2c..2a7021f6b8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -55,6 +55,7 @@
Show information about your loop on your xDrip+ watchface.
Remote control AndroidAPS using SMS commands.
+ Back
Start
Verify
Units
@@ -293,12 +294,11 @@
To deliver bolus %1$.2fU reply with code %2$s
To send calibration %1$.2f reply with code %2$s
Bolus failed
- Bolus %.2fU delivered successfully
- Going to deliver %.2fU
- Bolus %.2fU delivered successfully
- Delivering %.2fU
+ Bolus %1$.2fU delivered successfully
+ Going to deliver %1$.2fU
+ Bolus %1$.2fU delivered successfully
+ Delivering %1$.2fU
Allow remote commands via SMS
- Remote bolus not allowed
Finger
Sensor
Manual
@@ -366,16 +366,25 @@
Loop is enabled
%1$.2f limited to %2$.2f
Value %s is out of hard limits
- Remote basal setting is not allowed
Remote command is not allowed
- To start basal %1$.2fU/h reply with code %2$s
+ Remote bolus not available. Try again later.
+ To start basal %1$.2fU/h for %2$d min reply with code %3$s
+ To switch profile to %1$s %2$d%% reply with code %3$s
+ To start extended bolus %1$.2fU for %2$d min reply with code %3$s
+ To start basal %1$d%% for %2$d min reply with code %3$s
To suspend loop for %1$d minutes reply with code %2$s
Temp basal %1$.2fU/h for %2$d min started successfully
+ Extended bolus %1$.2fU for %2$d min started successfully
+ Temp basal %1$d%% for %2$d min started successfully
Temp basal start failed
- To stop temp basal reply with code %s
+ Extended bolus start failed
+ To stop temp basal reply with code %1$s
+ To stop extended bolus reply with code %1$s
Temp basal canceled
+ Extended bolus canceled
Canceling temp basal failed
- Uknown command or wrong reply
+ Canceling extended bolus failed
+ Unknown command or wrong reply
QuickWizard
QuickWizard settings
@@ -508,7 +517,6 @@
Send calibration %.1f to xDrip?
xDrip+ not installed
Calibration sent to xDrip
- Remote calibration not allowed
Calibration sent. Receiving must be enabled in xDrip.
xDrip is not receiving calibrations
Pump suspended
@@ -1311,8 +1319,13 @@
smbmaxminutes
Dayligh Saving time
Dayligh Saving time change in 24h or less
- Dayligh Saving time change in less than 3 hours - Closed loop diabled
-
+ Dayligh Saving time change less than 3 hours ago - Closed loop diabled
+ internal storage constraint
+ Free at least %1$d MB from internal storage! Loop disabled!
+ Wrong format
+ Wrong code. Command cancelled.
+ Not configured
+ Profile switch created
- %1$d day
- %1$d days
diff --git a/app/src/main/res/values/wear.xml b/app/src/main/res/values/wear.xml
new file mode 100644
index 0000000000..41df8ef193
--- /dev/null
+++ b/app/src/main/res/values/wear.xml
@@ -0,0 +1,18 @@
+
+
+
+
+ - phone_app_sync_bgs
+
+
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_insight_local.xml b/app/src/main/res/xml/pref_insight_local.xml
index 19eb0e4624..4cb9fa6d18 100644
--- a/app/src/main/res/xml/pref_insight_local.xml
+++ b/app/src/main/res/xml/pref_insight_local.xml
@@ -1,57 +1,60 @@
-
-
-
+
-
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
diff --git a/app/src/test/java/info/AAPSMocker.java b/app/src/test/java/info/AAPSMocker.java
index f1ec982f9b..7d4884bb96 100644
--- a/app/src/test/java/info/AAPSMocker.java
+++ b/app/src/test/java/info/AAPSMocker.java
@@ -2,6 +2,7 @@ package info;
import android.content.Context;
import android.content.Intent;
+import android.content.pm.PackageManager;
import android.content.res.Resources;
import com.squareup.otto.Bus;
@@ -9,6 +10,7 @@ import com.squareup.otto.Bus;
import org.json.JSONException;
import org.json.JSONObject;
import org.junit.Assert;
+import org.mockito.stubbing.Answer;
import org.powermock.api.mockito.PowerMockito;
import java.util.Locale;
@@ -17,6 +19,7 @@ import info.nightscout.androidaps.Constants;
import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.R;
import info.nightscout.androidaps.data.ConstraintChecker;
+import info.nightscout.androidaps.data.IobTotal;
import info.nightscout.androidaps.data.Profile;
import info.nightscout.androidaps.data.ProfileStore;
import info.nightscout.androidaps.db.DatabaseHelper;
@@ -24,11 +27,14 @@ import info.nightscout.androidaps.logging.L;
import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.CobInfo;
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin;
+import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin;
import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin;
import info.nightscout.androidaps.plugins.treatments.TreatmentService;
import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin;
-import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin;
+import info.nightscout.androidaps.queue.Callback;
import info.nightscout.androidaps.queue.CommandQueue;
import info.nightscout.androidaps.utils.SP;
@@ -36,6 +42,7 @@ import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -51,6 +58,8 @@ public class AAPSMocker {
public static Intent intentSent = null;
+ public static CommandQueue queue;
+
public static void mockStrings() {
Locale.setDefault(new Locale("en", "US"));
@@ -104,6 +113,43 @@ public class AAPSMocker {
when(MainApp.gs(R.string.profile_per_unit)).thenReturn("/U");
when(MainApp.gs(R.string.profile_carbs_per_unit)).thenReturn("g/U");
when(MainApp.gs(R.string.profile_ins_units_per_hout)).thenReturn("U/h");
+ when(MainApp.gs(R.string.sms_wrongcode)).thenReturn("Wrong code. Command cancelled.");
+ when(MainApp.gs(R.string.sms_iob)).thenReturn("IOB:");
+ when(MainApp.gs(R.string.sms_lastbg)).thenReturn("Last BG:");
+ when(MainApp.gs(R.string.sms_minago)).thenReturn("%1$dmin ago");
+ when(MainApp.gs(R.string.smscommunicator_remotecommandnotallowed)).thenReturn("Remote command is not allowed");
+ when(MainApp.gs(R.string.loopsuspendedfor)).thenReturn("Suspended (%1$d m)");
+ when(MainApp.gs(R.string.smscommunicator_loopisdisabled)).thenReturn("Loop is disabled");
+ when(MainApp.gs(R.string.smscommunicator_loopisenabled)).thenReturn("Loop is enabled");
+ when(MainApp.gs(R.string.wrongformat)).thenReturn("Wrong format");
+ when(MainApp.gs(R.string.smscommunicator_loophasbeendisabled)).thenReturn("Loop has been disabled");
+ when(MainApp.gs(R.string.smscommunicator_loophasbeenenabled)).thenReturn("Loop has been enabled");
+ when(MainApp.gs(R.string.smscommunicator_tempbasalcanceled)).thenReturn("Temp basal canceled");
+ when(MainApp.gs(R.string.smscommunicator_loopresumed)).thenReturn("Loop resumed");
+ when(MainApp.gs(R.string.smscommunicator_wrongduration)).thenReturn("Wrong duration");
+ when(MainApp.gs(R.string.smscommunicator_suspendreplywithcode)).thenReturn("To suspend loop for %1$d minutes reply with code %2$s");
+ when(MainApp.gs(R.string.smscommunicator_loopsuspended)).thenReturn("Loop suspended");
+ when(MainApp.gs(R.string.smscommunicator_unknowncommand)).thenReturn("Unknown command or wrong reply");
+ when(MainApp.gs(R.string.notconfigured)).thenReturn("Not configured");
+ when(MainApp.gs(R.string.smscommunicator_profilereplywithcode)).thenReturn("To switch profile to %1$s %2$d%% reply with code %3$s");
+ when(MainApp.gs(R.string.profileswitchcreated)).thenReturn("Profile switch created");
+ when(MainApp.gs(R.string.smscommunicator_basalstopreplywithcode)).thenReturn("To stop temp basal reply with code %1$s");
+ when(MainApp.gs(R.string.smscommunicator_basalpctreplywithcode)).thenReturn("To start basal %1$d%% for %2$d min reply with code %3$s");
+ when(MainApp.gs(R.string.smscommunicator_tempbasalset_percent)).thenReturn("Temp basal %1$d%% for %2$d min started successfully");
+ when(MainApp.gs(R.string.smscommunicator_basalreplywithcode)).thenReturn("To start basal %1$.2fU/h for %2$d min reply with code %3$s");
+ when(MainApp.gs(R.string.smscommunicator_tempbasalset)).thenReturn("Temp basal %1$.2fU/h for %2$d min started successfully");
+ when(MainApp.gs(R.string.smscommunicator_extendedstopreplywithcode)).thenReturn("To stop extended bolus reply with code %1$s");
+ when(MainApp.gs(R.string.smscommunicator_extendedcanceled)).thenReturn("Extended bolus canceled");
+ when(MainApp.gs(R.string.smscommunicator_extendedreplywithcode)).thenReturn("To start extended bolus %1$.2fU for %2$d min reply with code %3$s");
+ when(MainApp.gs(R.string.smscommunicator_extendedset)).thenReturn("Extended bolus %1$.2fU for %2$d min started successfully");
+ when(MainApp.gs(R.string.smscommunicator_bolusreplywithcode)).thenReturn("To deliver bolus %1$.2fU reply with code %2$s");
+ when(MainApp.gs(R.string.smscommunicator_bolusdelivered)).thenReturn("Bolus %1$.2fU delivered successfully");
+ when(MainApp.gs(R.string.smscommunicator_remotebolusnotallowed)).thenReturn("Remote bolus not available. Try again later.");
+ when(MainApp.gs(R.string.smscommunicator_calibrationreplywithcode)).thenReturn("To send calibration %1$.2f reply with code %2$s");
+ when(MainApp.gs(R.string.smscommunicator_calibrationsent)).thenReturn("Calibration sent. Receiving must be enabled in xDrip.");
+ when(MainApp.gs(R.string.pumpsuspended)).thenReturn("Pump suspended");
+ when(MainApp.gs(R.string.cob)).thenReturn("COB");
+ when(MainApp.gs(R.string.value_unavailable_short)).thenReturn("n/a");
}
public static MainApp mockMainApp() {
@@ -143,7 +189,7 @@ public class AAPSMocker {
when(L.isEnabled(any())).thenReturn(true);
}
- public static void mockNSUpload(){
+ public static void mockNSUpload() {
PowerMockito.mockStatic(NSUpload.class);
}
@@ -152,6 +198,8 @@ public class AAPSMocker {
Resources mResources = mock(Resources.class);
when(MainApp.instance().getApplicationContext()).thenReturn(mockedContext);
when(mockedContext.getResources()).thenReturn(mResources);
+ PackageManager packageManager = mock(PackageManager.class);
+ when(mockedContext.getPackageManager()).thenReturn(packageManager);
}
public static DatabaseHelper mockDatabaseHelper() {
@@ -161,7 +209,7 @@ public class AAPSMocker {
}
public static void mockCommandQueue() {
- CommandQueue queue = mock(CommandQueue.class);
+ queue = mock(CommandQueue.class);
when(ConfigBuilderPlugin.getPlugin().getCommandQueue()).thenReturn(queue);
}
@@ -169,12 +217,21 @@ public class AAPSMocker {
PowerMockito.mockStatic(TreatmentsPlugin.class);
TreatmentsPlugin treatmentsPlugin = PowerMockito.mock(TreatmentsPlugin.class);
when(TreatmentsPlugin.getPlugin()).thenReturn(treatmentsPlugin);
+ when(treatmentsPlugin.getLastCalculationTreatments()).thenReturn(new IobTotal(0));
+ when(treatmentsPlugin.getLastCalculationTempBasals()).thenReturn(new IobTotal(0));
+
+ TreatmentService treatmentService = PowerMockito.mock(TreatmentService.class);
+ when(treatmentsPlugin.getService()).thenReturn(treatmentService);
return treatmentsPlugin;
}
- public static void mockTreatmentService() throws Exception {
+ public static void mockTreatmentService() {
TreatmentService treatmentService = PowerMockito.mock(TreatmentService.class);
- PowerMockito.whenNew(TreatmentService.class).withNoArguments().thenReturn(treatmentService);
+ try {
+ PowerMockito.whenNew(TreatmentService.class).withNoArguments().thenReturn(treatmentService);
+ } catch (Exception e) {
+ }
+
}
public static DanaRPlugin mockDanaRPlugin() {
@@ -221,6 +278,14 @@ public class AAPSMocker {
PowerMockito.when(ProfileFunctions.getInstance()).thenReturn(profileFunctions);
profile = getValidProfile();
PowerMockito.when(ProfileFunctions.getInstance().getProfile()).thenReturn(profile);
+ PowerMockito.when(ProfileFunctions.getInstance().getProfileUnits()).thenReturn(Constants.MGDL);
+ PowerMockito.when(ProfileFunctions.getInstance().getProfileName()).thenReturn(TESTPROFILENAME);
+ }
+
+ public static void mockIobCobCalculatorPlugin() {
+ PowerMockito.mockStatic(IobCobCalculatorPlugin.class);
+ IobCobCalculatorPlugin iobCobCalculatorPlugin = PowerMockito.mock(IobCobCalculatorPlugin.class);
+ PowerMockito.when(IobCobCalculatorPlugin.getPlugin()).thenReturn(iobCobCalculatorPlugin);
}
private static MockedBus bus = new MockedBus();
diff --git a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintTest.java b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintTest.java
index 4b2d209661..3dbe770bfc 100644
--- a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintTest.java
@@ -2,6 +2,7 @@ package info.nightscout.androidaps.interfaces;
import junit.framework.Assert;
+import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.powermock.core.classloader.annotations.PrepareForTest;
@@ -9,6 +10,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
import info.AAPSMocker;
import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.logging.L;
import info.nightscout.androidaps.utils.SP;
/**
@@ -16,15 +18,11 @@ import info.nightscout.androidaps.utils.SP;
*/
@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class})
+@PrepareForTest({MainApp.class, SP.class, L.class})
public class ConstraintTest {
@Test
public void doTests() {
- AAPSMocker.mockMainApp();
- AAPSMocker.mockApplicationContext();
- AAPSMocker.mockSP();
-
Constraint b = new Constraint<>(true);
Assert.assertEquals(Boolean.TRUE, b.value());
Assert.assertEquals("", b.getReasons());
@@ -56,5 +54,18 @@ public class ConstraintTest {
Assert.assertEquals("ConstraintTest: Set 5d\nConstraintTest: Set 6d\nConstraintTest: Set 4d", d.getReasons());
Assert.assertEquals("ConstraintTest: Set 4d", d.getMostLimitedReasons());
Assert.assertEquals(10d, d.originalValue());
+ d.setIfDifferent(7d, "Set 7d", this);
+ Assert.assertEquals(7d, d.value());
+ Assert.assertEquals("ConstraintTest: Set 5d\nConstraintTest: Set 6d\nConstraintTest: Set 4d\nConstraintTest: Set 7d", d.getReasons());
+ Assert.assertEquals("ConstraintTest: Set 4d\nConstraintTest: Set 7d", d.getMostLimitedReasons());
+ Assert.assertEquals(10d, d.originalValue());
+ }
+
+ @Before
+ public void prepareMock() {
+ AAPSMocker.mockMainApp();
+ AAPSMocker.mockApplicationContext();
+ AAPSMocker.mockSP();
+ AAPSMocker.mockL();
}
}
diff --git a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.java b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.java
index 113cff31f8..ee03ef73d7 100644
--- a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.java
@@ -54,6 +54,7 @@ public class ConstraintsCheckerTest {
DanaRPlugin danaRPlugin;
DanaRSPlugin danaRSPlugin;
LocalInsightPlugin insightPlugin;
+ OpenAPSSMBPlugin openAPSSMBPlugin;
boolean notificationSent = false;
@@ -119,6 +120,14 @@ public class ConstraintsCheckerTest {
Assert.assertEquals(Boolean.FALSE, c.value());
}
+ @Test
+ public void isSuperBolusEnabledTest() throws Exception {
+ OpenAPSSMBPlugin.getPlugin().setPluginEnabled(PluginType.APS, true);
+
+ Constraint c = constraintChecker.isSuperBolusEnabled();
+ Assert.assertEquals(Boolean.FALSE, c.value()); // SMB should limit
+ }
+
@Test
public void isSMBModeEnabledTest() throws Exception {
objectivesPlugin.objectives.get(7).setStartedOn(null);
@@ -288,6 +297,7 @@ public class ConstraintsCheckerTest {
danaRPlugin = DanaRPlugin.getPlugin();
danaRSPlugin = DanaRSPlugin.getPlugin();
insightPlugin = LocalInsightPlugin.getPlugin();
+ openAPSSMBPlugin = OpenAPSSMBPlugin.getPlugin();
ArrayList constraintsPluginsList = new ArrayList<>();
constraintsPluginsList.add(safetyPlugin);
constraintsPluginsList.add(objectivesPlugin);
@@ -295,6 +305,7 @@ public class ConstraintsCheckerTest {
constraintsPluginsList.add(danaRPlugin);
constraintsPluginsList.add(danaRSPlugin);
constraintsPluginsList.add(insightPlugin);
+ constraintsPluginsList.add(openAPSSMBPlugin);
when(mainApp.getSpecificPluginsListByInterface(ConstraintsInterface.class)).thenReturn(constraintsPluginsList);
}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/dstHelper/DstHelperPluginTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/dstHelper/DstHelperPluginTest.java
index 2f5bf9bffe..303d63d9c9 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/dstHelper/DstHelperPluginTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/dstHelper/DstHelperPluginTest.java
@@ -9,7 +9,11 @@ import org.junit.runner.RunWith;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
import java.util.Calendar;
+import java.util.Date;
+import java.util.Locale;
import java.util.TimeZone;
import info.AAPSMocker;
@@ -27,39 +31,46 @@ public class DstHelperPluginTest {
public void runTest() throws Exception {
AAPSMocker.mockMainApp();
AAPSMocker.mockApplicationContext();
- // test different time zones
- //Starting with Europe/Sofia
- Calendar c = Calendar.getInstance(TimeZone.getTimeZone("Europe/Sofia"));
- c.setTimeInMillis(DateUtil.fromISODateString("2018-10-28T02:00:00Z").getTime());
- int minutesLeftToChange = plugin.dstTest(c);
- Assert.assertEquals(60, minutesLeftToChange);
- c.setTimeInMillis(DateUtil.fromISODateString("2018-03-25T02:00:00Z").getTime());
- minutesLeftToChange = plugin.dstTest(c);
- Assert.assertEquals(60, minutesLeftToChange);
- // try something with half hour somewhere in Australia
- c = Calendar.getInstance(TimeZone.getTimeZone("Australia/Lord_Howe"));
- c.setTimeInMillis(DateUtil.fromISODateString("2018-04-01T00:00:00Z").getTime());
- minutesLeftToChange = plugin.dstTest(c);
- // try something with half hour somewhere in Australia
- c = Calendar.getInstance(TimeZone.getTimeZone("Australia/Lord_Howe"));
- c.setTimeInMillis(DateUtil.fromISODateString("2018-04-01T00:00:00Z").getTime());
- minutesLeftToChange = plugin.dstTest(c);
- Assert.assertEquals(90, minutesLeftToChange);
- c = Calendar.getInstance(TimeZone.getTimeZone("Australia/Lord_Howe"));
- // and back
- c.setTimeInMillis(DateUtil.fromISODateString("2018-10-07T00:00:00Z").getTime());
- minutesLeftToChange = plugin.dstTest(c);
- Assert.assertEquals(120, minutesLeftToChange);
- c.setTimeInMillis(DateUtil.fromISODateString("2018-10-08T00:00:00Z").getTime());
- minutesLeftToChange = plugin.dstTest(c);
- Assert.assertEquals(0, minutesLeftToChange);
+ TimeZone tz = TimeZone.getTimeZone("Europe/Rome");
+ TimeZone.setDefault(tz);
+ Calendar cal = Calendar.getInstance(tz, Locale.ITALIAN);
+ DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.ITALIAN);
+ Date dateBeforeDST = df.parse("2018-03-25 01:55");
+ cal.setTime(dateBeforeDST);
+ Assert.assertEquals(false, plugin.wasDST(cal));
+ Assert.assertEquals(true, plugin.willBeDST(cal));
+
+
+ TimeZone.setDefault(tz);
+ cal = Calendar.getInstance(tz, Locale.ITALIAN);
+ dateBeforeDST = df.parse("2018-03-25 03:05");
+ cal.setTime(dateBeforeDST);
+ Assert.assertEquals(true, plugin.wasDST(cal));
+ Assert.assertEquals(false, plugin.willBeDST(cal));
+
+
+ TimeZone.setDefault(tz);
+ cal = Calendar.getInstance(tz, Locale.ITALIAN);
+ dateBeforeDST = df.parse("2018-03-25 02:05"); //Cannot happen!!!
+ cal.setTime(dateBeforeDST);
+ Assert.assertEquals(true, plugin.wasDST(cal));
+ Assert.assertEquals(false, plugin.willBeDST(cal));
+
+ TimeZone.setDefault(tz);
+ cal = Calendar.getInstance(tz, Locale.ITALIAN);
+ dateBeforeDST = df.parse("2018-03-25 05:55"); //Cannot happen!!!
+ cal.setTime(dateBeforeDST);
+ Assert.assertEquals(true, plugin.wasDST(cal));
+ Assert.assertEquals(false, plugin.willBeDST(cal));
+
+ TimeZone.setDefault(tz);
+ cal = Calendar.getInstance(tz, Locale.ITALIAN);
+ dateBeforeDST = df.parse("2018-03-25 06:05"); //Cannot happen!!!
+ cal.setTime(dateBeforeDST);
+ Assert.assertEquals(false, plugin.wasDST(cal));
+ Assert.assertEquals(false, plugin.willBeDST(cal));
- // DST event was 30 mins
- c.setTimeInMillis(DateUtil.fromISODateString("2018-04-01T02:00:00Z").getTime());
- minutesLeftToChange = plugin.dstTest(c);
-// Assert.assertEquals(630, plugin.zoneOffsetInMinutes(c));
- Assert.assertEquals(0, minutesLeftToChange);
}
}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/storage/StorageConstraintPluginTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/storage/StorageConstraintPluginTest.java
new file mode 100644
index 0000000000..34c064a214
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/storage/StorageConstraintPluginTest.java
@@ -0,0 +1,80 @@
+package info.nightscout.androidaps.plugins.constraints.storage;
+import android.os.Environment;
+import android.os.StatFs;
+
+import junit.framework.Assert;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import java.io.File;
+
+import info.AAPSMocker;
+import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.interfaces.Constraint;
+
+import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.mock;
+import static org.powermock.api.mockito.PowerMockito.whenNew;
+import static org.mockito.ArgumentMatchers.any;
+
+/**
+ * Created by Rumen on 06.03.2019.
+ */
+
+@RunWith(PowerMockRunner.class)
+@PrepareForTest({MainApp.class, StorageConstraintPlugin.class, StatFs.class, Environment.class})
+public class StorageConstraintPluginTest extends StorageConstraintPlugin{
+
+ StorageConstraintPlugin storageConstraintPlugin;
+ private File mockedFile;
+ private static final String path = "/data";
+ private StatFs mockedStatFs;
+
+ @Test
+ public void isLoopInvocationAllowedTest(){
+ PowerMockito.mockStatic(StorageConstraintPlugin.class);
+ // Set free space under 200(Mb) to disable loop
+ when(StorageConstraintPlugin.getAvailableInternalMemorySize()).thenReturn(150L);
+ Constraint c = new Constraint<>(true);
+ c = storageConstraintPlugin.isClosedLoopAllowed(c);
+ Assert.assertEquals(Boolean.FALSE, c.value());
+ // Set free space over 200(Mb) to enable loop
+ when(StorageConstraintPlugin.getAvailableInternalMemorySize()).thenReturn(300L);
+ Constraint c2 = new Constraint<>(true);
+ c2 = storageConstraintPlugin.isClosedLoopAllowed(c2);
+ Assert.assertEquals(Boolean.TRUE, c2.value());
+ }
+
+ @Test
+ public void getAvailableInternalMemorySizeTest() throws Exception {
+ PowerMockito.mockStatic(Environment.class);
+ PowerMockito.when(Environment.getDataDirectory()).thenReturn(mockedFile);
+ when(mockedFile.getPath()).thenReturn(path);
+ when(mockedFile.exists()).thenReturn(true);
+
+ whenNew(StatFs.class).withArguments(any()).thenReturn(mockedStatFs);
+ when(mockedStatFs.getBlockSizeLong()).thenReturn(1024L);
+ when(mockedStatFs.getAvailableBlocksLong()).thenReturn(150l*1024);
+
+ long freeSpaceInMb = storageConstraintPlugin.getAvailableInternalMemorySize();
+ Assert.assertEquals(150L, freeSpaceInMb);
+
+ }
+
+
+ @Before
+ public void prepareMock() {
+ AAPSMocker.mockMainApp();
+ AAPSMocker.mockStrings();
+ AAPSMocker.mockBus();
+ mockedFile = mock(File.class);
+ mockedStatFs = mock(StatFs.class);
+ storageConstraintPlugin = StorageConstraintPlugin.getPlugin();
+ }
+}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/AuthRequestTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/AuthRequestTest.java
new file mode 100644
index 0000000000..dd41f9873a
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/AuthRequestTest.java
@@ -0,0 +1,94 @@
+package info.nightscout.androidaps.plugins.general.smsCommunicator;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.stubbing.Answer;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import java.util.Date;
+
+import info.AAPSMocker;
+import info.nightscout.androidaps.Constants;
+import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.T;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.powermock.api.mockito.PowerMockito.doAnswer;
+import static org.powermock.api.mockito.PowerMockito.mock;
+import static org.powermock.api.mockito.PowerMockito.mockStatic;
+import static org.powermock.api.mockito.PowerMockito.when;
+
+@RunWith(PowerMockRunner.class)
+@PrepareForTest({SmsCommunicatorPlugin.class, L.class, SP.class, MainApp.class, DateUtil.class})
+
+public class AuthRequestTest {
+ SmsCommunicatorPlugin smsCommunicatorPlugin;
+ Sms sentSms;
+ boolean actionCalled = false;
+
+ @Test
+ public void doTests() {
+ Sms requester = new Sms("aNumber", "aText");
+ SmsAction action = new SmsAction() {
+ @Override
+ public void run() {
+ actionCalled = true;
+ }
+ };
+
+ // Check if SMS requesting code is sent
+ AuthRequest authRequest = new AuthRequest(smsCommunicatorPlugin, requester, "Request text", "ABC", action);
+
+ Assert.assertEquals(sentSms.phoneNumber, "aNumber");
+ Assert.assertEquals(sentSms.text, "Request text");
+
+ // wrong reply
+ actionCalled = false;
+ authRequest.action("EFG");
+ Assert.assertEquals(sentSms.phoneNumber, "aNumber");
+ Assert.assertEquals(sentSms.text, "Wrong code. Command cancelled.");
+ Assert.assertFalse(actionCalled);
+
+ // correct reply
+ authRequest = new AuthRequest(smsCommunicatorPlugin, requester, "Request text", "ABC", action);
+ actionCalled = false;
+ authRequest.action("ABC");
+ Assert.assertTrue(actionCalled);
+ // second time action should not be called
+ actionCalled = false;
+ authRequest.action("ABC");
+ Assert.assertFalse(actionCalled);
+
+ // test timed out message
+ long now = 10000;
+ when(DateUtil.now()).thenReturn(now);
+ authRequest = new AuthRequest(smsCommunicatorPlugin, requester, "Request text", "ABC", action);
+ actionCalled = false;
+ when(DateUtil.now()).thenReturn(now + T.mins(Constants.SMS_CONFIRM_TIMEOUT).msecs() + 1);
+ authRequest.action("ABC");
+ Assert.assertFalse(actionCalled);
+ }
+
+ @Before
+ public void prepareTests() {
+ smsCommunicatorPlugin = mock(SmsCommunicatorPlugin.class);
+ doAnswer((Answer) invocation -> {
+ sentSms = invocation.getArgument(0);
+ return null;
+ }).when(smsCommunicatorPlugin).sendSMS(any(Sms.class));
+
+ AAPSMocker.mockMainApp();
+ AAPSMocker.mockApplicationContext();
+ AAPSMocker.mockSP();
+ AAPSMocker.mockL();
+ AAPSMocker.mockStrings();
+
+ mockStatic(DateUtil.class);
+ }
+}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsActionTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsActionTest.java
new file mode 100644
index 0000000000..f4d61e56eb
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsActionTest.java
@@ -0,0 +1,90 @@
+package info.nightscout.androidaps.plugins.general.smsCommunicator;
+
+import android.telephony.SmsMessage;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import info.AAPSMocker;
+import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.R;
+
+import static org.powermock.api.mockito.PowerMockito.mock;
+import static org.powermock.api.mockito.PowerMockito.when;
+
+@RunWith(PowerMockRunner.class)
+
+public class SmsActionTest {
+ String result = "";
+
+ @Test
+ public void doTests() {
+
+ SmsAction smsAction = new SmsAction() {
+ @Override
+ public void run() {
+ result = "A";
+ }
+ };
+ smsAction.run();
+ Assert.assertEquals(result, "A");
+
+ smsAction = new SmsAction(1d) {
+ @Override
+ public void run() {
+ result = "B";
+ }
+ };
+ smsAction.run();
+ Assert.assertEquals(result, "B");
+ Assert.assertEquals(smsAction.aDouble, 1d, 0.000001d);
+
+ smsAction = new SmsAction(1d, 2) {
+ @Override
+ public void run() {
+ result = "C";
+ }
+ };
+ smsAction.run();
+ Assert.assertEquals(result, "C");
+ Assert.assertEquals(smsAction.aDouble, 1d, 0.000001d);
+ Assert.assertEquals(smsAction.secondInteger.intValue(), 2);
+
+ smsAction = new SmsAction("aString", 3) {
+ @Override
+ public void run() {
+ result = "D";
+ }
+ };
+ smsAction.run();
+ Assert.assertEquals(result, "D");
+ Assert.assertEquals(smsAction.aString, "aString");
+ Assert.assertEquals(smsAction.secondInteger.intValue(), 3);
+
+ smsAction = new SmsAction(4) {
+ @Override
+ public void run() {
+ result = "E";
+ }
+ };
+ smsAction.run();
+ Assert.assertEquals(result, "E");
+ Assert.assertEquals(smsAction.anInteger.intValue(), 4);
+
+ smsAction = new SmsAction(5, 6) {
+ @Override
+ public void run() {
+ result = "F";
+ }
+ };
+ smsAction.run();
+ Assert.assertEquals(result, "F");
+ Assert.assertEquals(smsAction.anInteger.intValue(), 5);
+ Assert.assertEquals(smsAction.secondInteger.intValue(), 6);
+ }
+
+}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.java
new file mode 100644
index 0000000000..abc29216b0
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.java
@@ -0,0 +1,804 @@
+package info.nightscout.androidaps.plugins.general.smsCommunicator;
+
+import android.telephony.SmsManager;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+import org.mockito.stubbing.Answer;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import info.AAPSMocker;
+import info.nightscout.androidaps.Constants;
+import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.data.DetailedBolusInfo;
+import info.nightscout.androidaps.data.PumpEnactResult;
+import info.nightscout.androidaps.db.BgReading;
+import info.nightscout.androidaps.interfaces.Constraint;
+import info.nightscout.androidaps.interfaces.PluginType;
+import info.nightscout.androidaps.interfaces.ProfileInterface;
+import info.nightscout.androidaps.interfaces.PumpInterface;
+import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin;
+import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
+import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.CobInfo;
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
+import info.nightscout.androidaps.plugins.profile.simple.SimpleProfilePlugin;
+import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin;
+import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
+import info.nightscout.androidaps.queue.Callback;
+import info.nightscout.androidaps.queue.CommandQueue;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.XdripCalibrations;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyDouble;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.powermock.api.mockito.PowerMockito.doAnswer;
+import static org.powermock.api.mockito.PowerMockito.mock;
+import static org.powermock.api.mockito.PowerMockito.mockStatic;
+import static org.powermock.api.mockito.PowerMockito.when;
+
+@RunWith(PowerMockRunner.class)
+@PrepareForTest({
+ L.class, SP.class, MainApp.class, DateUtil.class, ProfileFunctions.class,
+ TreatmentsPlugin.class, SmsManager.class, IobCobCalculatorPlugin.class,
+ CommandQueue.class, ConfigBuilderPlugin.class, NSUpload.class, ProfileInterface.class,
+ SimpleProfilePlugin.class, XdripCalibrations.class, VirtualPumpPlugin.class
+})
+
+public class SmsCommunicatorPluginTest {
+
+ private SmsCommunicatorPlugin smsCommunicatorPlugin;
+ private LoopPlugin loopPlugin;
+
+ private boolean hasBeenRun = false;
+
+ @Test
+ public void processSettingsTest() {
+ // called from constructor
+ Assert.assertEquals("1234", smsCommunicatorPlugin.allowedNumbers.get(0));
+ Assert.assertEquals("5678", smsCommunicatorPlugin.allowedNumbers.get(1));
+ Assert.assertEquals(2, smsCommunicatorPlugin.allowedNumbers.size());
+ }
+
+ @Test
+ public void isCommandTest() {
+ Assert.assertTrue(smsCommunicatorPlugin.isCommand("BOLUS", ""));
+ smsCommunicatorPlugin.messageToConfirm = null;
+ Assert.assertFalse(smsCommunicatorPlugin.isCommand("BLB", ""));
+ smsCommunicatorPlugin.messageToConfirm = new AuthRequest(smsCommunicatorPlugin, new Sms("1234", "ddd"), "RequestText", "ccode", new SmsAction() {
+ @Override
+ public void run() {
+ }
+ });
+ Assert.assertTrue(smsCommunicatorPlugin.isCommand("BLB", "1234"));
+ Assert.assertFalse(smsCommunicatorPlugin.isCommand("BLB", "2345"));
+ smsCommunicatorPlugin.messageToConfirm = null;
+ }
+
+ @Test
+ public void isAllowedNumberTest() {
+ Assert.assertTrue(smsCommunicatorPlugin.isAllowedNumber("5678"));
+ Assert.assertFalse(smsCommunicatorPlugin.isAllowedNumber("56"));
+ }
+
+ @Test
+ public void processSmsTest() {
+ Sms sms;
+
+ // SMS from not allowed number should be ignored
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("12", "aText");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertTrue(sms.ignored);
+ Assert.assertEquals("aText", smsCommunicatorPlugin.messages.get(0).text);
+
+ //UNKNOWN
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "UNKNOWN");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertEquals("UNKNOWN", smsCommunicatorPlugin.messages.get(0).text);
+
+ //BG
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "BG");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertEquals("BG", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertTrue(smsCommunicatorPlugin.messages.get(1).text.contains("IOB:"));
+ Assert.assertTrue(smsCommunicatorPlugin.messages.get(1).text.contains("Last BG: 100"));
+ Assert.assertTrue(smsCommunicatorPlugin.messages.get(1).text.contains("COB: 10(2)g"));
+
+ // LOOP : test remote control disabled
+ when(SP.getBoolean(R.string.key_smscommunicator_remotecommandsallowed, false)).thenReturn(false);
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "LOOP STATUS");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertFalse(sms.ignored);
+ Assert.assertEquals("LOOP STATUS", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertTrue(smsCommunicatorPlugin.messages.get(1).text.contains("Remote command is not allowed"));
+ when(SP.getBoolean(R.string.key_smscommunicator_remotecommandsallowed, false)).thenReturn(true);
+
+ //LOOP STATUS : disabled
+ when(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(false);
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "LOOP STATUS");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertEquals("LOOP STATUS", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertEquals("Loop is disabled", smsCommunicatorPlugin.messages.get(1).text);
+
+ //LOOP STATUS : suspended
+ when(loopPlugin.minutesToEndOfSuspend()).thenReturn(10);
+ when(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true);
+ when(loopPlugin.isSuspended()).thenReturn(true);
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "LOOP STATUS");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertEquals("LOOP STATUS", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertEquals("Suspended (10 m)", smsCommunicatorPlugin.messages.get(1).text);
+
+ //LOOP STATUS : enabled
+ when(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true);
+ when(loopPlugin.isSuspended()).thenReturn(false);
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "LOOP STATUS");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertFalse(sms.ignored);
+ Assert.assertEquals("LOOP STATUS", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertEquals("Loop is enabled", smsCommunicatorPlugin.messages.get(1).text);
+
+ //LOOP : wrong format
+ when(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true);
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "LOOP");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertFalse(sms.ignored);
+ Assert.assertEquals("LOOP", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages.get(1).text);
+
+ //LOOP DISABLE : already disabled
+ when(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(false);
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "LOOP DISABLE");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertFalse(sms.ignored);
+ Assert.assertEquals("LOOP DISABLE", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertEquals("Loop is disabled", smsCommunicatorPlugin.messages.get(1).text);
+
+ //LOOP DISABLE : from enabled
+ hasBeenRun = false;
+ when(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true);
+ doAnswer((Answer) invocation -> {
+ hasBeenRun = true;
+ return null;
+ }).when(loopPlugin).setPluginEnabled(PluginType.LOOP, false);
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "LOOP DISABLE");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertFalse(sms.ignored);
+ Assert.assertEquals("LOOP DISABLE", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertEquals("Loop has been disabled Temp basal canceled", smsCommunicatorPlugin.messages.get(1).text);
+ Assert.assertTrue(hasBeenRun);
+
+ //LOOP ENABLE : already enabled
+ when(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true);
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "LOOP ENABLE");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertFalse(sms.ignored);
+ Assert.assertEquals("LOOP ENABLE", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertEquals("Loop is enabled", smsCommunicatorPlugin.messages.get(1).text);
+
+ //LOOP ENABLE : from disabled
+ hasBeenRun = false;
+ when(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(false);
+ doAnswer((Answer) invocation -> {
+ hasBeenRun = true;
+ return null;
+ }).when(loopPlugin).setPluginEnabled(PluginType.LOOP, true);
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "LOOP ENABLE");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertFalse(sms.ignored);
+ Assert.assertEquals("LOOP ENABLE", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertEquals("Loop has been enabled", smsCommunicatorPlugin.messages.get(1).text);
+ Assert.assertTrue(hasBeenRun);
+
+ //LOOP RESUME : already enabled
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "LOOP RESUME");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertFalse(sms.ignored);
+ Assert.assertEquals("LOOP RESUME", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertEquals("Loop resumed", smsCommunicatorPlugin.messages.get(1).text);
+
+ //LOOP SUSPEND 1 2: wrong format
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "LOOP SUSPEND 1 2");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertFalse(sms.ignored);
+ Assert.assertEquals("LOOP SUSPEND 1 2", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages.get(1).text);
+
+ //LOOP SUSPEND 0 : wrong duration
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "LOOP SUSPEND 0");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertFalse(sms.ignored);
+ Assert.assertEquals("LOOP SUSPEND 0", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertEquals("Wrong duration", smsCommunicatorPlugin.messages.get(1).text);
+
+ //LOOP SUSPEND 100 : suspend for 100 min + correct answer
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "LOOP SUSPEND 100");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertFalse(sms.ignored);
+ Assert.assertEquals("LOOP SUSPEND 100", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertTrue(smsCommunicatorPlugin.messages.get(1).text.contains("To suspend loop for 100 minutes reply with code "));
+ String passCode = smsCommunicatorPlugin.messageToConfirm.confirmCode;
+ smsCommunicatorPlugin.processSms(new Sms("1234", passCode));
+ Assert.assertEquals(passCode, smsCommunicatorPlugin.messages.get(2).text);
+ Assert.assertEquals("Loop suspended Temp basal canceled", smsCommunicatorPlugin.messages.get(3).text);
+
+ //LOOP SUSPEND 200 : limit to 180 min + wrong answer
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "LOOP SUSPEND 200");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertFalse(sms.ignored);
+ Assert.assertEquals("LOOP SUSPEND 200", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertTrue(smsCommunicatorPlugin.messages.get(1).text.contains("To suspend loop for 180 minutes reply with code "));
+ passCode = smsCommunicatorPlugin.messageToConfirm.confirmCode;
+ // ignore from other number
+ smsCommunicatorPlugin.processSms(new Sms("5678", passCode));
+ smsCommunicatorPlugin.processSms(new Sms("1234", "XXXX"));
+ Assert.assertEquals("XXXX", smsCommunicatorPlugin.messages.get(3).text);
+ Assert.assertEquals("Wrong code. Command cancelled.", smsCommunicatorPlugin.messages.get(4).text);
+ //then correct code should not work
+ smsCommunicatorPlugin.processSms(new Sms("1234", passCode));
+ Assert.assertEquals(passCode, smsCommunicatorPlugin.messages.get(5).text);
+ Assert.assertEquals(6, smsCommunicatorPlugin.messages.size()); // processed as common message
+
+ //LOOP BLABLA
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "LOOP BLABLA");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertFalse(sms.ignored);
+ Assert.assertEquals("LOOP BLABLA", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages.get(1).text);
+
+ //TREATMENTS REFRESH
+ when(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true);
+ when(loopPlugin.isSuspended()).thenReturn(false);
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "TREATMENTS REFRESH");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertFalse(sms.ignored);
+ Assert.assertEquals("TREATMENTS REFRESH", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertTrue(smsCommunicatorPlugin.messages.get(1).text.contains("TREATMENTS REFRESH"));
+
+ //TREATMENTS BLA BLA
+ when(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true);
+ when(loopPlugin.isSuspended()).thenReturn(false);
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "TREATMENTS BLA BLA");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertFalse(sms.ignored);
+ Assert.assertEquals("TREATMENTS BLA BLA", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages.get(1).text);
+
+ //TREATMENTS BLABLA
+ when(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true);
+ when(loopPlugin.isSuspended()).thenReturn(false);
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "TREATMENTS BLABLA");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertFalse(sms.ignored);
+ Assert.assertEquals("TREATMENTS BLABLA", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages.get(1).text);
+
+ //NSCLIENT RESTART
+ when(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true);
+ when(loopPlugin.isSuspended()).thenReturn(false);
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "NSCLIENT RESTART");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertFalse(sms.ignored);
+ Assert.assertEquals("NSCLIENT RESTART", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertTrue(smsCommunicatorPlugin.messages.get(1).text.contains("NSCLIENT RESTART"));
+
+ //NSCLIENT BLA BLA
+ when(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true);
+ when(loopPlugin.isSuspended()).thenReturn(false);
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "NSCLIENT BLA BLA");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertFalse(sms.ignored);
+ Assert.assertEquals("NSCLIENT BLA BLA", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages.get(1).text);
+
+ //NSCLIENT BLABLA
+ when(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true);
+ when(loopPlugin.isSuspended()).thenReturn(false);
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "NSCLIENT BLABLA");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertFalse(sms.ignored);
+ Assert.assertEquals("NSCLIENT BLABLA", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages.get(1).text);
+
+ //PUMP
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "PUMP");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertEquals("PUMP", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertEquals("Virtual Pump", smsCommunicatorPlugin.messages.get(1).text);
+
+ }
+
+ @Test
+ public void processProfileTest() {
+ Sms sms;
+
+ //PROFILE
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "PROFILE");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertEquals("PROFILE", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertEquals("Remote command is not allowed", smsCommunicatorPlugin.messages.get(1).text);
+
+ when(SP.getBoolean(R.string.key_smscommunicator_remotecommandsallowed, false)).thenReturn(true);
+
+ //PROFILE
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "PROFILE");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertEquals("PROFILE", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages.get(1).text);
+
+ //PROFILE LIST (no profile interface)
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "PROFILE LIST");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertEquals("PROFILE LIST", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertEquals("Not configured", smsCommunicatorPlugin.messages.get(1).text);
+
+ ProfileInterface profileInterface = mock(SimpleProfilePlugin.class);
+ when(ConfigBuilderPlugin.getPlugin().getActiveProfileInterface()).thenReturn(profileInterface);
+
+ //PROFILE LIST (no profile defined)
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "PROFILE LIST");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertEquals("PROFILE LIST", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertEquals("Not configured", smsCommunicatorPlugin.messages.get(1).text);
+
+ when(profileInterface.getProfile()).thenReturn(AAPSMocker.getValidProfileStore());
+
+ //PROFILE STATUS
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "PROFILE STATUS");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertEquals("PROFILE STATUS", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertEquals(AAPSMocker.TESTPROFILENAME, smsCommunicatorPlugin.messages.get(1).text);
+
+ //PROFILE LIST
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "PROFILE LIST");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertEquals("PROFILE LIST", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertEquals("1. " + AAPSMocker.TESTPROFILENAME, smsCommunicatorPlugin.messages.get(1).text);
+
+ //PROFILE 2 (non existing)
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "PROFILE 2");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertEquals("PROFILE 2", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages.get(1).text);
+
+ //PROFILE 1 0(wrong percentage)
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "PROFILE 1 0");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertEquals("PROFILE 1 0", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages.get(1).text);
+
+ //PROFILE 0(wrong index)
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "PROFILE 0");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertEquals("PROFILE 0", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages.get(1).text);
+
+ //PROFILE 1(OK)
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "PROFILE 1");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertEquals("PROFILE 1", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertTrue(smsCommunicatorPlugin.messages.get(1).text.contains("To switch profile to someProfile 100% reply with code"));
+
+ //PROFILE 1 90(OK)
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "PROFILE 1 90");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertEquals("PROFILE 1 90", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertTrue(smsCommunicatorPlugin.messages.get(1).text.contains("To switch profile to someProfile 90% reply with code"));
+ String passCode = smsCommunicatorPlugin.messageToConfirm.confirmCode;
+ smsCommunicatorPlugin.processSms(new Sms("1234", passCode));
+ Assert.assertEquals(passCode, smsCommunicatorPlugin.messages.get(2).text);
+ Assert.assertEquals("Profile switch created", smsCommunicatorPlugin.messages.get(3).text);
+ }
+
+ @Test
+ public void processBasalTest() {
+ Sms sms;
+
+ //BASAL
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "BASAL");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertEquals("BASAL", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertEquals("Remote command is not allowed", smsCommunicatorPlugin.messages.get(1).text);
+
+ when(SP.getBoolean(R.string.key_smscommunicator_remotecommandsallowed, false)).thenReturn(true);
+
+ //BASAL
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "BASAL");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertEquals("BASAL", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages.get(1).text);
+
+ //BASAL CANCEL
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "BASAL CANCEL");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertEquals("BASAL CANCEL", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertTrue(smsCommunicatorPlugin.messages.get(1).text.contains("To stop temp basal reply with code"));
+ String passCode = smsCommunicatorPlugin.messageToConfirm.confirmCode;
+ smsCommunicatorPlugin.processSms(new Sms("1234", passCode));
+ Assert.assertEquals(passCode, smsCommunicatorPlugin.messages.get(2).text);
+ Assert.assertEquals("Temp basal canceled\nVirtual Pump", smsCommunicatorPlugin.messages.get(3).text);
+
+ //BASAL a%
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "BASAL a%");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertEquals("BASAL a%", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages.get(1).text);
+
+ //BASAL 10% 0
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "BASAL 10% 0");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertEquals("BASAL 10% 0", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages.get(1).text);
+
+ when(MainApp.getConstraintChecker().applyBasalPercentConstraints(any(), any())).thenReturn(new Constraint<>(20));
+
+ //BASAL 20% 20
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "BASAL 20% 20");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertEquals("BASAL 20% 20", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertTrue(smsCommunicatorPlugin.messages.get(1).text.contains("To start basal 20% for 20 min reply with code"));
+ passCode = smsCommunicatorPlugin.messageToConfirm.confirmCode;
+ smsCommunicatorPlugin.processSms(new Sms("1234", passCode));
+ Assert.assertEquals(passCode, smsCommunicatorPlugin.messages.get(2).text);
+ Assert.assertEquals("Temp basal 20% for 20 min started successfully\nVirtual Pump", smsCommunicatorPlugin.messages.get(3).text);
+
+ //BASAL a
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "BASAL a");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertEquals("BASAL a", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages.get(1).text);
+
+ //BASAL 1 0
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "BASAL 1 0");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertEquals("BASAL 1 0", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages.get(1).text);
+
+ when(MainApp.getConstraintChecker().applyBasalConstraints(any(), any())).thenReturn(new Constraint<>(1d));
+
+ //BASAL 1 20
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "BASAL 1 20");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertEquals("BASAL 1 20", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertTrue(smsCommunicatorPlugin.messages.get(1).text.contains("To start basal 1.00U/h for 20 min reply with code"));
+ passCode = smsCommunicatorPlugin.messageToConfirm.confirmCode;
+ smsCommunicatorPlugin.processSms(new Sms("1234", passCode));
+ Assert.assertEquals(passCode, smsCommunicatorPlugin.messages.get(2).text);
+ Assert.assertEquals("Temp basal 1.00U/h for 20 min started successfully\nVirtual Pump", smsCommunicatorPlugin.messages.get(3).text);
+
+ }
+
+ @Test
+ public void processExtendedTest() {
+ Sms sms;
+
+ //EXTENDED
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "EXTENDED");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertEquals("EXTENDED", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertEquals("Remote command is not allowed", smsCommunicatorPlugin.messages.get(1).text);
+
+ when(SP.getBoolean(R.string.key_smscommunicator_remotecommandsallowed, false)).thenReturn(true);
+
+ //EXTENDED
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "EXTENDED");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertEquals("EXTENDED", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages.get(1).text);
+
+ //EXTENDED CANCEL
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "EXTENDED CANCEL");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertEquals("EXTENDED CANCEL", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertTrue(smsCommunicatorPlugin.messages.get(1).text.contains("To stop extended bolus reply with code"));
+ String passCode = smsCommunicatorPlugin.messageToConfirm.confirmCode;
+ smsCommunicatorPlugin.processSms(new Sms("1234", passCode));
+ Assert.assertEquals(passCode, smsCommunicatorPlugin.messages.get(2).text);
+ Assert.assertEquals("Extended bolus canceled\nVirtual Pump", smsCommunicatorPlugin.messages.get(3).text);
+
+ //EXTENDED a%
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "EXTENDED a%");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertEquals("EXTENDED a%", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages.get(1).text);
+
+ when(MainApp.getConstraintChecker().applyExtendedBolusConstraints(any())).thenReturn(new Constraint<>(1d));
+
+ //EXTENDED 1 0
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "EXTENDED 1 0");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertEquals("EXTENDED 1 0", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages.get(1).text);
+
+ //EXTENDED 1 20
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "EXTENDED 1 20");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertEquals("EXTENDED 1 20", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertTrue(smsCommunicatorPlugin.messages.get(1).text.contains("To start extended bolus 1.00U for 20 min reply with code"));
+ passCode = smsCommunicatorPlugin.messageToConfirm.confirmCode;
+ smsCommunicatorPlugin.processSms(new Sms("1234", passCode));
+ Assert.assertEquals(passCode, smsCommunicatorPlugin.messages.get(2).text);
+ Assert.assertEquals("Extended bolus 1.00U for 20 min started successfully\nVirtual Pump", smsCommunicatorPlugin.messages.get(3).text);
+ }
+
+ @Test
+ public void processBolusTest() {
+ Sms sms;
+
+ //BOLUS
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "BOLUS");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertEquals("BOLUS", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertEquals("Remote command is not allowed", smsCommunicatorPlugin.messages.get(1).text);
+
+ when(SP.getBoolean(R.string.key_smscommunicator_remotecommandsallowed, false)).thenReturn(true);
+
+ //BOLUS
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "BOLUS");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertEquals("BOLUS", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages.get(1).text);
+
+ when(MainApp.getConstraintChecker().applyBolusConstraints(any())).thenReturn(new Constraint<>(1d));
+
+ when(DateUtil.now()).thenReturn(1000L);
+ //BOLUS 1
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "BOLUS 1");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertEquals("BOLUS 1", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertEquals("Remote bolus not available. Try again later.", smsCommunicatorPlugin.messages.get(1).text);
+
+ when(MainApp.getConstraintChecker().applyBolusConstraints(any())).thenReturn(new Constraint<>(0d));
+
+ when(DateUtil.now()).thenReturn(Constants.remoteBolusMinDistance + 1002L);
+
+ //BOLUS 0
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "BOLUS 0");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertEquals("BOLUS 0", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages.get(1).text);
+
+ //BOLUS a
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "BOLUS a");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertEquals("BOLUS a", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages.get(1).text);
+
+ when(MainApp.getConstraintChecker().applyExtendedBolusConstraints(any())).thenReturn(new Constraint<>(1d));
+
+ when(MainApp.getConstraintChecker().applyBolusConstraints(any())).thenReturn(new Constraint<>(1d));
+
+ //BOLUS 1
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "BOLUS 1");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertEquals("BOLUS 1", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertTrue(smsCommunicatorPlugin.messages.get(1).text.contains("To deliver bolus 1.00U reply with code"));
+ String passCode = smsCommunicatorPlugin.messageToConfirm.confirmCode;
+ smsCommunicatorPlugin.processSms(new Sms("1234", passCode));
+ Assert.assertEquals(passCode, smsCommunicatorPlugin.messages.get(2).text);
+ Assert.assertEquals("Bolus 1.00U delivered successfully\nVirtual Pump", smsCommunicatorPlugin.messages.get(3).text);
+
+ //BOLUS 1 (Suspended pump)
+ smsCommunicatorPlugin.lastRemoteBolusTime = 0;
+ PumpInterface pump = mock(VirtualPumpPlugin.class);
+ when(ConfigBuilderPlugin.getPlugin().getActivePump()).thenReturn(pump);
+ when(pump.isSuspended()).thenReturn(true);
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "BOLUS 1");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertEquals("BOLUS 1", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertEquals("Pump suspended", smsCommunicatorPlugin.messages.get(1).text);
+ when(pump.isSuspended()).thenReturn(false);
+ }
+
+ @Test
+ public void processCalTest() {
+ Sms sms;
+
+ //CAL
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "CAL");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertEquals("CAL", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertEquals("Remote command is not allowed", smsCommunicatorPlugin.messages.get(1).text);
+
+ when(SP.getBoolean(R.string.key_smscommunicator_remotecommandsallowed, false)).thenReturn(true);
+
+ //CAL
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "CAL");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertEquals("CAL", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages.get(1).text);
+
+ //CAL 0
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "CAL 0");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertEquals("CAL 0", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages.get(1).text);
+
+ when(XdripCalibrations.sendIntent(any())).thenReturn(true);
+ //CAL 1
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ sms = new Sms("1234", "CAL 1");
+ smsCommunicatorPlugin.processSms(sms);
+ Assert.assertEquals("CAL 1", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertTrue(smsCommunicatorPlugin.messages.get(1).text.contains("To send calibration 1.00 reply with code"));
+ String passCode = smsCommunicatorPlugin.messageToConfirm.confirmCode;
+ smsCommunicatorPlugin.processSms(new Sms("1234", passCode));
+ Assert.assertEquals(passCode, smsCommunicatorPlugin.messages.get(2).text);
+ Assert.assertEquals("Calibration sent. Receiving must be enabled in xDrip.", smsCommunicatorPlugin.messages.get(3).text);
+ }
+
+ @Test
+ public void sendNotificationToAllNumbers() {
+ smsCommunicatorPlugin.messages = new ArrayList<>();
+ smsCommunicatorPlugin.sendNotificationToAllNumbers("abc");
+ Assert.assertEquals("abc", smsCommunicatorPlugin.messages.get(0).text);
+ Assert.assertEquals("abc", smsCommunicatorPlugin.messages.get(1).text);
+ }
+
+ @Before
+ public void prepareTests() {
+ AAPSMocker.mockMainApp();
+ AAPSMocker.mockApplicationContext();
+ AAPSMocker.mockSP();
+ AAPSMocker.mockL();
+ AAPSMocker.mockStrings();
+ AAPSMocker.mockBus();
+ AAPSMocker.mockProfileFunctions();
+ AAPSMocker.mockTreatmentPlugin();
+ AAPSMocker.mockTreatmentService();
+ AAPSMocker.mockIobCobCalculatorPlugin();
+ AAPSMocker.mockConfigBuilder();
+ AAPSMocker.mockCommandQueue();
+ AAPSMocker.mockNSUpload();
+ AAPSMocker.mockConstraintsChecker();
+
+ BgReading reading = new BgReading();
+ reading.value = 100;
+ List bgList = new ArrayList<>();
+ bgList.add(reading);
+ PowerMockito.when(IobCobCalculatorPlugin.getPlugin().getBgReadings()).thenReturn(bgList);
+ PowerMockito.when(IobCobCalculatorPlugin.getPlugin().getCobInfo(false, "SMS COB")).thenReturn(new CobInfo(10d, 2d));
+
+ mockStatic(XdripCalibrations.class);
+ mockStatic(DateUtil.class);
+ mockStatic(SmsManager.class);
+ SmsManager smsManager = mock(SmsManager.class);
+ when(SmsManager.getDefault()).thenReturn(smsManager);
+
+ when(SP.getString(R.string.key_smscommunicator_allowednumbers, "")).thenReturn("1234;5678");
+ smsCommunicatorPlugin = SmsCommunicatorPlugin.getPlugin();
+ smsCommunicatorPlugin.setPluginEnabled(PluginType.GENERAL, true);
+
+ loopPlugin = mock(LoopPlugin.class);
+ when(MainApp.getSpecificPlugin(LoopPlugin.class)).thenReturn(loopPlugin);
+
+ Mockito.doAnswer(invocation -> {
+ Callback callback = invocation.getArgument(1);
+ callback.result = new PumpEnactResult().success(true);
+ callback.run();
+ return null;
+ }).when(AAPSMocker.queue).cancelTempBasal(anyBoolean(), any(Callback.class));
+
+ Mockito.doAnswer(invocation -> {
+ Callback callback = invocation.getArgument(0);
+ callback.result = new PumpEnactResult().success(true);
+ callback.run();
+ return null;
+ }).when(AAPSMocker.queue).cancelExtended(any(Callback.class));
+
+ Mockito.doAnswer(invocation -> {
+ Callback callback = invocation.getArgument(1);
+ callback.result = new PumpEnactResult().success(true);
+ callback.run();
+ return null;
+ }).when(AAPSMocker.queue).readStatus(anyString(), any(Callback.class));
+
+ Mockito.doAnswer(invocation -> {
+ Callback callback = invocation.getArgument(1);
+ callback.result = new PumpEnactResult().success(true).bolusDelivered(1);
+ callback.run();
+ return null;
+ }).when(AAPSMocker.queue).bolus(any(DetailedBolusInfo.class), any(Callback.class));
+
+ Mockito.doAnswer(invocation -> {
+ Callback callback = invocation.getArgument(4);
+ callback.result = new PumpEnactResult().success(true).isPercent(true).percent(invocation.getArgument(0)).duration(invocation.getArgument(1));
+ callback.run();
+ return null;
+ }).when(AAPSMocker.queue).tempBasalPercent(anyInt(), anyInt(), anyBoolean(), any(), any(Callback.class));
+
+ Mockito.doAnswer(invocation -> {
+ Callback callback = invocation.getArgument(4);
+ callback.result = new PumpEnactResult().success(true).isPercent(false).absolute(invocation.getArgument(0)).duration(invocation.getArgument(1));
+ callback.run();
+ return null;
+ }).when(AAPSMocker.queue).tempBasalAbsolute(anyDouble(), anyInt(), anyBoolean(), any(), any(Callback.class));
+
+ Mockito.doAnswer(invocation -> {
+ Callback callback = invocation.getArgument(2);
+ callback.result = new PumpEnactResult().success(true).isPercent(false).absolute(invocation.getArgument(0)).duration(invocation.getArgument(1));
+ callback.run();
+ return null;
+ }).when(AAPSMocker.queue).extendedBolus(anyDouble(), anyInt(), any(Callback.class));
+
+ VirtualPumpPlugin virtualPumpPlugin = VirtualPumpPlugin.getPlugin();
+ when(ConfigBuilderPlugin.getPlugin().getActivePump()).thenReturn(virtualPumpPlugin);
+ }
+
+}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsTest.java
new file mode 100644
index 0000000000..5f7af11a67
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsTest.java
@@ -0,0 +1,53 @@
+package info.nightscout.androidaps.plugins.general.smsCommunicator;
+
+import android.telephony.SmsMessage;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import info.AAPSMocker;
+import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.R;
+
+import static org.powermock.api.mockito.PowerMockito.mock;
+import static org.powermock.api.mockito.PowerMockito.when;
+
+@RunWith(PowerMockRunner.class)
+@PrepareForTest({SmsMessage.class, MainApp.class})
+
+public class SmsTest {
+
+ @Test
+ public void doTests() {
+ SmsMessage smsMessage = mock(SmsMessage.class);
+ when(smsMessage.getOriginatingAddress()).thenReturn("aNumber");
+ when(smsMessage.getMessageBody()).thenReturn("aBody");
+
+ Sms sms = new Sms(smsMessage);
+ Assert.assertEquals(sms.phoneNumber, "aNumber");
+ Assert.assertEquals(sms.text, "aBody");
+ Assert.assertTrue(sms.received);
+
+ sms = new Sms("aNumber", "aBody");
+ Assert.assertEquals(sms.phoneNumber, "aNumber");
+ Assert.assertEquals(sms.text, "aBody");
+ Assert.assertTrue(sms.sent);
+
+ sms = new Sms("aNumber", R.string.insulin_unit_shortname);
+ Assert.assertEquals(sms.phoneNumber, "aNumber");
+ Assert.assertEquals(sms.text, MainApp.gs(R.string.insulin_unit_shortname));
+ Assert.assertTrue(sms.sent);
+
+ Assert.assertEquals(sms.toString(), "SMS from aNumber: U");
+ }
+
+ @Before
+ public void prepareTests() {
+ AAPSMocker.mockMainApp();
+ AAPSMocker.mockStrings();
+ }
+}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/IobCobCalculatorPlugin/IobCobCalculatorPluginTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculatorPlugin/IobCobCalculatorPluginTest.java
similarity index 99%
rename from app/src/test/java/info/nightscout/androidaps/plugins/IobCobCalculatorPlugin/IobCobCalculatorPluginTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculatorPlugin/IobCobCalculatorPluginTest.java
index 8cb7f2e4ad..4cd57f93ad 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/IobCobCalculatorPlugin/IobCobCalculatorPluginTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculatorPlugin/IobCobCalculatorPluginTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.IobCobCalculatorPlugin;
+package info.nightscout.androidaps.plugins.iob.iobCobCalculatorPlugin;
import android.content.Context;
diff --git a/app/src/test/java/info/nightscout/androidaps/utils/MidnightTimeTest.java b/app/src/test/java/info/nightscout/androidaps/utils/MidnightTimeTest.java
new file mode 100644
index 0000000000..a15efa6c24
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/utils/MidnightTimeTest.java
@@ -0,0 +1,62 @@
+package info.nightscout.androidaps.utils;
+
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import java.util.Calendar;
+import java.util.Date;
+
+import info.AAPSMocker;
+import info.nightscout.androidaps.MainApp;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Created by mike on 20.11.2017.
+ */
+@RunWith(PowerMockRunner.class)
+@PrepareForTest({Calendar.class})
+public class MidnightTimeTest {
+
+ @Test
+ public void calc() {
+ // We get real midnight
+ long now = DateUtil.now();
+ Assert.assertTrue(now >= MidnightTime.calc());
+ Calendar c = Calendar.getInstance();
+ c.setTimeInMillis(MidnightTime.calc());
+ Assert.assertEquals(c.get(Calendar.HOUR_OF_DAY), 0);
+ Assert.assertEquals(c.get(Calendar.MINUTE), 0);
+ Assert.assertEquals(c.get(Calendar.SECOND), 0);
+ Assert.assertEquals(c.get(Calendar.MILLISECOND), 0);
+ }
+
+ @Test
+ public void calc_time() {
+ // We get real midnight
+ long now = DateUtil.now();
+ long midnight = MidnightTime.calc(now);
+ Assert.assertTrue(now >= midnight);
+ Calendar c = Calendar.getInstance();
+ c.setTimeInMillis(MidnightTime.calc(now));
+ Assert.assertEquals(c.get(Calendar.HOUR_OF_DAY), 0);
+ Assert.assertEquals(c.get(Calendar.MINUTE), 0);
+ Assert.assertEquals(c.get(Calendar.SECOND), 0);
+ Assert.assertEquals(c.get(Calendar.MILLISECOND), 0);
+ // Assure we get the same time from cache
+ Assert.assertEquals(midnight, MidnightTime.calc(now));
+ }
+
+ @Test
+ public void log() {
+ long now = DateUtil.now();
+ MidnightTime.calc(now);
+ Assert.assertTrue(MidnightTime.log().startsWith("Hits:"));
+ }
+}
diff --git a/wear/build.gradle b/wear/build.gradle
index be11cdbb5b..2a35c591b6 100644
--- a/wear/build.gradle
+++ b/wear/build.gradle
@@ -2,6 +2,7 @@ apply plugin: 'com.android.application'
ext {
wearableVersion = "2.0.1"
+ playServicesWearable = "10.2.1"
}
def generateGitBuild = { ->
@@ -93,7 +94,7 @@ dependencies {
//compile "com.ustwo.android:clockwise-wearable:1.0.2"
compileOnly "com.google.android.wearable:wearable:${wearableVersion}"
implementation "com.google.android.support:wearable:${wearableVersion}"
- implementation "com.google.android.gms:play-services-wearable:7.3.0"
+ implementation "com.google.android.gms:play-services-wearable:${playServicesWearable}"
implementation(name:"ustwo-clockwise-debug", ext:"aar")
implementation "com.android.support:support-v4:27.0.1"
implementation 'com.android.support:wear:27.0.1'
diff --git a/wear/src/main/AndroidManifest.xml b/wear/src/main/AndroidManifest.xml
index e6750c515d..f04e072bc7 100644
--- a/wear/src/main/AndroidManifest.xml
+++ b/wear/src/main/AndroidManifest.xml
@@ -168,9 +168,66 @@
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/wear/src/main/java/info/nightscout/androidaps/data/ListenerService.java b/wear/src/main/java/info/nightscout/androidaps/data/ListenerService.java
index 52dfc97ad1..094b8aad76 100644
--- a/wear/src/main/java/info/nightscout/androidaps/data/ListenerService.java
+++ b/wear/src/main/java/info/nightscout/androidaps/data/ListenerService.java
@@ -1,5 +1,8 @@
package info.nightscout.androidaps.data;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
import android.app.Notification;
import android.app.NotificationManager;
import android.app.PendingIntent;
@@ -7,16 +10,24 @@ import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.AsyncTask;
+import android.os.Build;
import android.os.Bundle;
import android.os.SystemClock;
import android.preference.PreferenceManager;
import android.support.v4.content.LocalBroadcastManager;
import android.support.v4.app.NotificationCompat;
import android.support.v4.app.NotificationManagerCompat;
+import android.support.v4.content.LocalBroadcastManager;
+import android.util.Log;
import com.google.android.gms.common.ConnectionResult;
import com.google.android.gms.common.api.GoogleApiClient;
+import com.google.android.gms.common.api.PendingResult;
+import com.google.android.gms.common.api.ResultCallback;
+import com.google.android.gms.wearable.CapabilityApi;
+import com.google.android.gms.wearable.CapabilityInfo;
+import com.google.android.gms.wearable.ChannelApi;
import com.google.android.gms.wearable.DataEvent;
import com.google.android.gms.wearable.DataEventBuffer;
import com.google.android.gms.wearable.DataMap;
@@ -33,12 +44,15 @@ import info.nightscout.androidaps.R;
import info.nightscout.androidaps.interaction.actions.AcceptActivity;
import info.nightscout.androidaps.interaction.actions.CPPActivity;
import info.nightscout.androidaps.interaction.utils.SafeParse;
+import info.nightscout.androidaps.interaction.utils.WearUtil;
+
/**
* Created by emmablack on 12/26/14.
*/
public class ListenerService extends WearableListenerService implements GoogleApiClient.ConnectionCallbacks,
- GoogleApiClient.OnConnectionFailedListener {
+ GoogleApiClient.OnConnectionFailedListener, ChannelApi.ChannelListener {
+
private static final String WEARABLE_DATA_PATH = "/nightscout_watch_data";
private static final String WEARABLE_RESEND_PATH = "/nightscout_watch_data_resend";
private static final String WEARABLE_CANCELBOLUS_PATH = "/nightscout_watch_cancel_bolus";
@@ -67,49 +81,164 @@ public class ListenerService extends WearableListenerService implements GoogleAp
private static final String ACTION_RESEND_BULK = "com.dexdrip.stephenblack.nightwatch.RESEND_BULK_DATA";
+
GoogleApiClient googleApiClient;
private long lastRequest = 0;
private DismissThread confirmThread;
private DismissThread bolusprogressThread;
+ private static final String TAG = "ListenerService";
+ private DataRequester mDataRequester = null;
+ private static final int GET_CAPABILITIES_TIMEOUT_MS = 5000;
+
+ // Phone
+ private static final String CAPABILITY_PHONE_APP = "phone_app_sync_bgs";
+ private static final String MESSAGE_PATH_PHONE = "/phone_message_path";
+ // Wear
+ private static final String CAPABILITY_WEAR_APP = "wear_app_sync_bgs";
+ private static final String MESSAGE_PATH_WEAR = "/wear_message_path";
+ private String mPhoneNodeId = null;
+ private String localnode = null;
+ private String logPrefix = ""; // "WR: "
public class DataRequester extends AsyncTask {
Context mContext;
+ String path;
+ byte[] payload;
- DataRequester(Context context) {
- mContext = context;
+
+ DataRequester(Context context, String thispath, byte[] thispayload) {
+ path = thispath;
+ payload = thispayload;
+ // Log.d(TAG, logPrefix + "DataRequester DataRequester: " + thispath + " lastRequest:" + lastRequest);
}
+
+
@Override
protected Void doInBackground(Void... params) {
- if (googleApiClient.isConnected()) {
- if (System.currentTimeMillis() - lastRequest > 20 * 1000) { // enforce 20-second debounce period
- lastRequest = System.currentTimeMillis();
+ // Log.d(TAG, logPrefix + "DataRequester: doInBack: " + params);
- NodeApi.GetConnectedNodesResult nodes =
- Wearable.NodeApi.getConnectedNodes(googleApiClient).await();
- for (Node node : nodes.getNodes()) {
- Wearable.MessageApi.sendMessage(googleApiClient, node.getId(), WEARABLE_RESEND_PATH, null);
- }
+ try {
+
+ forceGoogleApiConnect();
+ DataMap datamap;
+
+ if (isCancelled()) {
+ Log.d(TAG, "doInBackground CANCELLED programmatically");
+ return null;
}
- } else {
- googleApiClient.blockingConnect(15, TimeUnit.SECONDS);
- if (googleApiClient.isConnected()) {
- if (System.currentTimeMillis() - lastRequest > 20 * 1000) { // enforce 20-second debounce period
+
+ if (googleApiClient != null) {
+ if (!googleApiClient.isConnected())
+ googleApiClient.blockingConnect(15, TimeUnit.SECONDS);
+ }
+
+ // this code might not be needed in this way, but we need to see that later
+ if ((googleApiClient != null) && (googleApiClient.isConnected())) {
+ if ((System.currentTimeMillis() - lastRequest > 20 * 1000)) {
+
+ // enforce 20-second debounce period
lastRequest = System.currentTimeMillis();
- NodeApi.GetConnectedNodesResult nodes =
- Wearable.NodeApi.getConnectedNodes(googleApiClient).await();
- for (Node node : nodes.getNodes()) {
- Wearable.MessageApi.sendMessage(googleApiClient, node.getId(), WEARABLE_RESEND_PATH, null);
+ // NodeApi.GetConnectedNodesResult nodes =
+ // Wearable.NodeApi.getConnectedNodes(googleApiClient).await();
+ if (localnode == null || (localnode != null && localnode.isEmpty()))
+ setLocalNodeName();
+
+ CapabilityInfo capabilityInfo = getCapabilities();
+
+ int count = 0;
+ Node phoneNode = null;
+
+ if (capabilityInfo != null) {
+ phoneNode = updatePhoneSyncBgsCapability(capabilityInfo);
+ count = capabilityInfo.getNodes().size();
}
+
+ Log.d(TAG, "doInBackground connected. CapabilityApi.GetCapabilityResult mPhoneNodeID="
+ + (phoneNode != null ? phoneNode.getId() : "") + " count=" + count + " localnode="
+ + localnode);// KS
+
+ if (count > 0) {
+
+ for (Node node : capabilityInfo.getNodes()) {
+
+ // Log.d(TAG, "doInBackground path: " + path);
+
+ switch (path) {
+ // simple send as is payloads
+
+ case WEARABLE_RESEND_PATH:
+ Wearable.MessageApi.sendMessage(googleApiClient, node.getId(),
+ WEARABLE_RESEND_PATH, null);
+ break;
+ case WEARABLE_DATA_PATH:
+ case WEARABLE_CANCELBOLUS_PATH:
+ case WEARABLE_CONFIRM_ACTIONSTRING_PATH:
+ case WEARABLE_INITIATE_ACTIONSTRING_PATH:
+ case OPEN_SETTINGS:
+ case NEW_STATUS_PATH:
+ case NEW_PREFERENCES_PATH:
+ case BASAL_DATA_PATH:
+ case BOLUS_PROGRESS_PATH:
+ case ACTION_CONFIRMATION_REQUEST_PATH:
+ case NEW_CHANGECONFIRMATIONREQUEST_PATH:
+ case ACTION_CANCELNOTIFICATION_REQUEST_PATH: {
+ Log.w(TAG, logPrefix + "Unhandled path");
+ // sendMessagePayload(node, path, path, payload);
+ }
+
+ default:// SYNC_ALL_DATA
+ // this fall through is messy and non-deterministic for new paths
+
+ }
+ }
+ } else {
+
+ Log.d(TAG, logPrefix + "doInBackground connected but getConnectedNodes returns 0.");
+
+ }
+ } else {
+ // no resend
+ Log.d(TAG, logPrefix + "Inside the timeout, will not be executed");
+
+ }
+ } else {
+ Log.d(TAG, logPrefix + "Not connected for sending: api "
+ + ((googleApiClient == null) ? "is NULL!" : "not null"));
+ if (googleApiClient != null) {
+ googleApiClient.connect();
+ } else {
+ googleApiConnect();
}
}
+
+ } catch (Exception ex) {
+ Log.e(TAG, logPrefix + "Error executing DataRequester in background. Exception: " + ex.getMessage());
}
+
return null;
}
}
+
+ public CapabilityInfo getCapabilities() {
+
+ CapabilityApi.GetCapabilityResult capabilityResult = Wearable.CapabilityApi.getCapability(googleApiClient,
+ CAPABILITY_PHONE_APP, CapabilityApi.FILTER_REACHABLE).await(GET_CAPABILITIES_TIMEOUT_MS,
+ TimeUnit.MILLISECONDS);
+
+ if (!capabilityResult.getStatus().isSuccess()) {
+ Log.e(TAG, logPrefix + "doInBackground Failed to get capabilities, status: "
+ + capabilityResult.getStatus().getStatusMessage());
+ return null;
+ }
+
+ return capabilityResult.getCapability();
+
+ }
+
public class BolusCancelTask extends AsyncTask {
Context mContext;
@@ -119,6 +248,8 @@ public class ListenerService extends WearableListenerService implements GoogleAp
@Override
protected Void doInBackground(Void... params) {
+ // Log.d(TAG, logPrefix + "BolusCancelTask: doInBack: " + params);
+
if (googleApiClient.isConnected()) {
NodeApi.GetConnectedNodesResult nodes =
Wearable.NodeApi.getConnectedNodes(googleApiClient).await();
@@ -154,6 +285,9 @@ public class ListenerService extends WearableListenerService implements GoogleAp
@Override
protected Void doInBackground(Void... params) {
+
+ forceGoogleApiConnect();
+
if (googleApiClient.isConnected()) {
NodeApi.GetConnectedNodesResult nodes =
Wearable.NodeApi.getConnectedNodes(googleApiClient).await();
@@ -176,7 +310,7 @@ public class ListenerService extends WearableListenerService implements GoogleAp
}
public void requestData() {
- new DataRequester(this).execute();
+ sendData(WEARABLE_RESEND_PATH, null);
}
public void cancelBolus() {
@@ -191,7 +325,73 @@ public class ListenerService extends WearableListenerService implements GoogleAp
new MessageActionTask(this, WEARABLE_INITIATE_ACTIONSTRING_PATH, actionstring).execute();
}
- public void googleApiConnect() {
+
+ private Node updatePhoneSyncBgsCapability(CapabilityInfo capabilityInfo) {
+ // Log.d(TAG, "CapabilityInfo: " + capabilityInfo);
+
+ Set connectedNodes = capabilityInfo.getNodes();
+ return pickBestNode(connectedNodes);
+ // mPhoneNodeId = pickBestNodeId(connectedNodes);
+ }
+
+
+ private Node pickBestNode(Set nodes) {
+ Node bestNode = null;
+ // Find a nearby node or pick one arbitrarily
+ for (Node node : nodes) {
+ if (node.isNearby()) {
+ return node;
+ }
+ bestNode = node;
+ }
+ return bestNode;
+ }
+
+
+ private synchronized void sendData(String path, byte[] payload) {
+ // Log.d(TAG, "WR: sendData: path: " + path + ", payload=" + payload);
+
+ if (path == null)
+ return;
+ if (mDataRequester != null) {
+ // Log.d(TAG, logPrefix + "sendData DataRequester != null lastRequest:" +
+ // WearUtil.dateTimeText(lastRequest));
+ if (mDataRequester.getStatus() != AsyncTask.Status.FINISHED) {
+ // Log.d(TAG, logPrefix + "sendData Should be canceled? Let run 'til finished.");
+ // mDataRequester.cancel(true);
+ }
+ }
+
+ Log.d(TAG, logPrefix + "sendData: execute lastRequest:" + WearUtil.dateTimeText(lastRequest));
+ mDataRequester = (DataRequester)new DataRequester(this, path, payload).execute();
+ // executeTask(mDataRequester);
+
+ // if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+ // Log.d(TAG, "sendData SDK < M call execute lastRequest:" + WearUtil.dateTimeText(lastRequest));
+ // mDataRequester = (DataRequester) new DataRequester(this, path, payload).execute();
+ // } else {
+ // Log.d(TAG, "sendData SDK >= M call executeOnExecutor lastRequest:" + WearUtil.dateTimeText(lastRequest));
+ // // TODO xdrip executor
+ // mDataRequester = (DataRequester) new DataRequester(this, path, payload).executeOnExecutor(xdrip.executor);
+ // }
+ }
+
+
+ private void googleApiConnect() {
+ if (googleApiClient != null) {
+ // Remove old listener(s)
+ try {
+ Wearable.ChannelApi.removeListener(googleApiClient, this);
+ } catch (Exception e) {
+ //
+ }
+ try {
+ Wearable.MessageApi.removeListener(googleApiClient, this);
+ } catch (Exception e) {
+ //
+ }
+ }
+
googleApiClient = new GoogleApiClient.Builder(this)
.addConnectionCallbacks(this)
.addOnConnectionFailedListener(this)
@@ -201,8 +401,25 @@ public class ListenerService extends WearableListenerService implements GoogleAp
}
+
+ private void forceGoogleApiConnect() {
+ if ((googleApiClient != null && !googleApiClient.isConnected() && !googleApiClient.isConnecting()) || googleApiClient == null) {
+ try {
+ Log.d(TAG, "forceGoogleApiConnect: forcing google api reconnection");
+ googleApiConnect();
+ Thread.sleep(2000);
+ } catch (InterruptedException e) {
+ //
+ }
+ }
+ }
+
+
@Override
public int onStartCommand(Intent intent, int flags, int startId) {
+
+ // Log.d(TAG, logPrefix + "onStartCommand: Intent: " + intent);
+
if (intent != null && ACTION_RESEND.equals(intent.getAction())) {
googleApiConnect();
requestData();
@@ -256,13 +473,16 @@ public class ListenerService extends WearableListenerService implements GoogleAp
public void onDataChanged(DataEventBuffer dataEvents) {
DataMap dataMap;
+ // Log.d(TAG, logPrefix + "onDataChanged: DataEvents=" + dataEvents);
for (DataEvent event : dataEvents) {
if (event.getType() == DataEvent.TYPE_CHANGED) {
-
String path = event.getDataItem().getUri().getPath();
+
+ //Log.d(TAG, "WR: onDataChanged: Path: " + path + ", EventDataItem=" + event.getDataItem());
+
if (path.equals(OPEN_SETTINGS)) {
Intent intent = new Intent(this, AAPSPreferences.class);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -480,6 +700,21 @@ public class ListenerService extends WearableListenerService implements GoogleAp
@Override
public void onConnected(Bundle bundle) {
+ // Log.d(TAG, logPrefix + "onConnected call requestData");
+
+ CapabilityApi.CapabilityListener capabilityListener = new CapabilityApi.CapabilityListener() {
+
+ @Override
+ public void onCapabilityChanged(CapabilityInfo capabilityInfo) {
+ updatePhoneSyncBgsCapability(capabilityInfo);
+ Log.d(TAG, logPrefix + "onConnected onCapabilityChanged mPhoneNodeID:" + mPhoneNodeId
+ + ", Capability: " + capabilityInfo);
+ }
+ };
+
+ Wearable.CapabilityApi.addCapabilityListener(googleApiClient, capabilityListener, CAPABILITY_PHONE_APP);
+
+ Wearable.ChannelApi.addListener(googleApiClient, this);
requestData();
}
@@ -493,14 +728,38 @@ public class ListenerService extends WearableListenerService implements GoogleAp
}
+
+ private void setLocalNodeName() {
+ forceGoogleApiConnect();
+ PendingResult result = Wearable.NodeApi.getLocalNode(googleApiClient);
+ result.setResultCallback(new ResultCallback() {
+
+ @Override
+ public void onResult(NodeApi.GetLocalNodeResult getLocalNodeResult) {
+ if (!getLocalNodeResult.getStatus().isSuccess()) {
+ Log.e(TAG, "ERROR: failed to getLocalNode Status="
+ + getLocalNodeResult.getStatus().getStatusMessage());
+ } else {
+ Log.d(TAG, "getLocalNode Status=: " + getLocalNodeResult.getStatus().getStatusMessage());
+ Node getnode = getLocalNodeResult.getNode();
+ localnode = getnode != null ? getnode.getDisplayName() + "|" + getnode.getId() : "";
+ Log.d(TAG, "setLocalNodeName. localnode=" + localnode);
+ }
+ }
+ });
+ }
+
+
@Override
public void onDestroy() {
super.onDestroy();
if (googleApiClient != null && googleApiClient.isConnected()) {
googleApiClient.disconnect();
}
+
if (googleApiClient != null) {
Wearable.MessageApi.removeListener(googleApiClient, this);
+ Wearable.ChannelApi.removeListener(googleApiClient, this);
}
- }
+ }
}
diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/utils/WearUtil.java b/wear/src/main/java/info/nightscout/androidaps/interaction/utils/WearUtil.java
new file mode 100644
index 0000000000..ca63749888
--- /dev/null
+++ b/wear/src/main/java/info/nightscout/androidaps/interaction/utils/WearUtil.java
@@ -0,0 +1,19 @@
+package info.nightscout.androidaps.interaction.utils;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * Created by andy on 3/5/19.
+ */
+
+public class WearUtil {
+
+
+ public static String dateTimeText(long timeInMs) {
+ Date d = new Date(timeInMs);
+ return "" + d.getDay() + "." + d.getMonth() + "." + d.getYear() + " " + d.getHours() + ":" + d.getMinutes() + ":" + d.getSeconds();
+ }
+
+
+}
diff --git a/wear/src/main/res/values/wear.xml b/wear/src/main/res/values/wear.xml
new file mode 100644
index 0000000000..41df8ef193
--- /dev/null
+++ b/wear/src/main/res/values/wear.xml
@@ -0,0 +1,18 @@
+
+
+
+
+ - phone_app_sync_bgs
+
+
\ No newline at end of file