caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

cleanup

Browse source
This commit is contained in:
Milos Kozak 2021-02-14 11:38:28 +01:00
parent 30c530a109
commit 1b132fd589
5 changed files with 35 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
View file

@ -103,9 +103,6 @@ public class LoopPlugin extends PluginBase implements LoopInterface {
private long lastBgTriggeredRun = 0;
private long loopSuspendedTill; // end of manual loop suspend
private boolean isSuperBolus;
private boolean isDisconnected;
private long carbsSuggestionsSuspendedUntil = 0;
private int prevCarbsreq = 0;
@ -173,9 +170,6 @@ public class LoopPlugin extends PluginBase implements LoopInterface {
this.nsUpload = nsUpload;
this.hardLimits = hardLimits;
loopSuspendedTill = sp.getLong("loopSuspendedTill", 0L);
isSuperBolus = sp.getBoolean("isSuperBolus", false);
isDisconnected = sp.getBoolean("isDisconnected", false);
}
@Override
@ -240,33 +234,25 @@ public class LoopPlugin extends PluginBase implements LoopInterface {
}
public void suspendTo(long endTime) {
loopSuspendedTill = endTime;
isSuperBolus = false;
isDisconnected = false;
sp.putLong("loopSuspendedTill", loopSuspendedTill);
sp.putBoolean("isSuperBolus", isSuperBolus);
sp.putBoolean("isDisconnected", isDisconnected);
sp.putLong("loopSuspendedTill", endTime);
sp.putBoolean("isSuperBolus", false);
sp.putBoolean("isDisconnected", false);
}
public void superBolusTo(long endTime) {
loopSuspendedTill = endTime;
isSuperBolus = true;
isDisconnected = false;
sp.putLong("loopSuspendedTill", loopSuspendedTill);
sp.putBoolean("isSuperBolus", isSuperBolus);
sp.putBoolean("isDisconnected", isDisconnected);
sp.putLong("loopSuspendedTill", endTime);
sp.putBoolean("isSuperBolus", true);
sp.putBoolean("isDisconnected", false);
}
private void disconnectTo(long endTime) {
loopSuspendedTill = endTime;
isSuperBolus = false;
isDisconnected = true;
sp.putLong("loopSuspendedTill", loopSuspendedTill);
sp.putBoolean("isSuperBolus", isSuperBolus);
sp.putBoolean("isDisconnected", isDisconnected);
sp.putLong("loopSuspendedTill", endTime);
sp.putBoolean("isSuperBolus", false);
sp.putBoolean("isDisconnected", true);
}
public int minutesToEndOfSuspend() {
long loopSuspendedTill = sp.getLong("loopSuspendedTill", 0L);
if (loopSuspendedTill == 0)
return 0;
@ -282,6 +268,7 @@ public class LoopPlugin extends PluginBase implements LoopInterface {
}
public boolean isSuspended() {
long loopSuspendedTill = sp.getLong("loopSuspendedTill", 0L);
if (loopSuspendedTill == 0)
return false;
@ -311,6 +298,7 @@ public class LoopPlugin extends PluginBase implements LoopInterface {
}
public boolean isSuperBolus() {
long loopSuspendedTill = sp.getLong("loopSuspendedTill", 0L);
if (loopSuspendedTill == 0)
return false;
@ -321,10 +309,11 @@ public class LoopPlugin extends PluginBase implements LoopInterface {
return false;
}
return isSuperBolus;
return sp.getBoolean("isSuperBolus", false);
}
public boolean isDisconnected() {
long loopSuspendedTill = sp.getLong("loopSuspendedTill", 0L);
if (loopSuspendedTill == 0)
return false;
@ -334,7 +323,7 @@ public class LoopPlugin extends PluginBase implements LoopInterface {
suspendTo(0L);
return false;
}
return isDisconnected;
return sp.getBoolean("isDisconnected", false);
}
public boolean treatmentTimethreshold(int duartionMinutes) {
@ -362,7 +351,7 @@ public class LoopPlugin extends PluginBase implements LoopInterface {
return;
}
final PumpInterface pump = activePlugin.getActivePump();
APSResult result = null;
APSResult apsResult = null;
if (!isEnabled(PluginType.LOOP))
return;
@ -381,23 +370,23 @@ public class LoopPlugin extends PluginBase implements LoopInterface {
APSInterface usedAPS = activePlugin.getActiveAPS();
if (((PluginBase) usedAPS).isEnabled(PluginType.APS)) {
usedAPS.invoke(initiator, tempBasalFallback);
result = usedAPS.getLastAPSResult();
apsResult = usedAPS.getLastAPSResult();
}
// Check if we have any result
if (result == null) {
if (apsResult == null) {
rxBus.send(new EventLoopSetLastRunGui(resourceHelper.gs(R.string.noapsselected)));
return;
}
// Prepare for pumps using % basals
if (pump.getPumpDescription().tempBasalStyle == PumpDescription.PERCENT && allowPercentage()) {
result.setUsePercent(true);
apsResult.setUsePercent(true);
}
result.setPercent((int) (result.getRate() / profile.getBasal() * 100));
apsResult.setPercent((int) (apsResult.getRate() / profile.getBasal() * 100));
// check rate for constraints
final APSResult resultAfterConstraints = result.newAndClone(injector);
final APSResult resultAfterConstraints = apsResult.newAndClone(injector);
resultAfterConstraints.setRateConstraint(new Constraint<>(resultAfterConstraints.getRate()));
resultAfterConstraints.setRate(constraintChecker.applyBasalConstraints(resultAfterConstraints.getRateConstraint(), profile).value());
@ -419,7 +408,7 @@ public class LoopPlugin extends PluginBase implements LoopInterface {
}
if (lastRun == null) lastRun = new LastRun();
lastRun.setRequest(result);
lastRun.setRequest(apsResult);
lastRun.setConstraintsProcessed(resultAfterConstraints);
lastRun.setLastAPSRun(DateUtil.now());
lastRun.setSource(((PluginBase) usedAPS).getName());
@ -572,7 +561,7 @@ public class LoopPlugin extends PluginBase implements LoopInterface {
.setPriority(Notification.IMPORTANCE_HIGH)
.setCategory(Notification.CATEGORY_ALARM)
.setVisibility(NotificationCompat.VISIBILITY_PUBLIC);
if (sp.getBoolean("wearcontrol", false)) {
if (sp.getBoolean(R.string.key_wear_control, false)) {
builder.setLocalOnly(true);
}
presentSuggestion(builder);

4
app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt
View file

@ -76,7 +76,7 @@ class ActionStringHandler @Inject constructor(
// TODO Adrian use RxBus instead of Lazy + cross dependency
@Synchronized
fun handleInitiate(actionString: String) {
if (!sp.getBoolean("wearcontrol", false)) return
if (!sp.getBoolean(R.string.key_wear_control, false)) return
lastBolusWizard = null
var rTitle = "CONFIRM" //TODO: i18n
var rMessage = ""
@ -459,7 +459,7 @@ class ActionStringHandler @Inject constructor(
@Synchronized
fun handleConfirmation(actionString: String) {
if (!sp.getBoolean("wearcontrol", false)) return
if (!sp.getBoolean(R.string.key_wear_control, false)) return
//Guard from old or duplicate confirmations
if (lastConfirmActionString == null) return
if (lastConfirmActionString != actionString) return

4
app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java
View file

@ -743,12 +743,12 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
private void sendPreferences() {
if (googleApiClient != null && googleApiClient.isConnected()) {
boolean wearcontrol = sp.getBoolean("wearcontrol", false);
boolean wearcontrol = sp.getBoolean(R.string.key_wear_control, false);
PutDataMapRequest dataMapRequest = PutDataMapRequest.create(NEW_PREFERENCES_PATH);
//unique content
dataMapRequest.getDataMap().putLong("timestamp", System.currentTimeMillis());
dataMapRequest.getDataMap().putBoolean("wearcontrol", wearcontrol);
dataMapRequest.getDataMap().putBoolean(resourceHelper.gs(R.string.key_wear_control), wearcontrol);
PutDataRequest putDataRequest = dataMapRequest.asPutDataRequest();
Wearable.DataApi.putDataItem(googleApiClient, putDataRequest);
} else {

14
app/src/main/res/xml/pref_wear.xml
View file

@ -8,18 +8,18 @@
<SwitchPreference
android:defaultValue="false"
android:key="wearcontrol"
android:key="@string/key_wear_control"
android:summary="@string/wearcontrol_summary"
android:title="@string/wearcontrol_title" />
<PreferenceCategory
android:dependency="wearcontrol"
android:dependency="@string/key_wear_control"
android:summary="@string/wear_wizard_settings_summary"
android:title="@string/wear_wizard_settings">
<CheckBoxPreference
android:defaultValue="true"
android:dependency="wearcontrol"
android:dependency="@string/key_wear_control"
android:key="@string/key_wearwizard_bg"
android:title="@string/treatments_wizard_bg_label" />
@ -31,25 +31,25 @@
<CheckBoxPreference
android:defaultValue="false"
android:dependency="wearcontrol"
android:dependency="@string/key_wear_control"
android:key="@string/key_wearwizard_trend"
android:title="@string/treatments_wizard_bgtrend_label" />
<CheckBoxPreference
android:defaultValue="true"
android:dependency="wearcontrol"
android:dependency="@string/key_wear_control"
android:key="@string/key_wearwizard_cob"
android:title="@string/treatments_wizard_cob_label" />
<CheckBoxPreference
android:defaultValue="true"
android:dependency="wearcontrol"
android:dependency="@string/key_wear_control"
android:key="@string/key_wearwizard_bolusiob"
android:title="@string/treatments_wizard_bolusiob_label" />
<CheckBoxPreference
android:defaultValue="true"
android:dependency="wearcontrol"
android:dependency="@string/key_wear_control"
android:key="@string/key_wearwizard_basaliob"
android:title="@string/treatments_wizard_basaliob_label" />

1
core/src/main/res/values/strings.xml
View file

@ -29,6 +29,7 @@
<string name="key_ns_sync_use_absolute" translatable="false">ns_sync_use_absolute</string>
<string name="key_virtualpump_type" translatable="false">virtualpump_type</string>
<string name="key_quickwizard" translatable="false">QuickWizard</string>
<string name="key_wear_control" translatable="false">wearcontrol</string>
<!-- General-->
<string name="refresh">Refresh</string>