check = checkAscending ? (Double threshold) -> value >= threshold : (Double threshold) -> value <= threshold;
if (value != invalid) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/activities/QuickWizardListActivity.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/activities/QuickWizardListActivity.java
index d7eb9c86dd..85adbf7e80 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/activities/QuickWizardListActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/activities/QuickWizardListActivity.java
@@ -2,11 +2,11 @@ package info.nightscout.androidaps.plugins.general.overview.activities;
import android.app.Activity;
import android.os.Bundle;
-import android.support.v4.app.FragmentManager;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.CardView;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.fragment.app.FragmentManager;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.cardview.widget.CardView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/BolusProgressDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/BolusProgressDialog.java
index 4189fcdcdb..1b41ea0c44 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/BolusProgressDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/BolusProgressDialog.java
@@ -4,7 +4,7 @@ package info.nightscout.androidaps.plugins.general.overview.dialogs;
import android.app.Activity;
import android.os.Bundle;
import android.os.SystemClock;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/BolusProgressHelperActivity.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/BolusProgressHelperActivity.java
index fd1de6ce8c..7ca19d0334 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/BolusProgressHelperActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/BolusProgressHelperActivity.java
@@ -1,7 +1,7 @@
package info.nightscout.androidaps.plugins.general.overview.dialogs;
import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
/**
* Created by adrian on 09/02/17.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/CalibrationDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/CalibrationDialog.java
index 0ab1b98ff6..7ec20254f2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/CalibrationDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/CalibrationDialog.java
@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.general.overview.dialogs;
import android.content.Context;
import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/EditQuickWizardDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/EditQuickWizardDialog.java
index 9cd1277961..248ab30d7c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/EditQuickWizardDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/EditQuickWizardDialog.java
@@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.general.overview.dialogs;
import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/ErrorDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/ErrorDialog.java
index 209a585384..ea8dd8e4bb 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/ErrorDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/ErrorDialog.java
@@ -2,8 +2,9 @@ package info.nightscout.androidaps.plugins.general.overview.dialogs;
import android.content.Intent;
+import android.os.Build;
import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -98,7 +99,10 @@ public class ErrorDialog extends DialogFragment implements View.OnClickListener
private void startAlarm() {
Intent alarm = new Intent(MainApp.instance().getApplicationContext(), AlarmSoundService.class);
alarm.putExtra("soundid", soundId);
- MainApp.instance().startService(alarm);
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
+ MainApp.instance().startForegroundService(alarm);
+ else
+ MainApp.instance().startService(alarm);
}
private void stopAlarm() {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/ErrorHelperActivity.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/ErrorHelperActivity.java
index 667cadf2b1..86e7ac5461 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/ErrorHelperActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/ErrorHelperActivity.java
@@ -1,7 +1,7 @@
package info.nightscout.androidaps.plugins.general.overview.dialogs;
import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
import info.nightscout.androidaps.R;
import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/NewCarbsDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/NewCarbsDialog.java
index 789ced1df3..2a79a17bbd 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/NewCarbsDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/NewCarbsDialog.java
@@ -2,8 +2,8 @@ package info.nightscout.androidaps.plugins.general.overview.dialogs;
import android.os.Bundle;
import android.os.HandlerThread;
-import android.support.v4.app.DialogFragment;
-import android.support.v7.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
+import androidx.appcompat.app.AlertDialog;
import android.text.Editable;
import android.text.Html;
import android.text.TextWatcher;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/NewInsulinDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/NewInsulinDialog.java
index 27e2e33ba7..ab43e0b6f0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/NewInsulinDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/NewInsulinDialog.java
@@ -4,8 +4,8 @@ import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.os.HandlerThread;
-import android.support.v4.app.DialogFragment;
-import android.support.v7.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
+import androidx.appcompat.app.AlertDialog;
import android.text.Editable;
import android.text.Html;
import android.text.TextWatcher;
@@ -225,7 +225,7 @@ public class NewInsulinDialog extends DialogFragment implements OnClickListener
}
}
- if (Math.abs(insulinAfterConstraints - insulin) > pump.getPumpDescription().pumpType.determineCorrectBolusSize(insulinAfterConstraints))
+ if (Math.abs(insulinAfterConstraints - insulin) > pump.getPumpDescription().pumpType.determineCorrectBolusStepSize(insulinAfterConstraints))
actions.add("" + MainApp.gs(R.string.bolusconstraintapplied) + "");
int eatingSoonTTDuration = SP.getInt(R.string.key_eatingsoon_duration, Constants.defaultEatingSoonTTDuration);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/NewTreatmentDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/NewTreatmentDialog.java
index 837d206fb3..c3a9d76fb5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/NewTreatmentDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/NewTreatmentDialog.java
@@ -4,8 +4,8 @@ import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
-import android.support.v7.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
+import androidx.appcompat.app.AlertDialog;
import android.text.Editable;
import android.text.Html;
import android.text.TextWatcher;
@@ -141,7 +141,7 @@ public class NewTreatmentDialog extends DialogFragment implements OnClickListene
if (recordOnlyCheckbox.isChecked()) {
confirmMessage += "
" + MainApp.gs(R.string.bolusrecordedonly) + "";
}
- if (Math.abs(insulinAfterConstraints - insulin) > pump.getPumpDescription().pumpType.determineCorrectBolusSize(insulinAfterConstraints) || !Objects.equals(carbsAfterConstraints, carbs))
+ if (Math.abs(insulinAfterConstraints - insulin) > pump.getPumpDescription().pumpType.determineCorrectBolusStepSize(insulinAfterConstraints) || !Objects.equals(carbsAfterConstraints, carbs))
confirmMessage += "
" + MainApp.gs(R.string.bolusconstraintapplied) + "";
}
if (carbsAfterConstraints > 0)
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 b4a3de4271..9638f3ef9b 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
@@ -2,13 +2,10 @@ package info.nightscout.androidaps.plugins.general.overview.dialogs;
import android.app.Activity;
import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
-import android.support.v7.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
+import androidx.appcompat.app.AlertDialog;
import android.text.Editable;
-import android.text.Html;
import android.text.TextWatcher;
import android.view.LayoutInflater;
import android.view.View;
@@ -28,46 +25,35 @@ import android.widget.TextView;
import com.squareup.otto.Subscribe;
-import org.json.JSONException;
-import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.text.DecimalFormat;
import java.util.ArrayList;
-import java.util.Date;
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.IobTotal;
import info.nightscout.androidaps.data.Profile;
import info.nightscout.androidaps.data.ProfileStore;
import info.nightscout.androidaps.db.BgReading;
-import info.nightscout.androidaps.db.CareportalEvent;
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.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.treatments.TreatmentsPlugin;
-import info.nightscout.androidaps.queue.Callback;
import info.nightscout.androidaps.utils.BolusWizard;
-import info.nightscout.androidaps.utils.DateUtil;
import info.nightscout.androidaps.utils.DecimalFormatter;
import info.nightscout.androidaps.utils.NumberPicker;
import info.nightscout.androidaps.utils.SP;
import info.nightscout.androidaps.utils.SafeParse;
+import info.nightscout.androidaps.utils.StringUtils;
import info.nightscout.androidaps.utils.ToastUtils;
public class WizardDialog extends DialogFragment implements OnClickListener, CompoundButton.OnCheckedChangeListener, Spinner.OnItemSelectedListener {
@@ -108,8 +94,7 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
EditText notesEdit;
Integer calculatedCarbs = 0;
- Double calculatedTotalInsulin = 0d;
- JSONObject boluscalcJSON;
+ BolusWizard wizard;
Context context;
@@ -311,99 +296,8 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
return;
}
okClicked = true;
- final Profile profile = ProfileFunctions.getInstance().getProfile();
- final PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
-
- if (pump != null && profile != null && (calculatedTotalInsulin > 0d || calculatedCarbs > 0d)) {
- String confirmMessage = MainApp.gs(R.string.entertreatmentquestion);
-
- Double insulinAfterConstraints = MainApp.getConstraintChecker().applyBolusConstraints(new Constraint<>(calculatedTotalInsulin)).value();
- Integer carbsAfterConstraints = MainApp.getConstraintChecker().applyCarbsConstraints(new Constraint<>(calculatedCarbs)).value();
-
- if (insulinAfterConstraints > 0)
- confirmMessage += "
" + MainApp.gs(R.string.bolus) + ": " + "" + DecimalFormatter.toPumpSupportedBolus(insulinAfterConstraints) + "U" + "";
- if (carbsAfterConstraints > 0)
- confirmMessage += "
" + MainApp.gs(R.string.carbs) + ": " + "" + carbsAfterConstraints + "g" + "";
-
- if (Math.abs(insulinAfterConstraints - calculatedTotalInsulin) > pump.getPumpDescription().pumpType.determineCorrectBolusSize(insulinAfterConstraints) || !carbsAfterConstraints.equals(calculatedCarbs)) {
- confirmMessage += "
" + MainApp.gs(R.string.bolusconstraintapplied) + "";
- }
-
- final Double finalInsulinAfterConstraints = insulinAfterConstraints;
- final Integer finalCarbsAfterConstraints = carbsAfterConstraints;
- final Double bg = SafeParse.stringToDouble(editBg.getText());
- final int carbTime = SafeParse.stringToInt(editCarbTime.getText());
- final boolean useSuperBolus = superbolusCheckbox.isChecked();
- final String finalNotes = notesEdit.getText().toString();
-
- final AlertDialog.Builder builder = new AlertDialog.Builder(context);
- builder.setTitle(MainApp.gs(R.string.confirmation));
- builder.setMessage(Html.fromHtml(confirmMessage));
- builder.setPositiveButton(MainApp.gs(R.string.ok), new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int id) {
- synchronized (builder) {
- if (accepted) {
- log.debug("guarding: already accepted");
- return;
- }
- accepted = true;
- if (finalInsulinAfterConstraints > 0 || finalCarbsAfterConstraints > 0) {
- if (useSuperBolus) {
- final LoopPlugin loopPlugin = LoopPlugin.getPlugin();
- if (loopPlugin.isEnabled(PluginType.LOOP)) {
- loopPlugin.superBolusTo(System.currentTimeMillis() + 2 * 60L * 60 * 1000);
- MainApp.bus().post(new EventRefreshOverview("WizardDialog"));
- }
- ConfigBuilderPlugin.getPlugin().getCommandQueue().tempBasalPercent(0, 120, true, profile, new Callback() {
- @Override
- public void run() {
- if (!result.success) {
- Intent i = new Intent(MainApp.instance(), ErrorHelperActivity.class);
- i.putExtra("soundid", R.raw.boluserror);
- i.putExtra("status", result.comment);
- i.putExtra("title", MainApp.gs(R.string.tempbasaldeliveryerror));
- i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- MainApp.instance().startActivity(i);
- }
- }
- });
- }
- DetailedBolusInfo detailedBolusInfo = new DetailedBolusInfo();
- detailedBolusInfo.eventType = CareportalEvent.BOLUSWIZARD;
- detailedBolusInfo.insulin = finalInsulinAfterConstraints;
- detailedBolusInfo.carbs = finalCarbsAfterConstraints;
- detailedBolusInfo.context = context;
- detailedBolusInfo.glucose = bg;
- detailedBolusInfo.glucoseType = "Manual";
- detailedBolusInfo.carbTime = carbTime;
- detailedBolusInfo.boluscalc = boluscalcJSON;
- detailedBolusInfo.source = Source.USER;
- detailedBolusInfo.notes = finalNotes;
- if (detailedBolusInfo.insulin > 0 || ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription().storesCarbInfo) {
- ConfigBuilderPlugin.getPlugin().getCommandQueue().bolus(detailedBolusInfo, new Callback() {
- @Override
- public void run() {
- if (!result.success) {
- Intent i = new Intent(MainApp.instance(), ErrorHelperActivity.class);
- i.putExtra("soundid", R.raw.boluserror);
- i.putExtra("status", result.comment);
- i.putExtra("title", MainApp.gs(R.string.treatmentdeliveryerror));
- i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- MainApp.instance().startActivity(i);
- }
- }
- });
- } else {
- TreatmentsPlugin.getPlugin().addToHistoryTreatment(detailedBolusInfo, false);
- }
- }
- }
- }
- });
- builder.setNegativeButton(MainApp.gs(R.string.cancel), null);
- builder.show();
- dismiss();
- }
+ wizard.confirmAndExecute(context);
+ dismiss();
break;
case R.id.cancel:
dismiss();
@@ -450,8 +344,8 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
TreatmentsPlugin.getPlugin().updateTotalIOBTempBasals();
IobTotal basalIob = TreatmentsPlugin.getPlugin().getLastCalculationTempBasals().round();
- bolusIobInsulin.setText(DecimalFormatter.to2Decimal(-bolusIob.iob) + "U");
- basalIobInsulin.setText(DecimalFormatter.to2Decimal(-basalIob.basaliob) + "U");
+ bolusIobInsulin.setText(StringUtils.formatInsulin(-bolusIob.iob));
+ basalIobInsulin.setText(StringUtils.formatInsulin(-basalIob.basaliob));
calculateInsulin();
}
@@ -460,13 +354,13 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
ProfileStore profileStore = ConfigBuilderPlugin.getPlugin().getActiveProfileInterface().getProfile();
if (profileSpinner == null || profileSpinner.getSelectedItem() == null || profileStore == null)
return; // not initialized yet
- String selectedAlternativeProfile = profileSpinner.getSelectedItem().toString();
+ String profileName = profileSpinner.getSelectedItem().toString();
Profile specificProfile;
- if (selectedAlternativeProfile.equals(MainApp.gs(R.string.active))) {
+ if (profileName.equals(MainApp.gs(R.string.active))) {
specificProfile = ProfileFunctions.getInstance().getProfile();
- selectedAlternativeProfile = ProfileFunctions.getInstance().getProfileName();
+ profileName = ProfileFunctions.getInstance().getProfileName();
} else
- specificProfile = profileStore.getSpecificProfile(selectedAlternativeProfile);
+ specificProfile = profileStore.getSpecificProfile(profileName);
// Entered values
Double c_bg = SafeParse.stringToDouble(editBg.getText());
@@ -494,104 +388,61 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
Double c_cob = 0d;
if (cobCheckbox.isChecked()) {
CobInfo cobInfo = IobCobCalculatorPlugin.getPlugin().getCobInfo(false, "Wizard COB");
- if (cobInfo != null && cobInfo.displayCob != null)
+ if (cobInfo.displayCob != null)
c_cob = cobInfo.displayCob;
}
- BolusWizard wizard = new BolusWizard();
- wizard.doCalc(specificProfile, tempTarget, carbsAfterConstraint, c_cob, c_bg, corrAfterConstraint, bolusIobCheckbox.isChecked(), basalIobCheckbox.isChecked(), superbolusCheckbox.isChecked(), bgtrendCheckbox.isChecked());
+ wizard = new BolusWizard(specificProfile, profileName, tempTarget, carbsAfterConstraint, c_cob, c_bg, corrAfterConstraint, 100d, bgCheckbox.isChecked(), cobCheckbox.isChecked(), bolusIobCheckbox.isChecked(), basalIobCheckbox.isChecked(), superbolusCheckbox.isChecked(), ttCheckbox.isChecked(), bgtrendCheckbox.isChecked(), notesEdit.getText().toString(), SafeParse.stringToInt(editCarbTime.getText()));
- bg.setText(c_bg + " ISF: " + DecimalFormatter.to1Decimal(wizard.sens));
- bgInsulin.setText(DecimalFormatter.to2Decimal(wizard.insulinFromBG) + "U");
+ bg.setText(c_bg + " ISF: " + DecimalFormatter.to1Decimal(wizard.getSens()));
+ bgInsulin.setText(StringUtils.formatInsulin(wizard.getInsulinFromBG()));
- carbs.setText(DecimalFormatter.to0Decimal(c_carbs) + "g IC: " + DecimalFormatter.to1Decimal(wizard.ic));
- carbsInsulin.setText(DecimalFormatter.to2Decimal(wizard.insulinFromCarbs) + "U");
+ carbs.setText(DecimalFormatter.to0Decimal(c_carbs) + "g IC: " + DecimalFormatter.to1Decimal(wizard.getIc()));
+ carbsInsulin.setText(StringUtils.formatInsulin(wizard.getInsulinFromCarbs()));
- bolusIobInsulin.setText(DecimalFormatter.to2Decimal(wizard.insulingFromBolusIOB) + "U");
- basalIobInsulin.setText(DecimalFormatter.to2Decimal(wizard.insulingFromBasalsIOB) + "U");
+ bolusIobInsulin.setText(StringUtils.formatInsulin(wizard.getInsulinFromBolusIOB()));
+ basalIobInsulin.setText(StringUtils.formatInsulin(wizard.getInsulinFromBasalsIOB()));
- correctionInsulin.setText(DecimalFormatter.to2Decimal(wizard.insulinFromCorrection) + "U");
- calculatedTotalInsulin = wizard.calculatedTotalInsulin;
+ correctionInsulin.setText(StringUtils.formatInsulin(wizard.getInsulinFromCorrection()));
calculatedCarbs = carbsAfterConstraint;
// Superbolus
- if (superbolusCheckbox.isChecked()) {
- superbolus.setText("2h");
- } else {
- superbolus.setText("");
- }
- superbolusInsulin.setText(DecimalFormatter.to2Decimal(wizard.insulinFromSuperBolus) + "U");
+ superbolus.setText(superbolusCheckbox.isChecked() ? MainApp.gs(R.string.twohours) : "");
+ superbolusInsulin.setText(StringUtils.formatInsulin(wizard.getInsulinFromSuperBolus()));
// Trend
- if (bgtrendCheckbox.isChecked()) {
- if (wizard.glucoseStatus != null) {
- bgTrend.setText((wizard.glucoseStatus.avgdelta > 0 ? "+" : "") + Profile.toUnitsString(wizard.glucoseStatus.avgdelta * 3, wizard.glucoseStatus.avgdelta * 3 / 18, specificProfile.getUnits()) + " " + specificProfile.getUnits());
- } else {
- bgTrend.setText("");
- }
+ if (bgtrendCheckbox.isChecked() && wizard.getGlucoseStatus() != null) {
+ bgTrend.setText(
+ (wizard.getTrend() > 0 ? "+" : "")
+ + Profile.toUnitsString(wizard.getTrend() * 3, wizard.getTrend() * 3 / Constants.MMOLL_TO_MGDL, specificProfile.getUnits())
+ + " " + specificProfile.getUnits());
} else {
bgTrend.setText("");
}
- bgTrendInsulin.setText(DecimalFormatter.to2Decimal(wizard.insulinFromTrend) + "U");
+ bgTrendInsulin.setText(StringUtils.formatInsulin(wizard.getInsulinFromTrend()));
// COB
if (cobCheckbox.isChecked()) {
- cob.setText(DecimalFormatter.to2Decimal(c_cob) + "g IC: " + DecimalFormatter.to1Decimal(wizard.ic));
- cobInsulin.setText(DecimalFormatter.to2Decimal(wizard.insulinFromCOB) + "U");
+ cob.setText(DecimalFormatter.to2Decimal(c_cob) + "g IC: " + DecimalFormatter.to1Decimal(wizard.getIc()));
+ cobInsulin.setText(StringUtils.formatInsulin(wizard.getInsulinFromCOB()));
} else {
cob.setText("");
cobInsulin.setText("");
}
- if (calculatedTotalInsulin > 0d || calculatedCarbs > 0d) {
- String insulinText = calculatedTotalInsulin > 0d ? (DecimalFormatter.toPumpSupportedBolus(calculatedTotalInsulin) + "U") : "";
+ if (wizard.getCalculatedTotalInsulin() > 0d || calculatedCarbs > 0d) {
+ String insulinText = wizard.getCalculatedTotalInsulin() > 0d ? (DecimalFormatter.toPumpSupportedBolus(wizard.getCalculatedTotalInsulin()) + "U") : "";
String carbsText = calculatedCarbs > 0d ? (DecimalFormatter.to0Decimal(calculatedCarbs) + "g") : "";
total.setText(MainApp.gs(R.string.result) + ": " + insulinText + " " + carbsText);
okButton.setVisibility(View.VISIBLE);
} else {
// TODO this should also be run when loading the dialog as the OK button is initially visible
// but does nothing if neither carbs nor insulin is > 0
- total.setText(MainApp.gs(R.string.missing) + " " + DecimalFormatter.to0Decimal(wizard.carbsEquivalent) + "g");
+ total.setText(MainApp.gs(R.string.missing) + " " + DecimalFormatter.to0Decimal(wizard.getCarbsEquivalent()) + "g");
okButton.setVisibility(View.INVISIBLE);
}
- boluscalcJSON = new JSONObject();
- try {
- boluscalcJSON.put("profile", selectedAlternativeProfile);
- boluscalcJSON.put("notes", notesEdit.getText());
- boluscalcJSON.put("eventTime", DateUtil.toISOString(new Date()));
- boluscalcJSON.put("targetBGLow", wizard.targetBGLow);
- boluscalcJSON.put("targetBGHigh", wizard.targetBGHigh);
- boluscalcJSON.put("isf", wizard.sens);
- boluscalcJSON.put("ic", wizard.ic);
- boluscalcJSON.put("iob", -(wizard.insulingFromBolusIOB + wizard.insulingFromBasalsIOB));
- boluscalcJSON.put("bolusiob", wizard.insulingFromBolusIOB);
- boluscalcJSON.put("basaliob", wizard.insulingFromBasalsIOB);
- boluscalcJSON.put("bolusiobused", bolusIobCheckbox.isChecked());
- boluscalcJSON.put("basaliobused", basalIobCheckbox.isChecked());
- boluscalcJSON.put("bg", c_bg);
- boluscalcJSON.put("insulinbg", wizard.insulinFromBG);
- boluscalcJSON.put("insulinbgused", bgCheckbox.isChecked());
- boluscalcJSON.put("bgdiff", wizard.bgDiff);
- boluscalcJSON.put("insulincarbs", wizard.insulinFromCarbs);
- boluscalcJSON.put("carbs", c_carbs);
- boluscalcJSON.put("cob", c_cob);
- boluscalcJSON.put("cobused", cobCheckbox.isChecked());
- boluscalcJSON.put("insulincob", wizard.insulinFromCOB);
- boluscalcJSON.put("othercorrection", corrAfterConstraint);
- boluscalcJSON.put("insulinsuperbolus", wizard.insulinFromSuperBolus);
- boluscalcJSON.put("insulintrend", wizard.insulinFromTrend);
- boluscalcJSON.put("insulin", calculatedTotalInsulin);
- boluscalcJSON.put("superbolusused", superbolusCheckbox.isChecked());
- boluscalcJSON.put("insulinsuperbolus", wizard.insulinFromSuperBolus);
- boluscalcJSON.put("trendused", bgtrendCheckbox.isChecked());
- boluscalcJSON.put("insulintrend", wizard.insulinFromTrend);
- boluscalcJSON.put("trend", bgTrend.getText());
- boluscalcJSON.put("ttused", ttCheckbox.isChecked());
- } catch (JSONException e) {
- log.error("Unhandled exception", e);
- }
}
}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/DismissNotificationService.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/DismissNotificationService.java
index a8d6fca1ba..475aa02332 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/DismissNotificationService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/DismissNotificationService.java
@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.general.overview.notifications;
import android.app.IntentService;
import android.app.PendingIntent;
import android.content.Intent;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationRecyclerViewAdapter.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationRecyclerViewAdapter.java
index de35e4bc8c..6cb5c2fdf4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationRecyclerViewAdapter.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationRecyclerViewAdapter.java
@@ -1,8 +1,8 @@
package info.nightscout.androidaps.plugins.general.overview.notifications;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.CardView;
-import android.support.v7.widget.RecyclerView;
+import androidx.core.content.ContextCompat;
+import androidx.cardview.widget.CardView;
+import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationStore.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationStore.java
index 8d327bf29f..2a94d2c859 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationStore.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationStore.java
@@ -11,7 +11,9 @@ import android.media.AudioAttributes;
import android.media.RingtoneManager;
import android.net.Uri;
import android.os.Build;
-import android.support.v4.app.NotificationCompat;
+import androidx.core.app.NotificationCompat;
+import androidx.recyclerview.widget.RecyclerView;
+import android.view.View;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -21,7 +23,6 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.List;
-import info.nightscout.androidaps.Config;
import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.R;
import info.nightscout.androidaps.logging.L;
@@ -68,14 +69,20 @@ public class NotificationStore {
if (usesChannels && n.soundId != null) {
Intent alarm = new Intent(MainApp.instance().getApplicationContext(), AlarmSoundService.class);
alarm.putExtra("soundid", n.soundId);
- MainApp.instance().startService(alarm);
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
+ MainApp.instance().startForegroundService(alarm);
+ else
+ MainApp.instance().startService(alarm);
}
} else {
if (n.soundId != null) {
Intent alarm = new Intent(MainApp.instance().getApplicationContext(), AlarmSoundService.class);
alarm.putExtra("soundid", n.soundId);
- MainApp.instance().startService(alarm);
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
+ MainApp.instance().startForegroundService(alarm);
+ else
+ MainApp.instance().startService(alarm);
}
}
@@ -97,7 +104,7 @@ public class NotificationStore {
return false;
}
- public synchronized void removeExpired() {
+ private synchronized void removeExpired() {
for (int i = 0; i < store.size(); i++) {
Notification n = store.get(i);
if (n.validTo.getTime() != 0 && n.validTo.getTime() < System.currentTimeMillis()) {
@@ -107,13 +114,13 @@ public class NotificationStore {
}
}
- public void snoozeTo(long timeToSnooze) {
+ void snoozeTo(long timeToSnooze) {
if (L.isEnabled(L.NOTIFICATION))
log.debug("Snoozing alarm until: " + timeToSnooze);
SP.putLong("snoozedTo", timeToSnooze);
}
- public void unSnooze() {
+ private void unSnooze() {
if (Notification.isAlarmForStaleData()) {
Notification notification = new Notification(Notification.NSALARM, MainApp.gs(R.string.nsalarm_staledata), Notification.URGENT);
SP.putLong("snoozedTo", System.currentTimeMillis());
@@ -160,4 +167,16 @@ public class NotificationStore {
}
}
+ public synchronized void updateNotifications(RecyclerView notificationsView) {
+ removeExpired();
+ unSnooze();
+ if (store.size() > 0) {
+ NotificationRecyclerViewAdapter adapter = new NotificationRecyclerViewAdapter(store);
+ notificationsView.setAdapter(adapter);
+ notificationsView.setVisibility(View.VISIBLE);
+ } else {
+ notificationsView.setVisibility(View.GONE);
+ }
+ }
+
}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyService.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyService.java
index 863046c0c4..1400185afa 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyService.java
@@ -4,7 +4,8 @@ import android.app.Notification;
import android.app.Service;
import android.content.Intent;
import android.os.IBinder;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.Nullable;
import com.squareup.otto.Subscribe;
@@ -29,9 +30,8 @@ public class DummyService extends Service {
@Override
public int onStartCommand(Intent intent, int flags, int startId) {
- Notification notification = PersistentNotificationPlugin.getPlugin().updateNotification();
- if (notification != null)
- startForeground(PersistentNotificationPlugin.ONGOING_NOTIFICATION_ID, notification);
+ super.onStartCommand(intent, flags, startId);
+ startForeground(PersistentNotificationPlugin.ONGOING_NOTIFICATION_ID, PersistentNotificationPlugin.getPlugin().updateNotification());
return START_STICKY;
}
@@ -45,6 +45,11 @@ public class DummyService extends Service {
@Override
public void onCreate() {
+ super.onCreate();
+ // TODO: I guess this was moved here in order to adhere to the 5 seconds rule to call "startForeground" after a Service was called as Foreground service?
+ // As onCreate() is not called every time a service is started, copied to onStartCommand().
+ Notification notification = PersistentNotificationPlugin.getPlugin().updateNotification();
+ startForeground(PersistentNotificationPlugin.ONGOING_NOTIFICATION_ID, notification);
MainApp.bus().register(this);
}
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 987d9374bd..9dcb800033 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
@@ -10,17 +10,19 @@ import android.content.Intent;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.os.Build;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.app.RemoteInput;
-import android.support.v4.app.TaskStackBuilder;
+
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.RemoteInput;
+import androidx.core.app.TaskStackBuilder;
import com.squareup.otto.Subscribe;
+import javax.annotation.Nonnull;
+
import info.nightscout.androidaps.Constants;
import info.nightscout.androidaps.MainActivity;
import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus;
import info.nightscout.androidaps.data.IobTotal;
import info.nightscout.androidaps.db.BgReading;
import info.nightscout.androidaps.db.DatabaseHelper;
@@ -37,6 +39,7 @@ import info.nightscout.androidaps.interfaces.PluginDescription;
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.GlucoseStatus;
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventAutosensCalculationFinished;
import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
@@ -49,6 +52,7 @@ import info.nightscout.androidaps.utils.DecimalFormatter;
public class PersistentNotificationPlugin extends PluginBase {
private static PersistentNotificationPlugin plugin;
+ private Notification notification;
public static PersistentNotificationPlugin getPlugin() {
if (plugin == null) plugin = new PersistentNotificationPlugin(MainApp.instance());
@@ -72,13 +76,14 @@ public class PersistentNotificationPlugin extends PluginBase {
/// End Android Auto
- public PersistentNotificationPlugin(Context ctx) {
+ private PersistentNotificationPlugin(Context ctx) {
super(new PluginDescription()
.mainType(PluginType.GENERAL)
.neverVisible(true)
.pluginName(R.string.ongoingnotificaction)
.enableByDefault(true)
- .alwaysEnabled(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
+ .alwaysEnabled(true)
+ .showInList(false)
.description(R.string.description_persistent_notification)
);
this.ctx = ctx;
@@ -86,8 +91,8 @@ public class PersistentNotificationPlugin extends PluginBase {
@Override
protected void onStart() {
+ createNotificationChannel(); // make sure channels exist before triggering updates through the bus
MainApp.bus().register(this);
- createNotificationChannel();
triggerNotificationUpdate();
super.onStart();
}
@@ -111,105 +116,107 @@ public class PersistentNotificationPlugin extends PluginBase {
}
private void triggerNotificationUpdate() {
- MainApp.instance().startService(new Intent(MainApp.instance(), DummyService.class));
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
+ MainApp.instance().startForegroundService(new Intent(MainApp.instance(), DummyService.class));
+ else
+ MainApp.instance().startService(new Intent(MainApp.instance(), DummyService.class));
}
+ @Nonnull
Notification updateNotification() {
- if (!isEnabled(PluginType.GENERAL)) {
- return null;
- }
+ String line1 = null;
+ String line2 = null;
+ String line3 = null;
+ NotificationCompat.CarExtender.UnreadConversation.Builder unreadConversationBuilder = null;
- String line1;
- String line1_aa;
-
- if (ConfigBuilderPlugin.getPlugin().getActiveProfileInterface() == null || !ProfileFunctions.getInstance().isProfileValid("Notificiation"))
- return null;
- String units = ProfileFunctions.getInstance().getProfileUnits();
+ if (ConfigBuilderPlugin.getPlugin().getActiveProfileInterface() != null && ProfileFunctions.getInstance().isProfileValid("Notification")) {
+ String line1_aa;
+ String units = ProfileFunctions.getInstance().getProfileUnits();
- BgReading lastBG = DatabaseHelper.lastBg();
- GlucoseStatus glucoseStatus = GlucoseStatus.getGlucoseStatusData();
+ BgReading lastBG = DatabaseHelper.lastBg();
+ GlucoseStatus glucoseStatus = GlucoseStatus.getGlucoseStatusData();
- if (lastBG != null) {
- line1 = line1_aa = lastBG.valueToUnitsToString(units);
- if (glucoseStatus != null) {
- line1 += " Δ" + deltastring(glucoseStatus.delta, glucoseStatus.delta * Constants.MGDL_TO_MMOLL, units)
- + " avgΔ" + deltastring(glucoseStatus.avgdelta, glucoseStatus.avgdelta * Constants.MGDL_TO_MMOLL, units);
- line1_aa += " " + lastBG.directionToSymbol();
+ if (lastBG != null) {
+ line1 = line1_aa = lastBG.valueToUnitsToString(units);
+ if (glucoseStatus != null) {
+ line1 += " Δ" + deltastring(glucoseStatus.delta, glucoseStatus.delta * Constants.MGDL_TO_MMOLL, units)
+ + " avgΔ" + deltastring(glucoseStatus.avgdelta, glucoseStatus.avgdelta * Constants.MGDL_TO_MMOLL, units);
+ line1_aa += " " + lastBG.directionToSymbol();
+ } else {
+ line1 += " " +
+ MainApp.gs(R.string.old_data) +
+ " ";
+ line1_aa += line1 + ".";
+ }
} else {
- line1 += " " +
- MainApp.gs(R.string.old_data) +
- " ";
- line1_aa += line1 + ".";
+ line1 = line1_aa = MainApp.gs(R.string.missed_bg_readings);
}
- } else {
- line1 = line1_aa = MainApp.gs(R.string.missed_bg_readings);
+
+ TemporaryBasal activeTemp = TreatmentsPlugin.getPlugin().getTempBasalFromHistory(System.currentTimeMillis());
+ if (activeTemp != null) {
+ line1 += " " + activeTemp.toStringShort();
+ line1_aa += " " + activeTemp.toStringShort() + ".";
+ }
+
+ //IOB
+ TreatmentsPlugin.getPlugin().updateTotalIOBTreatments();
+ TreatmentsPlugin.getPlugin().updateTotalIOBTempBasals();
+ IobTotal bolusIob = TreatmentsPlugin.getPlugin().getLastCalculationTreatments().round();
+ IobTotal basalIob = TreatmentsPlugin.getPlugin().getLastCalculationTempBasals().round();
+
+
+ line2 = MainApp.gs(R.string.treatments_iob_label_string) + " " + DecimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob) + "U " + MainApp.gs(R.string.cob) + ": " + IobCobCalculatorPlugin.getPlugin().getCobInfo(false, "PersistentNotificationPlugin").generateCOBString();
+ String line2_aa = MainApp.gs(R.string.treatments_iob_label_string) + " " + DecimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob) + "U. " + MainApp.gs(R.string.cob) + ": " + IobCobCalculatorPlugin.getPlugin().getCobInfo(false, "PersistentNotificationPlugin").generateCOBString() + ".";
+
+
+ line3 = DecimalFormatter.to2Decimal(ConfigBuilderPlugin.getPlugin().getActivePump().getBaseBasalRate()) + " U/h";
+ String line3_aa = DecimalFormatter.to2Decimal(ConfigBuilderPlugin.getPlugin().getActivePump().getBaseBasalRate()) + " U/h.";
+
+
+ line3 += " - " + ProfileFunctions.getInstance().getProfileName();
+ line3_aa += " - " + ProfileFunctions.getInstance().getProfileName() + ".";
+
+ /// For Android Auto
+ Intent msgReadIntent = new Intent()
+ .addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
+ .setAction(READ_ACTION)
+ .putExtra(CONVERSATION_ID, ONGOING_NOTIFICATION_ID)
+ .setPackage(PACKAGE);
+
+ PendingIntent msgReadPendingIntent =
+ PendingIntent.getBroadcast(ctx,
+ ONGOING_NOTIFICATION_ID,
+ msgReadIntent,
+ PendingIntent.FLAG_UPDATE_CURRENT);
+
+ Intent msgReplyIntent = new Intent()
+ .addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
+ .setAction(REPLY_ACTION)
+ .putExtra(CONVERSATION_ID, ONGOING_NOTIFICATION_ID)
+ .setPackage(PACKAGE);
+
+ PendingIntent msgReplyPendingIntent = PendingIntent.getBroadcast(
+ ctx,
+ ONGOING_NOTIFICATION_ID,
+ msgReplyIntent,
+ PendingIntent.FLAG_UPDATE_CURRENT);
+
+ // Build a RemoteInput for receiving voice input from devices
+ RemoteInput remoteInput = new RemoteInput.Builder(EXTRA_VOICE_REPLY).build();
+
+ // Create the UnreadConversation
+ unreadConversationBuilder =
+ new NotificationCompat.CarExtender.UnreadConversation.Builder(line1_aa + "\n" + line2_aa)
+ .setLatestTimestamp(System.currentTimeMillis())
+ .setReadPendingIntent(msgReadPendingIntent)
+ .setReplyAction(msgReplyPendingIntent, remoteInput);
+
+ /// Add dot to produce a "more natural sounding result"
+ unreadConversationBuilder.addMessage(line3_aa);
+ /// End Android Auto
}
- TemporaryBasal activeTemp = TreatmentsPlugin.getPlugin().getTempBasalFromHistory(System.currentTimeMillis());
- if (activeTemp != null) {
- line1 += " " + activeTemp.toStringShort();
- line1_aa += " " + activeTemp.toStringShort() + ".";
- }
-
- //IOB
- TreatmentsPlugin.getPlugin().updateTotalIOBTreatments();
- TreatmentsPlugin.getPlugin().updateTotalIOBTempBasals();
- IobTotal bolusIob = TreatmentsPlugin.getPlugin().getLastCalculationTreatments().round();
- IobTotal basalIob = TreatmentsPlugin.getPlugin().getLastCalculationTempBasals().round();
-
-
- String line2 = MainApp.gs(R.string.treatments_iob_label_string) + " " + DecimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob) + "U " + MainApp.gs(R.string.cob) + ": " + IobCobCalculatorPlugin.getPlugin().getCobInfo(false, "PersistentNotificationPlugin").generateCOBString();
- String line2_aa = MainApp.gs(R.string.treatments_iob_label_string) + " " + DecimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob) + "U. " + MainApp.gs(R.string.cob) + ": " + IobCobCalculatorPlugin.getPlugin().getCobInfo(false, "PersistentNotificationPlugin").generateCOBString() + ".";
-
-
- String line3 = DecimalFormatter.to2Decimal(ConfigBuilderPlugin.getPlugin().getActivePump().getBaseBasalRate()) + " U/h";
- String line3_aa = DecimalFormatter.to2Decimal(ConfigBuilderPlugin.getPlugin().getActivePump().getBaseBasalRate()) + " U/h.";
-
-
- line3 += " - " + ProfileFunctions.getInstance().getProfileName();
- line3_aa += " - " + ProfileFunctions.getInstance().getProfileName() + ".";
-
- /// For Android Auto
- Intent msgReadIntent = new Intent()
- .addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
- .setAction(READ_ACTION)
- .putExtra(CONVERSATION_ID, ONGOING_NOTIFICATION_ID)
- .setPackage(PACKAGE);
-
- PendingIntent msgReadPendingIntent =
- PendingIntent.getBroadcast(ctx,
- ONGOING_NOTIFICATION_ID,
- msgReadIntent,
- PendingIntent.FLAG_UPDATE_CURRENT);
-
- Intent msgReplyIntent = new Intent()
- .addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
- .setAction(REPLY_ACTION)
- .putExtra(CONVERSATION_ID, ONGOING_NOTIFICATION_ID)
- .setPackage(PACKAGE);
-
- PendingIntent msgReplyPendingIntent = PendingIntent.getBroadcast(
- ctx,
- ONGOING_NOTIFICATION_ID,
- msgReplyIntent,
- PendingIntent.FLAG_UPDATE_CURRENT);
-
- // Build a RemoteInput for receiving voice input from devices
- RemoteInput remoteInput = new RemoteInput.Builder(EXTRA_VOICE_REPLY).build();
-
- // Create the UnreadConversation
- NotificationCompat.CarExtender.UnreadConversation.Builder unreadConversationBuilder =
- new NotificationCompat.CarExtender.UnreadConversation.Builder(line1_aa + "\n" + line2_aa)
- .setLatestTimestamp(System.currentTimeMillis())
- .setReadPendingIntent(msgReadPendingIntent)
- .setReplyAction(msgReplyPendingIntent, remoteInput);
-
- /// Add dot to produce a "more natural sounding result"
- unreadConversationBuilder.addMessage(line3_aa);
- /// End Android Auto
-
-
NotificationCompat.Builder builder = new NotificationCompat.Builder(ctx, CHANNEL_ID);
builder.setOngoing(true);
builder.setOnlyAlertOnce(true);
@@ -217,12 +224,14 @@ public class PersistentNotificationPlugin extends PluginBase {
builder.setSmallIcon(MainApp.getNotificationIcon());
Bitmap largeIcon = BitmapFactory.decodeResource(ctx.getResources(), MainApp.getIcon());
builder.setLargeIcon(largeIcon);
- builder.setContentTitle(line1);
- builder.setContentText(line2);
- builder.setSubText(line3);
+ builder.setContentTitle(line1 != null ? line1 : MainApp.gs(R.string.noprofileset));
+ builder.setContentText(line2 != null ? line2 : MainApp.gs(R.string.noprofileset));
+ builder.setSubText(line3 != null ? line3 : MainApp.gs(R.string.noprofileset));
/// Android Auto
- builder.extend(new NotificationCompat.CarExtender()
- .setUnreadConversation(unreadConversationBuilder.build()));
+ if (unreadConversationBuilder != null) {
+ builder.extend(new NotificationCompat.CarExtender()
+ .setUnreadConversation(unreadConversationBuilder.build()));
+ }
/// End Android Auto
@@ -242,6 +251,7 @@ public class PersistentNotificationPlugin extends PluginBase {
android.app.Notification notification = builder.build();
mNotificationManager.notify(ONGOING_NOTIFICATION_ID, notification);
+ this.notification = notification;
return notification;
}
@@ -261,6 +271,17 @@ public class PersistentNotificationPlugin extends PluginBase {
return deltastring;
}
+ /***
+ * returns the current ongoing notification.
+ *
+ * If it does not exist, return a dummy notification. This should only happen if onStart() wasn't called.
+ */
+
+ public Notification getLastNotification() {
+ if (notification != null) return notification;
+ else return new Notification();
+ }
+
@Subscribe
public void onStatusEvent(final EventPreferenceChange ev) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/versionChecker/VersionCheckerUtils.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/versionChecker/VersionCheckerUtils.kt
index 8791030abb..daebb5deb6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/versionChecker/VersionCheckerUtils.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/versionChecker/VersionCheckerUtils.kt
@@ -9,29 +9,21 @@ import info.nightscout.androidaps.logging.L
import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
import info.nightscout.androidaps.utils.SP
-import org.apache.http.HttpResponse
-import org.apache.http.client.methods.HttpGet
-import org.apache.http.impl.client.DefaultHttpClient
import org.slf4j.LoggerFactory
import java.io.IOException
-import java.io.InputStream
+import java.net.URL
import java.util.concurrent.TimeUnit
+
// check network connection
fun isConnected(): Boolean {
val connMgr = MainApp.instance().applicationContext.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
return connMgr.activeNetworkInfo?.isConnected ?: false
}
-// convert inputstream to String
-@Throws(IOException::class)
-inline fun InputStream.findVersion(): String? {
+fun findVersion(file :String?): String? {
val regex = "(.*)version(.*)\"(((\\d+)\\.)+(\\d+))\"(.*)".toRegex()
- return bufferedReader()
- .readLines()
- .filter { regex.matches(it) }
- .mapNotNull { regex.matchEntire(it)?.groupValues?.getOrNull(3) }
- .firstOrNull()
+ return file?.lines()?.filter { regex.matches(it) }?.mapNotNull { regex.matchEntire(it)?.groupValues?.getOrNull(3) }?.firstOrNull()
}
private val log = LoggerFactory.getLogger(L.CORE)
@@ -39,24 +31,21 @@ private val log = LoggerFactory.getLogger(L.CORE)
fun triggerCheckVersion() {
- if(!SP.contains(R.string.key_last_time_this_version_detected)) {
+ if (!SP.contains(R.string.key_last_time_this_version_detected)) {
// On a new installation, set it as 30 days old in order to warn that there is a new version.
SP.putLong(R.string.key_last_time_this_version_detected, System.currentTimeMillis() - TimeUnit.DAYS.toMillis(30))
}
// If we are good, only check once every day.
- if(System.currentTimeMillis() > SP.getLong(R.string.key_last_time_this_version_detected, 0) + CHECK_EVERY){
+ if (System.currentTimeMillis() > SP.getLong(R.string.key_last_time_this_version_detected, 0) + CHECK_EVERY) {
checkVersion()
}
}
-@Suppress("DEPRECATION")
private fun checkVersion() = if (isConnected()) {
Thread {
try {
- val request = HttpGet("https://raw.githubusercontent.com/MilosKozak/AndroidAPS/master/app/build.gradle")
- val response: HttpResponse = DefaultHttpClient().execute(request)
- val version: String? = response.entity.content?.findVersion()
+ val version: String? = findVersion(URL("https://raw.githubusercontent.com/MilosKozak/AndroidAPS/master/app/build.gradle").readText())
compareWithCurrentVersion(version, BuildConfig.VERSION_NAME)
} catch (e: IOException) {
log.debug("Github master version check error: $e")
@@ -90,7 +79,7 @@ fun onVersionNotDetectable() {
fun onNewVersionDetected(currentVersion: String, newVersion: String?) {
val now = System.currentTimeMillis()
- if(now > SP.getLong(R.string.key_last_versionchecker_warning, 0) + WARN_EVERY) {
+ if (now > SP.getLong(R.string.key_last_versionchecker_warning, 0) + WARN_EVERY) {
log.debug("Version ${currentVersion} outdated. Found $newVersion")
val notification = Notification(Notification.NEWVERSIONDETECTED, String.format(MainApp.gs(R.string.versionavailable), newVersion.toString()), Notification.LOW)
MainApp.bus().post(EventNewNotification(notification))
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 1a01a783cd..addc6517ec 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
@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.general.wear;
import android.app.NotificationManager;
import android.content.Context;
import android.os.HandlerThread;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
import java.text.DateFormat;
import java.text.DecimalFormat;
@@ -207,6 +207,7 @@ public class ActionStringHandler {
int percentage = Integer.parseInt(act[2]);
Profile profile = ProfileFunctions.getInstance().getProfile();
+ String profileName = ProfileFunctions.getInstance().getProfileName();
if (profile == null) {
sendError("No profile found!");
return;
@@ -226,45 +227,38 @@ public class ActionStringHandler {
DecimalFormat format = new DecimalFormat("0.00");
DecimalFormat formatInt = new DecimalFormat("0");
- BolusWizard bolusWizard = new BolusWizard();
- bolusWizard.doCalc(profile, useTT ? TreatmentsPlugin.getPlugin().getTempTargetFromHistory() : null,
- carbsAfterConstraints, useCOB?cobInfo.displayCob:0d, useBG ? bgReading.valueToUnits(profile.getUnits()) : 0d,
- 0d, percentage, useBolusIOB, useBasalIOB, false, useTrend);
+ BolusWizard bolusWizard = new BolusWizard(profile, profileName, TreatmentsPlugin.getPlugin().getTempTargetFromHistory(),
+ carbsAfterConstraints, cobInfo.displayCob, bgReading.valueToUnits(profile.getUnits()),
+ 0d, percentage, useBG, useCOB, useBolusIOB, useBasalIOB, false, useTT, useTrend);
- Double insulinAfterConstraints = MainApp.getConstraintChecker().applyBolusConstraints(new Constraint<>(bolusWizard.calculatedTotalInsulin)).value();
- if (Math.abs(insulinAfterConstraints - bolusWizard.calculatedTotalInsulin) >= 0.01) {
+ if (Math.abs(bolusWizard.getInsulinAfterConstraints() - bolusWizard.getCalculatedTotalInsulin()) >= 0.01) {
sendError("Insulin constraint violation!" +
- "\nCannot deliver " + format.format(bolusWizard.calculatedTotalInsulin) + "!");
+ "\nCannot deliver " + format.format(bolusWizard.getCalculatedTotalInsulin()) + "!");
return;
}
-
- if (bolusWizard.calculatedTotalInsulin < 0) {
- bolusWizard.calculatedTotalInsulin = 0d;
- }
-
- if (bolusWizard.calculatedTotalInsulin <= 0 && bolusWizard.carbs <= 0) {
+ if (bolusWizard.getCalculatedTotalInsulin() <= 0 && bolusWizard.getCarbs() <= 0) {
rAction = "info";
rTitle = "INFO";
} else {
rAction = actionstring;
}
- rMessage += "Carbs: " + bolusWizard.carbs + "g";
- rMessage += "\nBolus: " + format.format(bolusWizard.calculatedTotalInsulin) + "U";
+ rMessage += "Carbs: " + bolusWizard.getCarbs() + "g";
+ rMessage += "\nBolus: " + format.format(bolusWizard.getCalculatedTotalInsulin()) + "U";
rMessage += "\n_____________";
- rMessage += "\nCalc (IC:" + DecimalFormatter.to1Decimal(bolusWizard.ic) + ", " + "ISF:" + DecimalFormatter.to1Decimal(bolusWizard.sens) + "): ";
- rMessage += "\nFrom Carbs: " + format.format(bolusWizard.insulinFromCarbs) + "U";
+ rMessage += "\nCalc (IC:" + DecimalFormatter.to1Decimal(bolusWizard.getIc()) + ", " + "ISF:" + DecimalFormatter.to1Decimal(bolusWizard.getSens()) + "): ";
+ rMessage += "\nFrom Carbs: " + format.format(bolusWizard.getInsulinFromCarbs()) + "U";
if (useCOB)
- rMessage += "\nFrom" + formatInt.format(cobInfo.displayCob) + "g COB : " + format.format(bolusWizard.insulinFromCOB) + "U";
- if (useBG) rMessage += "\nFrom BG: " + format.format(bolusWizard.insulinFromBG) + "U";
+ rMessage += "\nFrom" + formatInt.format(cobInfo.displayCob) + "g COB : " + format.format(bolusWizard.getInsulinFromCOB()) + "U";
+ if (useBG) rMessage += "\nFrom BG: " + format.format(bolusWizard.getInsulinFromBG()) + "U";
if (useBolusIOB)
- rMessage += "\nBolus IOB: " + format.format(bolusWizard.insulingFromBolusIOB) + "U";
+ rMessage += "\nBolus IOB: " + format.format(bolusWizard.getInsulinFromBolusIOB()) + "U";
if (useBasalIOB)
- rMessage += "\nBasal IOB: " + format.format(bolusWizard.insulingFromBasalsIOB) + "U";
+ rMessage += "\nBasal IOB: " + format.format(bolusWizard.getInsulinFromBasalsIOB()) + "U";
if (useTrend)
- rMessage += "\nFrom 15' trend: " + format.format(bolusWizard.insulinFromTrend) + "U";
+ rMessage += "\nFrom 15' trend: " + format.format(bolusWizard.getInsulinFromTrend()) + "U";
if (percentage != 100) {
- rMessage += "\nPercentage: " + format.format(bolusWizard.totalBeforePercentageAdjustment) + "U * " + percentage + "% -> ~" + format.format(bolusWizard.calculatedTotalInsulin) + "U";
+ rMessage += "\nPercentage: " + format.format(bolusWizard.getTotalBeforePercentageAdjustment()) + "U * " + percentage + "% -> ~" + format.format(bolusWizard.getCalculatedTotalInsulin()) + "U";
}
lastBolusWizard = bolusWizard;
@@ -628,7 +622,7 @@ public class ActionStringHandler {
if (lastBolusWizard != null) {
//use last calculation as confirmed string matches
- doBolus(lastBolusWizard.calculatedTotalInsulin, lastBolusWizard.carbs);
+ doBolus(lastBolusWizard.getCalculatedTotalInsulin(), lastBolusWizard.getCarbs());
lastBolusWizard = null;
}
} else if ("bolus".equals(act[0])) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/WearFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/WearFragment.java
index 701784e9d9..9eb157de24 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/WearFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/WearFragment.java
@@ -1,7 +1,7 @@
package info.nightscout.androidaps.plugins.general.wear;
import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
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 d121c5c55d..6f2f59faa1 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
@@ -17,7 +17,7 @@ import android.os.Bundle;
import android.os.Handler;
import android.os.HandlerThread;
import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
import android.util.Log;
import com.google.android.gms.common.ConnectionResult;
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 fe89cc8304..2421a1561e 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
@@ -5,7 +5,7 @@ import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
import com.squareup.otto.Subscribe;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinFragment.java
index bcf445d0d1..02e9256a8a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinFragment.java
@@ -1,7 +1,7 @@
package info.nightscout.androidaps.plugins.insulin;
import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/CobInfo.java b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/CobInfo.java
index 12d5cd5c11..fb99067008 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/CobInfo.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/CobInfo.java
@@ -1,7 +1,7 @@
package info.nightscout.androidaps.plugins.iob.iobCobCalculator;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import info.nightscout.androidaps.utils.DecimalFormatter;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/GlucoseStatus.java b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/GlucoseStatus.java
index 191ce9e1cd..159c5865af 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/GlucoseStatus.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/GlucoseStatus.java
@@ -1,6 +1,6 @@
package info.nightscout.androidaps.plugins.iob.iobCobCalculator;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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 94b687b863..c98de7c8be 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
@@ -1,9 +1,9 @@
package info.nightscout.androidaps.plugins.iob.iobCobCalculator;
import android.os.SystemClock;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.util.LongSparseArray;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.collection.LongSparseArray;
import com.squareup.otto.Subscribe;
@@ -391,28 +391,30 @@ public class IobCobCalculatorPlugin extends PluginBase {
}
public BasalData getBasalData(Profile profile, long time) {
- long now = System.currentTimeMillis();
- time = roundUpTime(time);
- BasalData retval = basalDataTable.get(time);
- if (retval == null) {
- retval = new BasalData();
- TemporaryBasal tb = TreatmentsPlugin.getPlugin().getTempBasalFromHistory(time);
- retval.basal = profile.getBasal(time);
- if (tb != null) {
- retval.isTempBasalRunning = true;
- retval.tempBasalAbsolute = tb.tempBasalConvertedToAbsolute(time, profile);
+ synchronized (dataLock) {
+ long now = System.currentTimeMillis();
+ time = roundUpTime(time);
+ BasalData retval = basalDataTable.get(time);
+ if (retval == null) {
+ retval = new BasalData();
+ TemporaryBasal tb = TreatmentsPlugin.getPlugin().getTempBasalFromHistory(time);
+ retval.basal = profile.getBasal(time);
+ if (tb != null) {
+ retval.isTempBasalRunning = true;
+ retval.tempBasalAbsolute = tb.tempBasalConvertedToAbsolute(time, profile);
+ } else {
+ retval.isTempBasalRunning = false;
+ retval.tempBasalAbsolute = retval.basal;
+ }
+ if (time < now) {
+ basalDataTable.append(time, retval);
+ }
+ //log.debug(">>> getBasalData Cache miss " + new Date(time).toLocaleString());
} else {
- retval.isTempBasalRunning = false;
- retval.tempBasalAbsolute = retval.basal;
+ //log.debug(">>> getBasalData Cache hit " + new Date(time).toLocaleString());
}
- if (time < now) {
- basalDataTable.append(time, retval);
- }
- //log.debug(">>> getBasalData Cache miss " + new Date(time).toLocaleString());
- } else {
- //log.debug(">>> getBasalData Cache hit " + new Date(time).toLocaleString());
+ return retval;
}
- return retval;
}
@Nullable
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 c483ffd2a6..8ca13a6694 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
@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.iob.iobCobCalculator;
import android.content.Context;
import android.os.PowerManager;
import android.os.SystemClock;
-import android.support.v4.util.LongSparseArray;
+import androidx.collection.LongSparseArray;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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 9ddf18abb0..943637fd4e 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
@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.iob.iobCobCalculator;
import android.content.Context;
import android.os.PowerManager;
import android.os.SystemClock;
-import android.support.v4.util.LongSparseArray;
+import androidx.collection.LongSparseArray;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfileFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfileFragment.java
index ec5dc55fa8..9fe86c087f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfileFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfileFragment.java
@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.profile.local;
import android.app.Activity;
import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
import android.text.Editable;
import android.text.TextWatcher;
import android.view.LayoutInflater;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfilePlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfilePlugin.java
index 06f979876c..089611b40d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfilePlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfilePlugin.java
@@ -1,6 +1,6 @@
package info.nightscout.androidaps.plugins.profile.local;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
import org.json.JSONArray;
import org.json.JSONException;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/profile/ns/NSProfilePlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/profile/ns/NSProfilePlugin.java
index 11c38d1492..f741316732 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/profile/ns/NSProfilePlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/profile/ns/NSProfilePlugin.java
@@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.profile.ns;
import android.content.Intent;
import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import org.json.JSONException;
import org.json.JSONObject;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboFragment.java
index a533821d59..1a924fa9f5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboFragment.java
@@ -5,7 +5,7 @@ import android.app.Activity;
import android.graphics.Color;
import android.graphics.Typeface;
import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
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 557ba42168..6edfbd1679 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
@@ -2,10 +2,10 @@ package info.nightscout.androidaps.plugins.pump.combo;
import android.content.DialogInterface;
import android.os.SystemClock;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.FragmentActivity;
-import android.support.v7.app.AlertDialog;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.FragmentActivity;
+import androidx.appcompat.app.AlertDialog;
import org.json.JSONObject;
import org.slf4j.Logger;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPump.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPump.java
index cfe459fb58..c5d7fa0115 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPump.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPump.java
@@ -1,7 +1,7 @@
package info.nightscout.androidaps.plugins.pump.combo;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import java.util.ArrayList;
import java.util.List;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/CommandResult.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/CommandResult.java
index 180f10f69d..9febf0e86a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/CommandResult.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/CommandResult.java
@@ -1,6 +1,6 @@
package info.nightscout.androidaps.plugins.pump.combo.ruffyscripter;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import java.util.LinkedList;
import java.util.List;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/RuffyScripter.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/RuffyScripter.java
index eb01c92c60..19603d99e6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/RuffyScripter.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/RuffyScripter.java
@@ -7,8 +7,8 @@ import android.content.ServiceConnection;
import android.os.IBinder;
import android.os.RemoteException;
import android.os.SystemClock;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import com.google.common.base.Joiner;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/WarningOrErrorCode.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/WarningOrErrorCode.java
index ae4723046e..7692afe84e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/WarningOrErrorCode.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/WarningOrErrorCode.java
@@ -1,6 +1,6 @@
package info.nightscout.androidaps.plugins.pump.combo.ruffyscripter;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
public class WarningOrErrorCode {
@Nullable
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/BaseCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/BaseCommand.java
index 6cd89f2938..1de9392cba 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/BaseCommand.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/BaseCommand.java
@@ -1,6 +1,6 @@
package info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.commands;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
import org.monkey.d.ruffy.ruffy.driver.display.MenuAttribute;
import org.monkey.d.ruffy.ruffy.driver.display.MenuType;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadHistoryCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadHistoryCommand.java
index 5f23b7e66d..b50ccaeb2c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadHistoryCommand.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadHistoryCommand.java
@@ -1,6 +1,6 @@
package info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.commands;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
import org.monkey.d.ruffy.ruffy.driver.display.MenuAttribute;
import org.monkey.d.ruffy.ruffy.driver.display.MenuType;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/PumpHistory.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/PumpHistory.java
index 0fffe13c50..b9e9c704a0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/PumpHistory.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/PumpHistory.java
@@ -1,6 +1,6 @@
package info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
import java.util.ArrayList;
import java.util.LinkedList;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpType.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpType.java
index 9a7e351bf1..df92114ea4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpType.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpType.java
@@ -7,83 +7,83 @@ import java.util.Map;
import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.R;
import info.nightscout.androidaps.plugins.pump.common.data.DoseSettings;
-
+import info.nightscout.androidaps.utils.Round;
/**
* Created by andy on 02/05/2018.
- *
+ *
* Most of this defintions is intended for VirtualPump only, but they can be used by other plugins.
*/
public enum PumpType {
GenericAAPS("Generic AAPS", 0.1d, null, //
- new DoseSettings(0.05d, 30, 8*60, 0.05d), //
+ new DoseSettings(0.05d, 30, 8 * 60, 0.05d), //
PumpTempBasalType.Percent, //
- new DoseSettings(10,30, 24*60, 0d, 500d), PumpCapability.BasalRate_Duration15and30minAllowed, //
+ new DoseSettings(10, 30, 24 * 60, 0d, 500d), PumpCapability.BasalRate_Duration15and30minAllowed, //
0.01d, 0.01d, null, PumpCapability.VirtualPumpCapabilities), //
// Cellnovo
Cellnovo1("Cellnovo", 0.05d, null, //
- new DoseSettings(0.05d, 30, 24*60, 1d, null),
+ new DoseSettings(0.05d, 30, 24 * 60, 1d, null),
PumpTempBasalType.Percent,
- new DoseSettings(5,30, 24*60, 0d, 200d), PumpCapability.BasalRate_Duration30minAllowed, //
+ new DoseSettings(5, 30, 24 * 60, 0d, 200d), PumpCapability.BasalRate_Duration30minAllowed, //
0.05d, 0.05d, null, PumpCapability.VirtualPumpCapabilities), //
// Accu-Chek
AccuChekCombo("Accu-Chek Combo", 0.1d, null, //
- new DoseSettings(0.1d, 15, 12*60, 0.1d), //
+ new DoseSettings(0.1d, 15, 12 * 60, 0.1d), //
PumpTempBasalType.Percent,
- new DoseSettings(10, 15, 12*60,0d, 500d), PumpCapability.BasalRate_Duration15and30minAllowed, //
+ new DoseSettings(10, 15, 12 * 60, 0d, 500d), PumpCapability.BasalRate_Duration15and30minAllowed, //
0.01d, 0.01d, DoseStepSize.ComboBasal, PumpCapability.ComboCapabilities), //
AccuChekSpirit("Accu-Chek Spirit", 0.1d, null, //
- new DoseSettings(0.1d, 15, 12*60, 0.1d), //
+ new DoseSettings(0.1d, 15, 12 * 60, 0.1d), //
PumpTempBasalType.Percent,
- new DoseSettings(10, 15, 12*60,0d, 500d), PumpCapability.BasalRate_Duration15and30minAllowed, //
+ new DoseSettings(10, 15, 12 * 60, 0d, 500d), PumpCapability.BasalRate_Duration15and30minAllowed, //
0.01d, 0.1d, null, PumpCapability.VirtualPumpCapabilities), //
AccuChekInsight("Accu-Chek Insight", 0.05d, DoseStepSize.InsightBolus, //
- new DoseSettings(0.05d, 15, 24*60, 0.05d), //
+ new DoseSettings(0.05d, 15, 24 * 60, 0.05d), //
PumpTempBasalType.Percent,
- new DoseSettings(10, 15, 24*60,0d, 250d), PumpCapability.BasalRate_Duration15and30minAllowed, //
+ new DoseSettings(10, 15, 24 * 60, 0d, 250d), PumpCapability.BasalRate_Duration15and30minAllowed, //
0.02d, 0.01d, null, PumpCapability.InsightCapabilities), //
AccuChekInsightBluetooth("Accu-Chek Insight", 0.01d, null, //
- new DoseSettings(0.01d, 15, 24*60, 0.05d), //
+ new DoseSettings(0.01d, 15, 24 * 60, 0.05d), //
PumpTempBasalType.Percent,
- new DoseSettings(10, 15, 24*60,0d, 250d), PumpCapability.BasalRate_Duration15and30minAllowed, //
+ new DoseSettings(10, 15, 24 * 60, 0d, 250d), PumpCapability.BasalRate_Duration15and30minAllowed, //
0.02d, 0.01d, DoseStepSize.InsightBolus, PumpCapability.InsightCapabilities), //
// Animas
AnimasVibe("Animas Vibe", 0.05d, null, // AnimasBolus?
- new DoseSettings(0.05d, 30, 12*60, 0.05d), //
+ new DoseSettings(0.05d, 30, 12 * 60, 0.05d), //
PumpTempBasalType.Percent, //
- new DoseSettings(10, 30, 24*60, 0d, 300d), PumpCapability.BasalRate_Duration30minAllowed, //
+ new DoseSettings(10, 30, 24 * 60, 0d, 300d), PumpCapability.BasalRate_Duration30minAllowed, //
0.025d, 5d, 0d, null, PumpCapability.VirtualPumpCapabilities), //
AnimasPing("Animas Ping", AnimasVibe),
// Dana
DanaR("DanaR", 0.05d, null, //
- new DoseSettings(0.05d, 30, 8*60, 0.05d), //
+ new DoseSettings(0.05d, 30, 8 * 60, 0.05d), //
PumpTempBasalType.Percent, //
- new DoseSettings(10d, 60, 24*60, 0d, 200d), PumpCapability.BasalRate_Duration15and30minNotAllowed, //
+ new DoseSettings(10d, 60, 24 * 60, 0d, 200d), PumpCapability.BasalRate_Duration15and30minNotAllowed, //
0.04d, 0.01d, null, PumpCapability.DanaCapabilities),
DanaRKorean("DanaR Korean", 0.05d, null, //
- new DoseSettings(0.05d, 30, 8*60, 0.05d), //
+ new DoseSettings(0.05d, 30, 8 * 60, 0.05d), //
PumpTempBasalType.Percent, //
- new DoseSettings(10d, 60, 24*60, 0d, 200d), PumpCapability.BasalRate_Duration15and30minNotAllowed, //
+ new DoseSettings(10d, 60, 24 * 60, 0d, 200d), PumpCapability.BasalRate_Duration15and30minNotAllowed, //
0.1d, 0.01d, null, PumpCapability.DanaCapabilities),
DanaRS("DanaRS", 0.05d, null, //
- new DoseSettings(0.05d, 30, 8*60, 0.05d), //
+ new DoseSettings(0.05d, 30, 8 * 60, 0.05d), //
PumpTempBasalType.Percent, //
- new DoseSettings(10d, 60, 24*60, 0d, 200d), PumpCapability.BasalRate_Duration15and30minAllowed, //
+ new DoseSettings(10d, 60, 24 * 60, 0d, 200d), PumpCapability.BasalRate_Duration15and30minAllowed, //
0.04d, 0.01d, null, PumpCapability.DanaWithHistoryCapabilities),
DanaRv2("DanaRv2", DanaRS),
@@ -91,40 +91,40 @@ public enum PumpType {
// Insulet
Insulet_Omnipod("Insulet Omnipod", 0.05d, null, //
- new DoseSettings(0.05d, 30, 8*60, 0.05d), //
+ new DoseSettings(0.05d, 30, 8 * 60, 0.05d), //
PumpTempBasalType.Absolute, //
- new DoseSettings(0.05d, 30, 12*60, 0d, 30.0d), PumpCapability.BasalRate_Duration30minAllowed, // cannot exceed max basal rate 30u/hr
+ new DoseSettings(0.05d, 30, 12 * 60, 0d, 30.0d), PumpCapability.BasalRate_Duration30minAllowed, // cannot exceed max basal rate 30u/hr
0.05d, 0.05d, null, PumpCapability.VirtualPumpCapabilities),
// Medtronic
Medtronic_512_712("Medtronic 512/712", 0.05d, null, //
- new DoseSettings(0.05d, 30, 8*60, 0.05d), //
+ new DoseSettings(0.05d, 30, 8 * 60, 0.05d), //
PumpTempBasalType.Absolute, //
- new DoseSettings(0.05d, 30, 24*60, 0d, 35d), PumpCapability.BasalRate_Duration30minAllowed, //
+ new DoseSettings(0.05d, 30, 24 * 60, 0d, 35d), PumpCapability.BasalRate_Duration30minAllowed, //
0.05d, 0.05d, null, PumpCapability.VirtualPumpCapabilities), // TODO
Medtronic_515_715("Medtronic 515/715", Medtronic_512_712),
Medtronic_522_722("Medtronic 522/722", Medtronic_512_712),
Medtronic_523_723_Revel("Medtronic 523/723 (Revel)", 0.05d, null, //
- new DoseSettings(0.05d, 30, 8*60, 0.05d), //
+ new DoseSettings(0.05d, 30, 8 * 60, 0.05d), //
PumpTempBasalType.Absolute, //
- new DoseSettings(0.05d, 30, 24*60, 0d, 35d), PumpCapability.BasalRate_Duration30minAllowed, //
+ new DoseSettings(0.05d, 30, 24 * 60, 0d, 35d), PumpCapability.BasalRate_Duration30minAllowed, //
0.025d, 0.025d, DoseStepSize.MedtronicVeoBasal, PumpCapability.VirtualPumpCapabilities), //
Medtronic_554_754_Veo("Medtronic 554/754 (Veo)", Medtronic_523_723_Revel), // TODO
Medtronic_640G("Medtronic 640G", 0.025d, null, //
- new DoseSettings(0.05d, 30, 8*60, 0.05d), //
+ new DoseSettings(0.05d, 30, 8 * 60, 0.05d), //
PumpTempBasalType.Absolute, //
- new DoseSettings(0.05d, 30, 24*60, 0d, 35d), PumpCapability.BasalRate_Duration30minAllowed, //
+ new DoseSettings(0.05d, 30, 24 * 60, 0d, 35d), PumpCapability.BasalRate_Duration30minAllowed, //
0.025d, 0.025d, DoseStepSize.MedtronicVeoBasal, PumpCapability.VirtualPumpCapabilities), //
// Tandem
TandemTSlim("Tandem t:slim", 0.01d, null, //
- new DoseSettings(0.01d,15, 8*60, 0.4d),
+ new DoseSettings(0.01d, 15, 8 * 60, 0.4d),
PumpTempBasalType.Percent,
- new DoseSettings(1,15, 8*60, 0d, 250d), PumpCapability.BasalRate_Duration15and30minAllowed, //
+ new DoseSettings(1, 15, 8 * 60, 0d, 250d), PumpCapability.BasalRate_Duration15and30minAllowed, //
0.1d, 0.001d, null, PumpCapability.VirtualPumpCapabilities),
TandemTFlex("Tandem t:flex", TandemTSlim), //
@@ -146,10 +146,9 @@ public enum PumpType {
private PumpCapability pumpCapability;
private PumpType parent;
- private static Map mapByDescription;
+ private static Map mapByDescription;
- static
- {
+ static {
mapByDescription = new HashMap<>();
for (PumpType pumpType : values()) {
@@ -158,14 +157,12 @@ public enum PumpType {
}
- PumpType(String description, PumpType parent)
- {
+ PumpType(String description, PumpType parent) {
this.description = description;
this.parent = parent;
}
- PumpType(String description, PumpType parent, PumpCapability pumpCapability)
- {
+ PumpType(String description, PumpType parent, PumpCapability pumpCapability) {
this.description = description;
this.parent = parent;
this.pumpCapability = pumpCapability;
@@ -173,17 +170,15 @@ public enum PumpType {
PumpType(String description, double bolusSize, DoseStepSize specialBolusSize, //
DoseSettings extendedBolusSettings, //
- PumpTempBasalType pumpTempBasalType, DoseSettings tbrSettings, PumpCapability specialBasalDurations, //
- double baseBasalMinValue, double baseBasalStep, DoseStepSize baseBasalSpecialSteps, PumpCapability pumpCapability)
- {
+ PumpTempBasalType pumpTempBasalType, DoseSettings tbrSettings, PumpCapability specialBasalDurations, //
+ double baseBasalMinValue, double baseBasalStep, DoseStepSize baseBasalSpecialSteps, PumpCapability pumpCapability) {
this(description, bolusSize, specialBolusSize, extendedBolusSettings, pumpTempBasalType, tbrSettings, specialBasalDurations, baseBasalMinValue, null, baseBasalStep, baseBasalSpecialSteps, pumpCapability);
}
PumpType(String description, double bolusSize, DoseStepSize specialBolusSize, //
DoseSettings extendedBolusSettings, //
PumpTempBasalType pumpTempBasalType, DoseSettings tbrSettings, PumpCapability specialBasalDurations, //
- double baseBasalMinValue, Double baseBasalMaxValue, double baseBasalStep, DoseStepSize baseBasalSpecialSteps, PumpCapability pumpCapability)
- {
+ double baseBasalMinValue, Double baseBasalMaxValue, double baseBasalStep, DoseStepSize baseBasalSpecialSteps, PumpCapability pumpCapability) {
this.description = description;
this.bolusSize = bolusSize;
this.specialBolusSize = specialBolusSize;
@@ -261,20 +256,15 @@ public enum PumpType {
}
- private boolean isParentSet()
- {
- return this.parent!=null;
+ private boolean isParentSet() {
+ return this.parent != null;
}
- public static PumpType getByDescription(String desc)
- {
- if (mapByDescription.containsKey(desc))
- {
+ public static PumpType getByDescription(String desc) {
+ if (mapByDescription.containsKey(desc)) {
return mapByDescription.get(desc);
- }
- else
- {
+ } else {
return PumpType.GenericAAPS;
}
}
@@ -282,7 +272,7 @@ public enum PumpType {
public String getFullDescription(String i18nTemplate, boolean hasExtendedBasals) {
- String unit = getPumpTempBasalType()==PumpTempBasalType.Percent ? "%" : "";
+ String unit = getPumpTempBasalType() == PumpTempBasalType.Percent ? "%" : "";
DoseSettings eb = getExtendedBolusSettings();
DoseSettings tbr = getTbrSettings();
@@ -291,24 +281,22 @@ public enum PumpType {
return String.format(i18nTemplate, //
getStep("" + getBolusSize(), getSpecialBolusSize()), //
- eb.getStep(), eb.getDurationStep(), eb.getMaxDuration()/60, //
+ eb.getStep(), eb.getDurationStep(), eb.getMaxDuration() / 60, //
getStep(getBaseBasalRange(), getBaseBasalSpecialSteps()), //
tbr.getMinDose() + unit + "-" + tbr.getMaxDose() + unit, tbr.getStep() + unit,
- tbr.getDurationStep(), tbr.getMaxDuration()/60, extendedNote);
+ tbr.getDurationStep(), tbr.getMaxDuration() / 60, extendedNote);
}
- private String getBaseBasalRange()
- {
+ private String getBaseBasalRange() {
Double maxValue = getBaseBasalMaxValue();
- return maxValue==null ? "" + getBaseBasalMinValue() : getBaseBasalMinValue() + "-" + maxValue;
+ return maxValue == null ? "" + getBaseBasalMinValue() : getBaseBasalMinValue() + "-" + maxValue;
}
- private String getStep(String step, DoseStepSize stepSize)
- {
- if (stepSize!=null)
+ private String getStep(String step, DoseStepSize stepSize) {
+ if (stepSize != null)
return step + " [" + stepSize.getDescription() + "] *";
else
return "" + step;
@@ -316,18 +304,15 @@ public enum PumpType {
public boolean hasExtendedBasals() {
- return ((getBaseBasalSpecialSteps() !=null) || (getSpecialBolusSize() != null));
+ return ((getBaseBasalSpecialSteps() != null) || (getSpecialBolusSize() != null));
}
public PumpCapability getSpecialBasalDurations() {
- if (isParentSet())
- {
+ if (isParentSet()) {
return parent.getSpecialBasalDurations();
- }
- else
- {
+ } else {
return specialBasalDurations == null ? //
PumpCapability.BasalRate_Duration15and30minNotAllowed : specialBasalDurations;
}
@@ -338,20 +323,24 @@ public enum PumpType {
return bolusAmount;
}
- double bolusStepSize;
+ double bolusStepSize = getBolusSize();
- if (getSpecialBolusSize() == null) {
- bolusStepSize = getBolusSize();
- } else {
+ if (getSpecialBolusSize() != null) {
DoseStepSize specialBolusSize = getSpecialBolusSize();
-
- bolusStepSize = specialBolusSize.getStepSizeForAmount((double)bolusAmount);
+ bolusStepSize = specialBolusSize.getStepSizeForAmount(bolusAmount);
}
- return Math.round(bolusAmount / bolusStepSize) * bolusStepSize;
+ return Round.roundTo(bolusAmount, bolusStepSize);
}
+ public double determineCorrectBolusStepSize(double bolusAmount) {
+ DoseStepSize specialBolusSize = getSpecialBolusSize();
+ if (specialBolusSize != null)
+ return specialBolusSize.getStepSizeForAmount(bolusAmount);
+ return getBolusSize();
+ }
+
public double determineCorrectExtendedBolusSize(double bolusAmount) {
if (bolusAmount == 0.0d) {
return bolusAmount;
@@ -371,7 +360,7 @@ public enum PumpType {
bolusAmount = extendedBolusSettings.getMaxDose();
}
- return Math.round(bolusAmount / bolusStepSize) * bolusStepSize;
+ return Round.roundTo(bolusAmount, bolusStepSize);
}
@@ -393,7 +382,7 @@ public enum PumpType {
if (basalAmount > getTbrSettings().getMaxDose())
basalAmount = getTbrSettings().getMaxDose().doubleValue();
- return Math.round(basalAmount / basalStepSize) * basalStepSize;
+ return Round.roundTo(basalAmount, basalStepSize);
}
}
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 749307e1a7..e0d5147de6 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
@@ -1,6 +1,6 @@
package info.nightscout.androidaps.plugins.pump.danaR;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import org.json.JSONException;
import org.json.JSONObject;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRFragment.java
index e044a2db27..30e99ebbe2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRFragment.java
@@ -5,7 +5,7 @@ import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
import android.os.Handler;
-import android.support.v4.app.FragmentManager;
+import androidx.fragment.app.FragmentManager;
import android.text.Spanned;
import android.view.LayoutInflater;
import android.view.View;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPlugin.java
index 2f7484cd6f..4e38767619 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPlugin.java
@@ -5,8 +5,8 @@ import android.content.Context;
import android.content.Intent;
import android.content.ServiceConnection;
import android.os.IBinder;
-import android.support.v4.app.FragmentActivity;
-import android.support.v7.app.AlertDialog;
+import androidx.fragment.app.FragmentActivity;
+import androidx.appcompat.app.AlertDialog;
import com.squareup.otto.Subscribe;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/Dialogs/ProfileViewDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/Dialogs/ProfileViewDialog.java
index 2b09b180cf..06cfc289ad 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/Dialogs/ProfileViewDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/Dialogs/ProfileViewDialog.java
@@ -1,7 +1,7 @@
package info.nightscout.androidaps.plugins.pump.danaR.dialogs;
import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRHistoryActivity.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRHistoryActivity.java
index 95c9f25e37..617f99071d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRHistoryActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRHistoryActivity.java
@@ -4,9 +4,9 @@ import android.app.Activity;
import android.os.Bundle;
import android.os.Handler;
import android.os.HandlerThread;
-import android.support.v7.widget.CardView;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.cardview.widget.CardView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtended.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtended.java
index 9b27561d5a..aa272b546d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtended.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtended.java
@@ -1,6 +1,6 @@
package info.nightscout.androidaps.plugins.pump.danaR.comm;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasal.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasal.java
index 76fa0e9f43..00b3bf5f69 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasal.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasal.java
@@ -1,6 +1,6 @@
package info.nightscout.androidaps.plugins.pump.danaR.comm;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPlugin.java
index 3b4aa0ee4c..44eacef16c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPlugin.java
@@ -5,8 +5,8 @@ import android.content.Context;
import android.content.Intent;
import android.content.ServiceConnection;
import android.os.IBinder;
-import android.support.v4.app.FragmentActivity;
-import android.support.v7.app.AlertDialog;
+import androidx.fragment.app.FragmentActivity;
+import androidx.appcompat.app.AlertDialog;
import com.squareup.otto.Subscribe;
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 ddbb8547ae..39d110a0c5 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
@@ -5,9 +5,9 @@ import android.content.Context;
import android.content.Intent;
import android.content.ServiceConnection;
import android.os.IBinder;
-import android.support.annotation.Nullable;
-import android.support.v4.app.FragmentActivity;
-import android.support.v7.app.AlertDialog;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.FragmentActivity;
+import androidx.appcompat.app.AlertDialog;
import com.squareup.otto.Subscribe;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/BLEScanActivity.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/BLEScanActivity.java
index 502c18cbc9..e790fe7bfb 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/BLEScanActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/BLEScanActivity.java
@@ -7,7 +7,7 @@ import android.bluetooth.le.ScanCallback;
import android.bluetooth.le.ScanResult;
import android.os.Bundle;
import android.os.Handler;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
import android.view.View;
import android.view.ViewGroup;
import android.widget.BaseAdapter;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/PairingHelperActivity.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/PairingHelperActivity.java
index a98d541963..6282ff8d0f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/PairingHelperActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/PairingHelperActivity.java
@@ -1,6 +1,6 @@
package info.nightscout.androidaps.plugins.pump.danaRS.activities;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
import android.os.Bundle;
public class PairingHelperActivity extends AppCompatActivity {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/PairingProgressDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/PairingProgressDialog.java
index 1d9943a5f5..544b0c862e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/PairingProgressDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/PairingProgressDialog.java
@@ -5,7 +5,7 @@ import android.app.Activity;
import android.os.Bundle;
import android.os.Handler;
import android.os.HandlerThread;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_State.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_State.java
index 5724c5ff80..117baf23ff 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_State.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_State.java
@@ -1,6 +1,6 @@
package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
import com.cozmo.danar.util.BleCommandUtil;
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 9e3ca499d0..4fba649cae 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
@@ -5,8 +5,8 @@ import android.content.Context;
import android.content.Intent;
import android.content.ServiceConnection;
import android.os.IBinder;
-import android.support.v4.app.FragmentActivity;
-import android.support.v7.app.AlertDialog;
+import androidx.fragment.app.FragmentActivity;
+import androidx.appcompat.app.AlertDialog;
import com.squareup.otto.Subscribe;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2.java
index 578be6d4b6..a829b3afcb 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2.java
@@ -1,6 +1,6 @@
package info.nightscout.androidaps.plugins.pump.danaRv2.comm;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2.java
index a92c534d92..19a0a2b6ce 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2.java
@@ -1,6 +1,6 @@
package info.nightscout.androidaps.plugins.pump.danaRv2.comm;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java
index d851389aaf..26555898c0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java
@@ -15,7 +15,7 @@ import android.os.Handler;
import android.os.IBinder;
import android.os.Looper;
import android.os.Vibrator;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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 26f5180f47..b973424d71 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
@@ -3,8 +3,8 @@ package info.nightscout.androidaps.plugins.pump.insight;
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
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 c5b505a3d3..d673a0b8ce 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
@@ -168,7 +168,8 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
.mainType(PluginType.PUMP)
.description(R.string.description_pump_insight_local)
.fragmentClass(LocalInsightFragment.class.getName())
- .preferencesId(R.xml.pref_insight_local));
+ .preferencesId(MainApp.instance().getPackageName().equals("info.nightscout.androidaps")
+ ? R.xml.pref_insight_local_full : R.xml.pref_insight_local_pumpcontrol));
pumpDescription = new PumpDescription();
pumpDescription.setPumpDescription(PumpType.AccuChekInsightBluetooth);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightAlertActivity.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightAlertActivity.java
index c40cb99ed6..b255be2dd6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightAlertActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightAlertActivity.java
@@ -5,8 +5,8 @@ import android.content.Intent;
import android.content.ServiceConnection;
import android.os.Bundle;
import android.os.IBinder;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AppCompatActivity;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.app.AppCompatActivity;
import android.text.Html;
import android.view.View;
import android.view.WindowManager;
@@ -40,7 +40,7 @@ public class InsightAlertActivity extends AppCompatActivity {
alertService.setAlertActivity(InsightAlertActivity.this);
alert = alertService.getAlert();
if (alert == null) finish();
- update(alert);
+ else update(alert);
}
@Override
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingActivity.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingActivity.java
index 13fd698236..535d3d8bdb 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingActivity.java
@@ -10,11 +10,11 @@ import android.content.IntentFilter;
import android.content.ServiceConnection;
import android.os.Bundle;
import android.os.IBinder;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingInformationActivity.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingInformationActivity.java
index 8580b30dca..9e6ee03d77 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingInformationActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingInformationActivity.java
@@ -5,8 +5,8 @@ import android.content.Intent;
import android.content.ServiceConnection;
import android.os.Bundle;
import android.os.IBinder;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
import android.view.View;
import android.widget.TextView;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/InsightConnectionService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/InsightConnectionService.java
index e964c9fa20..cecb631776 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/InsightConnectionService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/InsightConnectionService.java
@@ -8,7 +8,7 @@ import android.content.Intent;
import android.os.Binder;
import android.os.IBinder;
import android.os.PowerManager;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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 0b764f5382..be9bf17c85 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
@@ -4,7 +4,7 @@ package info.nightscout.androidaps.plugins.pump.virtual;
import android.app.Activity;
import android.os.Bundle;
import android.os.Handler;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -20,8 +20,6 @@ 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;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityAAPSPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityAAPSPlugin.java
index 8e33b16302..dfc4bed25d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityAAPSPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityAAPSPlugin.java
@@ -1,6 +1,6 @@
package info.nightscout.androidaps.plugins.sensitivity;
-import android.support.v4.util.LongSparseArray;
+import androidx.collection.LongSparseArray;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref0Plugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref0Plugin.java
index 83800e1721..cfcaf0eb22 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref0Plugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref0Plugin.java
@@ -1,6 +1,6 @@
package info.nightscout.androidaps.plugins.sensitivity;
-import android.support.v4.util.LongSparseArray;
+import androidx.collection.LongSparseArray;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref1Plugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref1Plugin.java
index 3ce5c4861c..bbd987e6bd 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref1Plugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref1Plugin.java
@@ -1,6 +1,6 @@
package info.nightscout.androidaps.plugins.sensitivity;
-import android.support.v4.util.LongSparseArray;
+import androidx.collection.LongSparseArray;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityWeightedAveragePlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityWeightedAveragePlugin.java
index 5b7268b560..91b69162bb 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityWeightedAveragePlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityWeightedAveragePlugin.java
@@ -1,6 +1,6 @@
package info.nightscout.androidaps.plugins.sensitivity;
-import android.support.v4.util.LongSparseArray;
+import androidx.collection.LongSparseArray;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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 211cbb0bb0..269ee2b3f5 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
@@ -4,10 +4,10 @@ import android.app.Activity;
import android.content.DialogInterface;
import android.graphics.Paint;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/SourceDexcomG5Plugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/source/SourceDexcomG5Plugin.java
deleted file mode 100644
index 3ba10564e6..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/SourceDexcomG5Plugin.java
+++ /dev/null
@@ -1,232 +0,0 @@
-package info.nightscout.androidaps.plugins.source;
-
-import android.content.Intent;
-import android.os.Bundle;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Arrays;
-
-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.db.CareportalEvent;
-import info.nightscout.androidaps.interfaces.BgSourceInterface;
-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.nsclient.NSUpload;
-import info.nightscout.androidaps.services.Intents;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.SP;
-
-/**
- * Created by mike on 28.11.2017.
- */
-
-public class SourceDexcomG5Plugin extends PluginBase implements BgSourceInterface {
- private static Logger log = LoggerFactory.getLogger(L.BGSOURCE);
-
- private static SourceDexcomG5Plugin plugin = null;
-
- public static SourceDexcomG5Plugin getPlugin() {
- if (plugin == null)
- plugin = new SourceDexcomG5Plugin();
- return plugin;
- }
-
- private SourceDexcomG5Plugin() {
- super(new PluginDescription()
- .mainType(PluginType.BGSOURCE)
- .fragmentClass(BGSourceFragment.class.getName())
- .pluginName(R.string.DexcomG5)
- .shortName(R.string.dexcomG5_shortname)
- .preferencesId(R.xml.pref_bgsource)
- .description(R.string.description_source_dexcom_g5)
- );
- }
-
- @Override
- public boolean advancedFilteringSupported() {
- return true;
- }
-
- @Override
- public void handleNewData(Intent intent) {
- // onHandleIntent Bundle{ data => [{"m_time":1511939180,"m_trend":"NotComputable","m_value":335}]; android.support.content.wakelockid => 95; }Bundle
-
- if (!isEnabled(PluginType.BGSOURCE)) return;
-
- if (intent.getAction().equals(Intents.DEXCOMG5_BG))
- handleNewDataOld(intent);
-
- if (intent.getAction().equals(Intents.DEXCOMG5_BG_NEW))
- handleNewDataNew(intent);
- }
-
- public void handleNewDataOld(Intent intent) {
- // onHandleIntent Bundle{ data => [{"m_time":1511939180,"m_trend":"NotComputable","m_value":335}]; android.support.content.wakelockid => 95; }Bundle
-
- Bundle bundle = intent.getExtras();
- if (bundle == null) return;
-
- BgReading bgReading = new BgReading();
-
- String data = bundle.getString("data");
- if (L.isEnabled(L.BGSOURCE))
- log.debug("Received Dexcom Data", data);
-
- if (data == null) return;
-
- try {
- JSONArray jsonArray = new JSONArray(data);
- if (L.isEnabled(L.BGSOURCE))
- log.debug("Received Dexcom Data size:" + jsonArray.length());
- for (int i = 0; i < jsonArray.length(); i++) {
- JSONObject json = jsonArray.getJSONObject(i);
- bgReading.value = json.getInt("m_value");
- bgReading.direction = json.getString("m_trend");
- bgReading.date = json.getLong("m_time") * 1000L;
- bgReading.raw = 0;
- boolean isNew = MainApp.getDbHelper().createIfNotExists(bgReading, "DexcomG5");
- if (isNew && SP.getBoolean(R.string.key_dexcomg5_nsupload, false)) {
- NSUpload.uploadBg(bgReading, "AndroidAPS-DexcomG5");
- }
- if (isNew && SP.getBoolean(R.string.key_dexcomg5_xdripupload, false)) {
- NSUpload.sendToXdrip(bgReading);
- }
- }
-
- } catch (JSONException e) {
- log.error("Exception: ", e);
- }
- }
-
- public void handleNewDataNew(Intent intent) {
-
- Bundle bundle = intent.getExtras();
- if (bundle == null) return;
-
- if (L.isEnabled(L.BGSOURCE)) {
- if (bundle.containsKey("transmitterSystemTime"))
- log.debug("transmitterSystemTime: " + DateUtil.dateAndTimeFullString(bundle.getLong("transmitterSystemTime")));
- if (bundle.containsKey("transmitterRemainingTime"))
- log.debug("transmitterRemainingTime: " + DateUtil.dateAndTimeFullString(bundle.getLong("transmitterRemainingTime")));
- log.debug("transmitterId: " + bundle.getString("transmitterId"));
- if (bundle.containsKey("transmitterActivatedOn"))
- log.debug("transmitterActivatedOn: " + DateUtil.dateAndTimeFullString(bundle.getLong("transmitterActivatedOn")));
- log.debug("transmitterVersion: " + bundle.getString("transmitterVersion"));
- log.debug("transmitterSoftwareNumber: " + bundle.getString("transmitterSoftwareNumber"));
- log.debug("transmitterStorageTimeDays: " + bundle.getInt("transmitterStorageTimeDays"));
- log.debug("transmitterApiVersion: " + bundle.getInt("transmitterApiVersion"));
- log.debug("transmitterMaxRuntimeDays: " + bundle.getInt("transmitterMaxRuntimeDays"));
- log.debug("transmitterMaxStorageTimeDays: " + bundle.getInt("transmitterMaxStorageTimeDays"));
- log.debug("transmitterCGMProcessorFirmwareVersion: " + bundle.getString("transmitterCGMProcessorFirmwareVersion"));
- log.debug("transmitterBleRadioFirmwareVersion: " + bundle.getString("transmitterBleRadioFirmwareVersion"));
- log.debug("transmitterHardwareVersion: " + bundle.getInt("transmitterHardwareVersion"));
- log.debug("transmitterBleSoftDeviceVersion: " + bundle.getString("transmitterBleSoftDeviceVersion"));
- log.debug("transmitterNordicAsicHwID: " + bundle.getInt("transmitterNordicAsicHwID"));
- log.debug("transmitterSessionTimeDays: " + bundle.getInt("transmitterSessionTimeDays"));
- log.debug("transmitterFeatureFlags: " + bundle.getInt("transmitterFeatureFlags"));
- }
-
- if (bundle.containsKey("sensorInsertionTime")) {
- long sensorInsertionTime = bundle.getLong("sensorInsertionTime");
- if (L.isEnabled(L.BGSOURCE))
- log.debug("sensorInsertionTime: " + DateUtil.dateAndTimeFullString(sensorInsertionTime));
- if (SP.getBoolean(R.string.key_dexcom_lognssensorchange, false)) {
- try {
- if (MainApp.getDbHelper().getCareportalEventFromTimestamp(sensorInsertionTime) == null) {
- JSONObject data = new JSONObject();
- data.put("enteredBy", "AndroidAPS-DexcomG5");
- data.put("created_at", DateUtil.toISOString(sensorInsertionTime));
- data.put("eventType", CareportalEvent.SENSORCHANGE);
- NSUpload.uploadCareportalEntryToNS(data);
- }
- } catch (JSONException e) {
- log.error("Unhandled exception", e);
- }
- }
- }
-
- if (bundle.containsKey("glucoseValues")) {
- int[] glucoseValues = bundle.getIntArray("glucoseValues");
- int[] glucoseRecordIDs = bundle.getIntArray("glucoseRecordIDs");
- long[] glucoseRecordedTimestamps = bundle.getLongArray("glucoseRecordedTimestamps");
- long[] glucoseSessionStartTimes = bundle.getLongArray("glucoseSessionStartTimes");
- long[] glucoseSystemTimestamps = bundle.getLongArray("glucoseSystemTimestamps");
- String[] glucoseTransmitterIDS = bundle.getStringArray("glucoseTransmitterIDS");
- long[] glucoseTransmitterTimestamps = bundle.getLongArray("glucoseTransmitterTimestamps");
- String[] glucoseTrendsArrows = bundle.getStringArray("glucoseTrendsArrows");
- boolean[] glucoseWasBackfilled = bundle.getBooleanArray("glucoseWasBackfilled");
-
- if (L.isEnabled(L.BGSOURCE)) {
- log.debug("glucoseValues", Arrays.toString(glucoseValues));
- log.debug("glucoseRecordIDs", Arrays.toString(glucoseRecordIDs));
- log.debug("glucoseRecordedTimestamps", Arrays.toString(glucoseRecordedTimestamps));
- log.debug("glucoseSessionStartTimes", Arrays.toString(glucoseSessionStartTimes));
- log.debug("glucoseSystemTimestamps", Arrays.toString(glucoseSystemTimestamps));
- log.debug("glucoseTransmitterIDS", Arrays.toString(glucoseTransmitterIDS));
- log.debug("glucoseTransmitterTimestamps", Arrays.toString(glucoseTransmitterTimestamps));
- log.debug("glucoseTrendsArrows", Arrays.toString(glucoseTrendsArrows));
- log.debug("glucoseWasBackfilled", Arrays.toString(glucoseWasBackfilled));
- }
-
- for (int i = 0; i < glucoseValues.length; i++) {
- BgReading bgReading = new BgReading();
- bgReading.value = glucoseValues[i];
- bgReading.direction = glucoseTrendsArrows[i];
- bgReading.date = glucoseTransmitterTimestamps[i];
- bgReading.raw = 0;
- boolean isNew = MainApp.getDbHelper().createIfNotExists(bgReading, "DexcomG5");
- if (isNew && SP.getBoolean(R.string.key_dexcomg5_nsupload, false)) {
- NSUpload.uploadBg(bgReading, "AndroidAPS-DexcomG5");
- }
- if (isNew && SP.getBoolean(R.string.key_dexcomg5_xdripupload, false)) {
- NSUpload.sendToXdrip(bgReading);
- }
- }
- }
-
- if (bundle.containsKey("meterValues")) {
- String[] meterEntryTypes = bundle.getStringArray("meterEntryTypes");
- long[] meterTimestamps = bundle.getLongArray("meterTimestamps");
- int[] meterValues = bundle.getIntArray("meterValues");
- long[] meterRecordedTimestamps = bundle.getLongArray("meterRecordedTimestamps");
- int[] meterTransmitterIDs = bundle.getIntArray("meterTransmitterIDs");
- long[] meterTransmitterTimestamps = bundle.getLongArray("meterTransmitterTimestamps");
-
- if (L.isEnabled(L.BGSOURCE)) {
- log.debug("meterValues", Arrays.toString(meterValues));
- log.debug("meterEntryTypes", Arrays.toString(meterEntryTypes));
- log.debug("meterTimestamps", Arrays.toString(meterTimestamps));
- log.debug("meterTransmitterTimestamps", Arrays.toString(meterTransmitterTimestamps));
- log.debug("meterRecordedTimestamps", Arrays.toString(meterRecordedTimestamps));
- log.debug("meterTransmitterIDs", Arrays.toString(meterTransmitterIDs));
- }
-
- for (int i = 0; i < meterValues.length; i++) {
- try {
- if (MainApp.getDbHelper().getCareportalEventFromTimestamp(meterTimestamps[i]) == null) {
- JSONObject data = new JSONObject();
- data.put("enteredBy", "AndroidAPS-DexcomG5");
- data.put("created_at", DateUtil.toISOString(meterTimestamps[i]));
- data.put("eventType", CareportalEvent.BGCHECK);
- data.put("glucoseType", "Finger");
- data.put("glucose", meterValues[i]);
- data.put("units", Constants.MGDL);
- NSUpload.uploadCareportalEntryToNS(data);
- }
- } catch (JSONException e) {
- log.error("Unhandled exception", e);
- }
- }
- }
- }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/SourceDexcomG6Plugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/source/SourceDexcomG6Plugin.java
deleted file mode 100644
index ad63a9b9ae..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/SourceDexcomG6Plugin.java
+++ /dev/null
@@ -1,174 +0,0 @@
-package info.nightscout.androidaps.plugins.source;
-
-import android.content.Intent;
-import android.os.Bundle;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Arrays;
-
-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.db.CareportalEvent;
-import info.nightscout.androidaps.interfaces.BgSourceInterface;
-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.nsclient.NSUpload;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.SP;
-
-/**
- * Created by mike on 30.11.2018.
- */
-
-public class SourceDexcomG6Plugin extends PluginBase implements BgSourceInterface {
- private static Logger log = LoggerFactory.getLogger(L.BGSOURCE);
-
- private static SourceDexcomG6Plugin plugin = null;
-
- public static SourceDexcomG6Plugin getPlugin() {
- if (plugin == null)
- plugin = new SourceDexcomG6Plugin();
- return plugin;
- }
-
- private SourceDexcomG6Plugin() {
- super(new PluginDescription()
- .mainType(PluginType.BGSOURCE)
- .fragmentClass(BGSourceFragment.class.getName())
- .pluginName(R.string.DexcomG6)
- .shortName(R.string.dexcomG6_shortname)
- .preferencesId(R.xml.pref_bgsource)
- .description(R.string.description_source_dexcom_g6)
- );
- }
-
- @Override
- public boolean advancedFilteringSupported() {
- return true;
- }
-
- @Override
- public void handleNewData(Intent intent) {
- if (!isEnabled(PluginType.BGSOURCE)) return;
-
- Bundle bundle = intent.getExtras();
- if (bundle == null) return;
-
- if (L.isEnabled(L.BGSOURCE)) {
- if (bundle.containsKey("transmitterSystemTime"))
- log.debug("transmitterSystemTime: " + DateUtil.dateAndTimeFullString(bundle.getLong("transmitterSystemTime")));
- log.debug("transmitterId: " + bundle.getString("transmitterId"));
- if (bundle.containsKey("transmitterActivatedOn"))
- log.debug("transmitterActivatedOn: " + DateUtil.dateAndTimeFullString(bundle.getLong("transmitterActivatedOn")));
- log.debug("transmitterVersion: " + bundle.getString("transmitterVersion"));
- log.debug("transmitterSoftwareNumber: " + bundle.getString("transmitterSoftwareNumber"));
- log.debug("transmitterStorageTimeDays: " + bundle.getInt("transmitterStorageTimeDays"));
- log.debug("transmitterApiVersion: " + bundle.getInt("transmitterApiVersion"));
- log.debug("transmitterMaxRuntimeDays: " + bundle.getInt("transmitterMaxRuntimeDays"));
- log.debug("transmitterMaxStorageTimeDays: " + bundle.getInt("transmitterMaxStorageTimeDays"));
- log.debug("transmitterCGMProcessorFirmwareVersion: " + bundle.getString("transmitterCGMProcessorFirmwareVersion"));
- log.debug("transmitterBleRadioFirmwareVersion: " + bundle.getString("transmitterBleRadioFirmwareVersion"));
- log.debug("transmitterHardwareVersion: " + bundle.getInt("transmitterHardwareVersion"));
- log.debug("transmitterBleSoftDeviceVersion: " + bundle.getString("transmitterBleSoftDeviceVersion"));
- log.debug("transmitterNordicAsicHwID: " + bundle.getInt("transmitterNordicAsicHwID"));
- log.debug("transmitterSessionTimeDays: " + bundle.getInt("transmitterSessionTimeDays"));
- log.debug("transmitterFeatureFlags: " + bundle.getInt("transmitterFeatureFlags"));
-
- if (bundle.containsKey("sensorCode"))
- log.debug("sensorCode: " + bundle.getString("sensorCode"));
- }
-
- if (bundle.containsKey("sensorInsertionTime")) {
- long sensorInsertionTime = bundle.getLong("sensorInsertionTime");
- if (L.isEnabled(L.BGSOURCE))
- log.debug("sensorInsertionTime: " + DateUtil.dateAndTimeFullString(sensorInsertionTime));
- if (SP.getBoolean(R.string.key_dexcom_lognssensorchange, false)) {
- try {
- if (MainApp.getDbHelper().getCareportalEventFromTimestamp(sensorInsertionTime) == null) {
- JSONObject data = new JSONObject();
- data.put("enteredBy", "AndroidAPS-DexcomG6");
- data.put("created_at", DateUtil.toISOString(sensorInsertionTime));
- data.put("eventType", CareportalEvent.SENSORCHANGE);
- NSUpload.uploadCareportalEntryToNS(data);
- }
- } catch (JSONException e) {
- log.error("Unhandled exception", e);
- }
- }
- }
-
- if (bundle.containsKey("evgTimestamps")) {
- long[] timestamps = bundle.getLongArray("evgTimestamps");
- long[] transmitterTimes = bundle.getLongArray("transmitterTimes");
- int[] evgs = bundle.getIntArray("evgs");
- int[] predictiveEVGs = bundle.getIntArray("predictiveEVGs");
- String[] trendArrows = bundle.getStringArray("trendArrows");
-
- if (L.isEnabled(L.BGSOURCE)) {
- log.debug("timestamps", Arrays.toString(timestamps));
- log.debug("transmitterTimes", Arrays.toString(transmitterTimes));
- log.debug("evgs", Arrays.toString(evgs));
- log.debug("predictiveEVGs", Arrays.toString(predictiveEVGs));
- log.debug("trendArrows", Arrays.toString(trendArrows));
- }
-
- for (int i = 0; i < transmitterTimes.length; i++) {
- BgReading bgReading = new BgReading();
- bgReading.value = evgs[i];
- bgReading.direction = trendArrows[i];
- bgReading.date = timestamps[i];
- bgReading.raw = 0;
- boolean isNew = MainApp.getDbHelper().createIfNotExists(bgReading, "DexcomG6");
- if (isNew && SP.getBoolean(R.string.key_dexcomg5_nsupload, false)) {
- NSUpload.uploadBg(bgReading, "AndroidAPS-DexcomG6");
- }
- if (isNew && SP.getBoolean(R.string.key_dexcomg5_xdripupload, false)) {
- NSUpload.sendToXdrip(bgReading);
- }
- }
- }
-
- if (bundle.containsKey("meterValues")) {
- int[] meterValues = bundle.getIntArray("meterValues");
- String[] meterEntryTypes = bundle.getStringArray("meterEntryTypes");
- long[] meterTimestamps = bundle.getLongArray("meterTimestamps");
- long[] meterTransmitterTimestamps = bundle.getLongArray("meterTransmitterTimestamps");
- long[] meterRecordedTimestamps = bundle.getLongArray("meterRecordedTimestamps");
- int[] meterRecordIDs = bundle.getIntArray("meterRecordIDs");
-
- if (L.isEnabled(L.BGSOURCE)) {
- log.debug("meterValues", Arrays.toString(meterValues));
- log.debug("meterEntryTypes", Arrays.toString(meterEntryTypes));
- log.debug("meterTimestamps", Arrays.toString(meterTimestamps));
- log.debug("meterTransmitterTimestamps", Arrays.toString(meterTransmitterTimestamps));
- log.debug("meterRecordedTimestamps", Arrays.toString(meterRecordedTimestamps));
- log.debug("meterRecordIDs", Arrays.toString(meterRecordIDs));
- }
-
- for (int i = 0; i < meterValues.length; i++) {
- try {
- if (MainApp.getDbHelper().getCareportalEventFromTimestamp(meterTimestamps[i]) == null) {
- JSONObject data = new JSONObject();
- data.put("enteredBy", "AndroidAPS-DexcomG6");
- data.put("created_at", DateUtil.toISOString(meterTimestamps[i]));
- data.put("eventType", CareportalEvent.BGCHECK);
- data.put("glucoseType", "Finger");
- data.put("glucose", meterValues[i]);
- data.put("units", Constants.MGDL);
- NSUpload.uploadCareportalEntryToNS(data);
- }
- } catch (JSONException e) {
- log.error("Unhandled exception", e);
- }
- }
- }
- }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/SourceDexcomPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/SourceDexcomPlugin.kt
new file mode 100644
index 0000000000..2131d5e321
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/SourceDexcomPlugin.kt
@@ -0,0 +1,111 @@
+package info.nightscout.androidaps.plugins.source
+
+import android.Manifest
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.os.Build
+import androidx.core.content.ContextCompat
+import info.nightscout.androidaps.Constants
+import info.nightscout.androidaps.MainApp
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.activities.RequestDexcomPermissionActivity
+import info.nightscout.androidaps.db.BgReading
+import info.nightscout.androidaps.db.CareportalEvent
+import info.nightscout.androidaps.interfaces.BgSourceInterface
+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.nsclient.NSUpload
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.SP
+import org.json.JSONObject
+import org.slf4j.LoggerFactory
+
+object SourceDexcomPlugin : PluginBase(PluginDescription()
+ .mainType(PluginType.BGSOURCE)
+ .fragmentClass(BGSourceFragment::class.java.name)
+ .pluginName(R.string.dexcom_app_patched)
+ .shortName(R.string.dexcom_short)
+ .preferencesId(R.xml.pref_bgsource)
+ .description(R.string.description_source_dexcom)), BgSourceInterface {
+
+ private val log = LoggerFactory.getLogger(L.BGSOURCE)
+
+ private val PACKAGE_NAMES = arrayOf("com.dexcom.cgm.region1.mgdl", "com.dexcom.cgm.region1.mmol",
+ "com.dexcom.cgm.region2.mgdl", "com.dexcom.cgm.region2.mmol",
+ "com.dexcom.g6.region1.mmol", "com.dexcom.g6.region2.mgdl",
+ "com.dexcom.g6.region3.mgdl", "com.dexcom.g6.region3.mmol")
+
+ const val PERMISSION = "com.dexcom.cgm.EXTERNAL_PERMISSION"
+
+ override fun advancedFilteringSupported(): Boolean {
+ return true
+ }
+
+ override fun onStart() {
+ super.onStart()
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && ContextCompat.checkSelfPermission(MainApp.instance(), PERMISSION) != PackageManager.PERMISSION_GRANTED) {
+ val intent = Intent(MainApp.instance(), RequestDexcomPermissionActivity::class.java)
+ intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+ MainApp.instance().startActivity(intent)
+ }
+ }
+
+ fun findDexcomPackageName(): String? {
+ val packageManager = MainApp.instance().packageManager;
+ for (packageInfo in packageManager.getInstalledPackages(0)) {
+ if (PACKAGE_NAMES.contains(packageInfo.packageName)) return packageInfo.packageName
+ }
+ return null
+ }
+
+ override fun handleNewData(intent: Intent) {
+ if (!isEnabled(PluginType.BGSOURCE)) return
+ try {
+ val glucoseValues = intent.getBundleExtra("glucoseValues")
+ for (i in 0 until glucoseValues.size()) {
+ val glucoseValue = glucoseValues.getBundle(i.toString())
+ val bgReading = BgReading()
+ bgReading.value = glucoseValue!!.getInt("glucoseValue").toDouble()
+ bgReading.direction = glucoseValue.getString("trendArrow")
+ bgReading.date = glucoseValue.getLong("timestamp") * 1000
+ bgReading.raw = 0.0
+ if (MainApp.getDbHelper().createIfNotExists(bgReading, "Dexcom")) {
+ if (SP.getBoolean(R.string.key_dexcomg5_nsupload, false)) {
+ NSUpload.uploadBg(bgReading, "AndroidAPS-DexcomG6")
+ }
+ if (SP.getBoolean(R.string.key_dexcomg5_xdripupload, false)) {
+ NSUpload.sendToXdrip(bgReading)
+ }
+ }
+ }
+ val meters = intent.getBundleExtra("meters")
+ for (i in 0 until meters.size()) {
+ val meter = meters.getBundle(i.toString())
+ val timestamp = meter.getLong("timestamp") * 1000
+ if (MainApp.getDbHelper().getCareportalEventFromTimestamp(timestamp) != null) continue
+ val jsonObject = JSONObject()
+ jsonObject.put("enteredBy", "AndroidAPS-Dexcom")
+ jsonObject.put("created_at", DateUtil.toISOString(timestamp))
+ jsonObject.put("eventType", CareportalEvent.BGCHECK)
+ jsonObject.put("glucoseType", "Finger")
+ jsonObject.put("glucose", meter.getInt("meterValue"))
+ jsonObject.put("units", Constants.MGDL)
+ NSUpload.uploadCareportalEntryToNS(jsonObject)
+ }
+ if (SP.getBoolean(R.string.key_dexcom_lognssensorchange, false) && intent.hasExtra("sensorInsertionTime")) {
+ val sensorInsertionTime = intent.extras.getLong("sensorInsertionTime") * 1000
+ if (MainApp.getDbHelper().getCareportalEventFromTimestamp(sensorInsertionTime) == null) {
+ val jsonObject = JSONObject()
+ jsonObject.put("enteredBy", "AndroidAPS-Dexcom")
+ jsonObject.put("created_at", DateUtil.toISOString(sensorInsertionTime))
+ jsonObject.put("eventType", CareportalEvent.SENSORCHANGE)
+ NSUpload.uploadCareportalEntryToNS(jsonObject)
+ }
+ }
+ } catch (e : Exception) {
+ log.error("Error while processing intent from Dexcom App", e)
+ }
+ }
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/CarbsGenerator.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/CarbsGenerator.java
index ac9be50a23..0e7215b368 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/CarbsGenerator.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/CarbsGenerator.java
@@ -1,7 +1,7 @@
package info.nightscout.androidaps.plugins.treatments;
import android.content.Intent;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.R;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/Treatment.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/Treatment.java
index dbf1a89c37..5be28b148a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/Treatment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/Treatment.java
@@ -1,7 +1,7 @@
package info.nightscout.androidaps.plugins.treatments;
import android.graphics.Color;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import com.j256.ormlite.field.DatabaseField;
import com.j256.ormlite.table.DatabaseTable;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java
index 502b7f38b7..fd2e73b2e9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java
@@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.treatments;
import android.content.Intent;
import android.os.IBinder;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import com.j256.ormlite.android.apptools.OpenHelperManager;
import com.j256.ormlite.android.apptools.OrmLiteBaseService;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsFragment.java
index d30565b4a7..192952057d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsFragment.java
@@ -1,8 +1,8 @@
package info.nightscout.androidaps.plugins.treatments;
import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java
index 9eee631e08..e08bfdf057 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java
@@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.treatments;
import android.content.Intent;
import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import com.google.firebase.analytics.FirebaseAnalytics;
import com.squareup.otto.Subscribe;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/dialogs/WizardInfoDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/dialogs/WizardInfoDialog.java
index c38672311b..e068e094f1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/dialogs/WizardInfoDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/dialogs/WizardInfoDialog.java
@@ -1,7 +1,7 @@
package info.nightscout.androidaps.plugins.treatments.dialogs;
import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/ProfileViewerDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/ProfileViewerDialog.java
index c8db29b617..a3b6234a22 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/ProfileViewerDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/ProfileViewerDialog.java
@@ -1,7 +1,7 @@
package info.nightscout.androidaps.plugins.treatments.fragments;
import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
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 26a8494dd7..c2320fc3ce 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
@@ -6,12 +6,12 @@ import android.content.DialogInterface;
import android.content.Intent;
import android.graphics.Paint;
import android.os.Bundle;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.CardView;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.fragment.app.FragmentManager;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.app.AlertDialog;
+import androidx.cardview.widget.CardView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsCareportalFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsCareportalFragment.java
index 2f45f67c3b..2ec61597d7 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsCareportalFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsCareportalFragment.java
@@ -6,10 +6,10 @@ import android.content.DialogInterface;
import android.content.Intent;
import android.graphics.Paint;
import android.os.Bundle;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.CardView;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.appcompat.app.AlertDialog;
+import androidx.cardview.widget.CardView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
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 766190e378..24a5185ef0 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
@@ -5,11 +5,11 @@ import android.content.Context;
import android.content.DialogInterface;
import android.graphics.Paint;
import android.os.Bundle;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.CardView;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.app.AlertDialog;
+import androidx.cardview.widget.CardView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsProfileSwitchFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsProfileSwitchFragment.java
index c59d5e1836..5d5919f69f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsProfileSwitchFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsProfileSwitchFragment.java
@@ -6,12 +6,12 @@ import android.content.DialogInterface;
import android.content.Intent;
import android.graphics.Paint;
import android.os.Bundle;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.CardView;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.fragment.app.FragmentManager;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.app.AlertDialog;
+import androidx.cardview.widget.CardView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTempTargetFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTempTargetFragment.java
index eda62a8318..56b887c295 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTempTargetFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTempTargetFragment.java
@@ -6,11 +6,11 @@ import android.content.DialogInterface;
import android.content.Intent;
import android.graphics.Paint;
import android.os.Bundle;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.CardView;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.app.AlertDialog;
+import androidx.cardview.widget.CardView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
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 7b935d354e..6aed7aea43 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
@@ -4,12 +4,12 @@ import android.app.Activity;
import android.content.Context;
import android.graphics.Paint;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.CardView;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.app.AlertDialog;
+import androidx.cardview.widget.CardView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java b/app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java
index 7928435ed0..c0a8bd7f56 100644
--- a/app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java
+++ b/app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java
@@ -3,7 +3,7 @@ package info.nightscout.androidaps.queue;
import android.content.Context;
import android.content.Intent;
import android.os.SystemClock;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
import android.text.Html;
import android.text.Spanned;
@@ -12,8 +12,6 @@ import org.slf4j.LoggerFactory;
import java.util.LinkedList;
-import javax.annotation.Nullable;
-
import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.R;
import info.nightscout.androidaps.data.DetailedBolusInfo;
diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/DataReceiver.java b/app/src/main/java/info/nightscout/androidaps/receivers/DataReceiver.java
index 087cd3a5f5..6c2e7c6920 100644
--- a/app/src/main/java/info/nightscout/androidaps/receivers/DataReceiver.java
+++ b/app/src/main/java/info/nightscout/androidaps/receivers/DataReceiver.java
@@ -2,7 +2,7 @@ package info.nightscout.androidaps.receivers;
import android.content.Context;
import android.content.Intent;
-import android.support.v4.content.WakefulBroadcastReceiver;
+import androidx.legacy.content.WakefulBroadcastReceiver;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/NetworkChangeReceiver.java b/app/src/main/java/info/nightscout/androidaps/receivers/NetworkChangeReceiver.java
index 9a3108e98c..05adc1af59 100644
--- a/app/src/main/java/info/nightscout/androidaps/receivers/NetworkChangeReceiver.java
+++ b/app/src/main/java/info/nightscout/androidaps/receivers/NetworkChangeReceiver.java
@@ -8,7 +8,7 @@ import android.net.NetworkInfo;
import android.net.wifi.SupplicantState;
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/app/src/main/java/info/nightscout/androidaps/services/AlarmSoundService.java b/app/src/main/java/info/nightscout/androidaps/services/AlarmSoundService.java
index 4917789db1..a62f2c6fb7 100644
--- a/app/src/main/java/info/nightscout/androidaps/services/AlarmSoundService.java
+++ b/app/src/main/java/info/nightscout/androidaps/services/AlarmSoundService.java
@@ -1,5 +1,6 @@
package info.nightscout.androidaps.services;
+import android.app.Notification;
import android.app.Service;
import android.content.Context;
import android.content.Intent;
@@ -16,6 +17,7 @@ import java.io.IOException;
import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.R;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.plugins.general.persistentNotification.PersistentNotificationPlugin;
public class AlarmSoundService extends Service {
private static Logger log = LoggerFactory.getLogger(L.CORE);
@@ -28,8 +30,7 @@ public class AlarmSoundService extends Service {
@Override
public IBinder onBind(Intent intent) {
- // TODO: Return the communication channel to the service.
- throw new UnsupportedOperationException("Not yet implemented");
+ return null;
}
@Override
@@ -40,6 +41,8 @@ public class AlarmSoundService extends Service {
}
public int onStartCommand(Intent intent, int flags, int startId) {
+ Notification notification = PersistentNotificationPlugin.getPlugin().getLastNotification();
+ startForeground(PersistentNotificationPlugin.ONGOING_NOTIFICATION_ID, notification);
if (player != null && player.isPlaying())
player.stop();
if (L.isEnabled(L.CORE))
diff --git a/app/src/main/java/info/nightscout/androidaps/services/DataService.java b/app/src/main/java/info/nightscout/androidaps/services/DataService.java
index b98ff6bf94..6b8ac46f11 100644
--- a/app/src/main/java/info/nightscout/androidaps/services/DataService.java
+++ b/app/src/main/java/info/nightscout/androidaps/services/DataService.java
@@ -25,8 +25,7 @@ import info.nightscout.androidaps.plugins.general.overview.notifications.Notific
import info.nightscout.androidaps.plugins.profile.ns.NSProfilePlugin;
import info.nightscout.androidaps.plugins.pump.danaR.activities.DanaRNSHistorySync;
import info.nightscout.androidaps.plugins.general.smsCommunicator.SmsCommunicatorPlugin;
-import info.nightscout.androidaps.plugins.source.SourceDexcomG5Plugin;
-import info.nightscout.androidaps.plugins.source.SourceDexcomG6Plugin;
+import info.nightscout.androidaps.plugins.source.SourceDexcomPlugin;
import info.nightscout.androidaps.plugins.source.SourceEversensePlugin;
import info.nightscout.androidaps.plugins.source.SourceGlimpPlugin;
import info.nightscout.androidaps.plugins.source.SourceMM640gPlugin;
@@ -69,12 +68,8 @@ public class DataService extends IntentService {
SourceMM640gPlugin.getPlugin().handleNewData(intent);
} else if (Intents.GLIMP_BG.equals(action)) {
SourceGlimpPlugin.getPlugin().handleNewData(intent);
- } else if (Intents.DEXCOMG5_BG.equals(action)) {
- SourceDexcomG5Plugin.getPlugin().handleNewData(intent);
- } else if (Intents.DEXCOMG5_BG_NEW.equals(action)) {
- SourceDexcomG5Plugin.getPlugin().handleNewData(intent);
- } else if (Intents.DEXCOMG6_BG.equals(action)) {
- SourceDexcomG6Plugin.getPlugin().handleNewData(intent);
+ } else if (Intents.DEXCOM_BG.equals(action)) {
+ SourceDexcomPlugin.INSTANCE.handleNewData(intent);
} else if (Intents.POCTECH_BG.equals(action)) {
SourcePoctechPlugin.getPlugin().handleNewData(intent);
} else if (Intents.TOMATO_BG.equals(action)) {
diff --git a/app/src/main/java/info/nightscout/androidaps/services/Intents.java b/app/src/main/java/info/nightscout/androidaps/services/Intents.java
index 5011215b45..a5b26561b5 100644
--- a/app/src/main/java/info/nightscout/androidaps/services/Intents.java
+++ b/app/src/main/java/info/nightscout/androidaps/services/Intents.java
@@ -48,9 +48,7 @@ public interface Intents {
String GLIMP_BG = "it.ct.glicemia.ACTION_GLUCOSE_MEASURED";
- String DEXCOMG5_BG = "com.dexcom.cgm.DATA";
- String DEXCOMG5_BG_NEW = "com.dexcom.cgm.g5.AndroidAPSEVGCallback.BROADCAST";
- String DEXCOMG6_BG = "com.dexcom.cgm.AndroidAPSEVGCallback.BROADCAST";
+ String DEXCOM_BG = "com.dexcom.cgm.EXTERNAL_BROADCAST";
String EVERSENSE_BG = "com.senseonics.AndroidAPSEventSubscriber.BROADCAST";
String POCTECH_BG = "com.china.poctech.data";
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.java
index 1d143d073f..3be94c494e 100644
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.java
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.java
@@ -3,7 +3,7 @@ package info.nightscout.androidaps.setupwizard;
import android.Manifest;
import android.content.Intent;
import android.os.Build;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
import com.squareup.otto.Subscribe;
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/SetupWizardActivity.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/SetupWizardActivity.java
index 9049ad7463..777463583d 100644
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/SetupWizardActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/SetupWizardActivity.java
@@ -3,9 +3,9 @@ package info.nightscout.androidaps.setupwizard;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.os.Bundle;
-import android.support.v4.app.ActivityCompat;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
+import androidx.core.app.ActivityCompat;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
import android.view.View;
import android.widget.LinearLayout;
import android.widget.ScrollView;
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWFragment.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWFragment.java
index a061f57eb6..29149e5b81 100644
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWFragment.java
@@ -1,7 +1,7 @@
package info.nightscout.androidaps.setupwizard.elements;
-import android.support.v4.app.Fragment;
-import android.view.View;
+import androidx.fragment.app.Fragment;
+
import android.widget.LinearLayout;
import org.slf4j.Logger;
diff --git a/app/src/main/java/info/nightscout/androidaps/tabs/TabPageAdapter.java b/app/src/main/java/info/nightscout/androidaps/tabs/TabPageAdapter.java
index 53b3700c72..c567df7b49 100644
--- a/app/src/main/java/info/nightscout/androidaps/tabs/TabPageAdapter.java
+++ b/app/src/main/java/info/nightscout/androidaps/tabs/TabPageAdapter.java
@@ -1,10 +1,10 @@
package info.nightscout.androidaps.tabs;
import android.content.Context;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
import android.view.ViewGroup;
import org.slf4j.Logger;
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/AndroidPermission.java b/app/src/main/java/info/nightscout/androidaps/utils/AndroidPermission.java
index 3f6c3a3ce0..527a98dda2 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/AndroidPermission.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/AndroidPermission.java
@@ -5,8 +5,8 @@ import android.app.Activity;
import android.content.Context;
import android.content.pm.PackageManager;
import android.os.Build;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.R;
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/BolusWizard.java b/app/src/main/java/info/nightscout/androidaps/utils/BolusWizard.java
deleted file mode 100644
index cd789ee225..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/utils/BolusWizard.java
+++ /dev/null
@@ -1,183 +0,0 @@
-package info.nightscout.androidaps.utils;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus;
-import info.nightscout.androidaps.data.IobTotal;
-import info.nightscout.androidaps.data.Profile;
-import info.nightscout.androidaps.db.TempTarget;
-import info.nightscout.androidaps.interfaces.TreatmentsInterface;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
-
-/**
- * Created by mike on 11.10.2016.
- */
-
-public class BolusWizard {
- private Logger log = LoggerFactory.getLogger(L.CORE);
- // Inputs
- private Profile specificProfile = null;
- private TempTarget tempTarget;
- public Integer carbs = 0;
- private Double bg = 0d;
- private Double cob = 0d;
- private Double correction;
- private Double percentageCorrection;
- private Boolean includeBolusIOB = true;
- private Boolean includeBasalIOB = true;
- public Boolean superBolus = false;
- private Boolean trend = false;
-
- // Intermediate
- public double sens = 0d;
- public double ic = 0d;
-
- public GlucoseStatus glucoseStatus;
-
- public double targetBGLow = 0d;
- public double targetBGHigh = 0d;
- public double bgDiff = 0d;
-
- public double insulinFromBG = 0d;
- public double insulinFromCarbs = 0d;
- public double insulingFromBolusIOB = 0d;
- public double insulingFromBasalsIOB = 0d;
- public double insulinFromCorrection = 0d;
- public double insulinFromSuperBolus = 0d;
- public double insulinFromCOB = 0d;
- public double insulinFromTrend = 0d;
-
- // Result
- public Double calculatedTotalInsulin = 0d;
- public Double totalBeforePercentageAdjustment = 0d;
- public Double carbsEquivalent = 0d;
-
- public Double doCalc(Profile specificProfile, TempTarget tempTarget, Integer carbs, Double cob, Double bg, Double correction, Boolean includeBolusIOB, Boolean includeBasalIOB, Boolean superBolus, Boolean trend) {
- return doCalc(specificProfile, tempTarget, carbs, cob, bg, correction, 100d, includeBolusIOB, includeBasalIOB, superBolus, trend);
- }
-
- public Double doCalc(Profile specificProfile, TempTarget tempTarget, Integer carbs, Double cob, Double bg, Double correction, double percentageCorrection, Boolean includeBolusIOB, Boolean includeBasalIOB, Boolean superBolus, Boolean trend) {
- this.specificProfile = specificProfile;
- this.tempTarget = tempTarget;
- this.carbs = carbs;
- this.bg = bg;
- this.cob = cob;
- this.correction = correction;
- this.percentageCorrection = percentageCorrection;
- this.includeBolusIOB = includeBolusIOB;
- this.includeBasalIOB = includeBasalIOB;
- this.superBolus = superBolus;
- this.trend = trend;
-
- // Insulin from BG
- sens = specificProfile.getIsf();
- targetBGLow = specificProfile.getTargetLow();
- targetBGHigh = specificProfile.getTargetHigh();
- if (tempTarget != null) {
- targetBGLow = Profile.fromMgdlToUnits(tempTarget.low, specificProfile.getUnits());
- targetBGHigh = Profile.fromMgdlToUnits(tempTarget.high, specificProfile.getUnits());
- }
- if (bg >= targetBGLow && bg <= targetBGHigh) {
- bgDiff = 0d;
- } else if (bg <= targetBGLow) {
- bgDiff = bg - targetBGLow;
- } else {
- bgDiff = bg - targetBGHigh;
- }
- insulinFromBG = bg != 0d ? bgDiff / sens : 0d;
-
- // Insulin from 15 min trend
- glucoseStatus = GlucoseStatus.getGlucoseStatusData();
- if (glucoseStatus != null && trend) {
- insulinFromTrend = (Profile.fromMgdlToUnits(glucoseStatus.short_avgdelta, specificProfile.getUnits()) * 3) / sens;
- }
-
- // Insuling from carbs
- ic = specificProfile.getIc();
- insulinFromCarbs = carbs / ic;
- insulinFromCOB = cob / ic;
-
- // Insulin from IOB
- // IOB calculation
- TreatmentsInterface treatments = TreatmentsPlugin.getPlugin();
- treatments.updateTotalIOBTreatments();
- IobTotal bolusIob = treatments.getLastCalculationTreatments().round();
- treatments.updateTotalIOBTempBasals();
- IobTotal basalIob = treatments.getLastCalculationTempBasals().round();
-
- insulingFromBolusIOB = includeBolusIOB ? -bolusIob.iob : 0d;
- insulingFromBasalsIOB = includeBasalIOB ? -basalIob.basaliob : 0d;
-
- // Insulin from correction
- insulinFromCorrection = correction;
-
- // Insulin from superbolus for 2h. Get basal rate now and after 1h
- if (superBolus) {
- insulinFromSuperBolus = specificProfile.getBasal();
- long timeAfter1h = System.currentTimeMillis();
- timeAfter1h += T.hours(1).msecs();
- insulinFromSuperBolus += specificProfile.getBasal(timeAfter1h);
- }
-
- // Total
- calculatedTotalInsulin = insulinFromBG + insulinFromTrend + insulinFromCarbs + insulingFromBolusIOB + insulingFromBasalsIOB + insulinFromCorrection + insulinFromSuperBolus + insulinFromCOB;
-
- // Percentage adjustment
- totalBeforePercentageAdjustment = calculatedTotalInsulin;
- if (calculatedTotalInsulin > 0) {
- calculatedTotalInsulin = calculatedTotalInsulin * percentageCorrection / 100d;
- }
-
- if (calculatedTotalInsulin < 0) {
- carbsEquivalent = -calculatedTotalInsulin * ic;
- calculatedTotalInsulin = 0d;
- }
-
- double bolusStep = ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription().bolusStep;
- calculatedTotalInsulin = Round.roundTo(calculatedTotalInsulin, bolusStep);
-
- log.debug(log());
-
- return calculatedTotalInsulin;
- }
-
- public String log() {
- StringBuilder sb = new StringBuilder();
-
- sb.append("TempTarget=").append(tempTarget != null ? tempTarget.toString() : "null").append("; ");
- sb.append("Carbs=").append(carbs != null ? carbs : null).append("; ");
- sb.append("Bg=").append(bg).append("; ");
- sb.append("Cob=").append(cob).append("; ");
- sb.append("Correction=").append(correction).append("; ");
- sb.append("PercentageCorrection=").append(percentageCorrection).append("; ");
- sb.append("IncludeBolusIOB=").append(includeBolusIOB).append("; ");
- sb.append("IncludeBasalIOB=").append(includeBasalIOB).append("; ");
- sb.append("Superbolus=").append(superBolus).append("; ");
- sb.append("Trend=").append(trend).append("; ");
- sb.append("Profile=").append(specificProfile != null && specificProfile.getData() != null ? specificProfile.getData().toString() : "null").append("; ");
- sb.append("\n");
-
- sb.append("targetBGLow=").append(targetBGLow).append("; ");
- sb.append("targetBGHigh=").append(targetBGHigh).append("; ");
- sb.append("bgDiff=").append(bgDiff).append("; ");
- sb.append("insulinFromBG=").append(insulinFromBG).append("; ");
- sb.append("insulinFromCarbs=").append(insulinFromCarbs).append("; ");
- sb.append("insulingFromBolusIOB=").append(insulingFromBolusIOB).append("; ");
- sb.append("insulingFromBasalsIOB=").append(insulingFromBasalsIOB).append("; ");
- sb.append("insulinFromCorrection=").append(insulinFromCorrection).append("; ");
- sb.append("insulinFromSuperBolus=").append(insulinFromSuperBolus).append("; ");
- sb.append("insulinFromCOB=").append(insulinFromCOB).append("; ");
- sb.append("insulinFromTrend=").append(insulinFromTrend).append("; ");
- sb.append("\n");
-
-
- sb.append("calculatedTotalInsulin=").append(calculatedTotalInsulin).append("; ");
- sb.append("totalBeforePercentageAdjustment=").append(totalBeforePercentageAdjustment).append("; ");
- sb.append("carbsEquivalent=").append(carbsEquivalent).append("; ");
-
- return sb.toString();
- }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/BolusWizard.kt b/app/src/main/java/info/nightscout/androidaps/utils/BolusWizard.kt
new file mode 100644
index 0000000000..e810b689f7
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/BolusWizard.kt
@@ -0,0 +1,344 @@
+package info.nightscout.androidaps.utils
+
+import android.content.Context
+import android.content.Intent
+import android.text.Html
+import androidx.appcompat.app.AlertDialog
+import info.nightscout.androidaps.MainApp
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.db.CareportalEvent
+import info.nightscout.androidaps.db.Source
+import info.nightscout.androidaps.db.TempTarget
+import info.nightscout.androidaps.events.EventRefreshOverview
+import info.nightscout.androidaps.interfaces.Constraint
+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.aps.loop.LoopPlugin
+import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions
+import info.nightscout.androidaps.plugins.general.overview.dialogs.ErrorHelperActivity
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
+import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import info.nightscout.androidaps.queue.Callback
+import org.json.JSONException
+import org.json.JSONObject
+import org.slf4j.LoggerFactory
+import java.util.*
+
+class BolusWizard @JvmOverloads constructor(val profile: Profile,
+ val profileName: String,
+ val tempTarget: TempTarget?,
+ val carbs: Int,
+ val cob: Double,
+ val bg: Double,
+ val correction: Double,
+ private val percentageCorrection: Double = 100.0,
+ private val useBg: Boolean,
+ private val useCob: Boolean,
+ private val includeBolusIOB: Boolean,
+ private val includeBasalIOB: Boolean,
+ private val useSuperBolus: Boolean,
+ private val useTT: Boolean,
+ private val useTrend: Boolean,
+ val notes: String = "",
+ private val carbTime: Int = 0
+) {
+
+ private val log = LoggerFactory.getLogger(L.CORE)
+
+ // Intermediate
+ var sens = 0.0
+ private set
+
+ var ic = 0.0
+ private set
+
+ var glucoseStatus: GlucoseStatus? = null
+ private set
+
+ var targetBGLow = 0.0
+ private set
+
+ var targetBGHigh = 0.0
+ private set
+
+ var bgDiff = 0.0
+ private set
+
+ var insulinFromBG = 0.0
+ private set
+
+ var insulinFromCarbs = 0.0
+ private set
+
+ var insulinFromBolusIOB = 0.0
+ private set
+
+ var insulinFromBasalsIOB = 0.0
+ private set
+
+ var insulinFromCorrection = 0.0
+ private set
+
+ var insulinFromSuperBolus = 0.0
+ private set
+
+ var insulinFromCOB = 0.0
+ private set
+
+ var insulinFromTrend = 0.0
+ private set
+
+ var trend = 0.0
+ private set
+
+ var accepted = false
+ private set
+
+ // Result
+ var calculatedTotalInsulin: Double = 0.0
+ private set
+
+ var totalBeforePercentageAdjustment: Double = 0.0
+ private set
+
+ var carbsEquivalent: Double = 0.0
+ private set
+
+ var insulinAfterConstraints: Double = 0.0
+ private set
+
+ init {
+ doCalc()
+ }
+
+ private fun doCalc() {
+
+ // Insulin from BG
+ sens = profile.isf
+ targetBGLow = profile.targetLow
+ targetBGHigh = profile.targetHigh
+ if (useTT && tempTarget != null) {
+ targetBGLow = Profile.fromMgdlToUnits(tempTarget.low, profile.units)
+ targetBGHigh = Profile.fromMgdlToUnits(tempTarget.high, profile.units)
+ }
+ if (useBg && bg > 0) {
+ if (bg >= targetBGLow && bg <= targetBGHigh) {
+ bgDiff = 0.0
+ } else if (bg <= targetBGLow) {
+ bgDiff = bg - targetBGLow
+ } else {
+ bgDiff = bg - targetBGHigh
+ }
+ insulinFromBG = bgDiff / sens
+ }
+
+ // Insulin from 15 min trend
+ glucoseStatus = GlucoseStatus.getGlucoseStatusData()
+ glucoseStatus?.let {
+ if (useTrend) {
+ trend = it.short_avgdelta
+ insulinFromTrend = Profile.fromMgdlToUnits(trend, profile.units) * 3 / sens
+ }
+ }
+
+
+ // Insuling from carbs
+ ic = profile.ic
+ insulinFromCarbs = carbs / ic
+ insulinFromCOB = if (useCob) (cob / ic) else 0.0
+
+ // Insulin from IOB
+ // IOB calculation
+ val treatments = TreatmentsPlugin.getPlugin()
+ treatments.updateTotalIOBTreatments()
+ val bolusIob = treatments.lastCalculationTreatments.round()
+ treatments.updateTotalIOBTempBasals()
+ val basalIob = treatments.lastCalculationTempBasals.round()
+
+ insulinFromBolusIOB = if (includeBolusIOB) -bolusIob.iob else 0.0
+ insulinFromBasalsIOB = if (includeBasalIOB) -basalIob.basaliob else 0.0
+
+ // Insulin from correction
+ insulinFromCorrection = correction
+
+ // Insulin from superbolus for 2h. Get basal rate now and after 1h
+ if (useSuperBolus) {
+ insulinFromSuperBolus = profile.basal
+ var timeAfter1h = System.currentTimeMillis()
+ timeAfter1h += T.hours(1).msecs()
+ insulinFromSuperBolus += profile.getBasal(timeAfter1h)
+ }
+
+ // Total
+ calculatedTotalInsulin = insulinFromBG + insulinFromTrend + insulinFromCarbs + insulinFromBolusIOB + insulinFromBasalsIOB + insulinFromCorrection + insulinFromSuperBolus + insulinFromCOB
+
+ // Percentage adjustment
+ totalBeforePercentageAdjustment = calculatedTotalInsulin
+ if (calculatedTotalInsulin > 0) {
+ calculatedTotalInsulin = calculatedTotalInsulin * percentageCorrection / 100.0
+ }
+
+ if (calculatedTotalInsulin < 0) {
+ carbsEquivalent = (-calculatedTotalInsulin) * ic
+ calculatedTotalInsulin = 0.0
+ }
+
+ val bolusStep = ConfigBuilderPlugin.getPlugin().activePump.pumpDescription.bolusStep
+ calculatedTotalInsulin = Round.roundTo(calculatedTotalInsulin, bolusStep)
+
+ insulinAfterConstraints = MainApp.getConstraintChecker().applyBolusConstraints(Constraint(calculatedTotalInsulin)).value()
+
+ log.debug(this.toString())
+ }
+
+ fun nsJSON(): JSONObject {
+ val boluscalcJSON = JSONObject()
+ try {
+ boluscalcJSON.put("profile", profileName)
+ boluscalcJSON.put("notes", notes)
+ boluscalcJSON.put("eventTime", DateUtil.toISOString(Date()))
+ boluscalcJSON.put("targetBGLow", targetBGLow)
+ boluscalcJSON.put("targetBGHigh", targetBGHigh)
+ boluscalcJSON.put("isf", sens)
+ boluscalcJSON.put("ic", ic)
+ boluscalcJSON.put("iob", -(insulinFromBolusIOB + insulinFromBasalsIOB))
+ boluscalcJSON.put("bolusiob", insulinFromBolusIOB)
+ boluscalcJSON.put("basaliob", insulinFromBasalsIOB)
+ boluscalcJSON.put("bolusiobused", includeBolusIOB)
+ boluscalcJSON.put("basaliobused", includeBasalIOB)
+ boluscalcJSON.put("bg", bg)
+ boluscalcJSON.put("insulinbg", insulinFromBG)
+ boluscalcJSON.put("insulinbgused", useBg)
+ boluscalcJSON.put("bgdiff", bgDiff)
+ boluscalcJSON.put("insulincarbs", insulinFromCarbs)
+ boluscalcJSON.put("carbs", carbs)
+ boluscalcJSON.put("cob", cob)
+ boluscalcJSON.put("cobused", useCob)
+ boluscalcJSON.put("insulincob", insulinFromCOB)
+ boluscalcJSON.put("othercorrection", correction)
+ boluscalcJSON.put("insulinsuperbolus", insulinFromSuperBolus)
+ boluscalcJSON.put("insulintrend", insulinFromTrend)
+ boluscalcJSON.put("insulin", calculatedTotalInsulin)
+ boluscalcJSON.put("superbolusused", useSuperBolus)
+ boluscalcJSON.put("insulinsuperbolus", insulinFromSuperBolus)
+ boluscalcJSON.put("trendused", useTrend)
+ boluscalcJSON.put("insulintrend", insulinFromTrend)
+ boluscalcJSON.put("trend", trend)
+ boluscalcJSON.put("ttused", useTT)
+ } catch (e: JSONException) {
+ log.error("Unhandled exception", e)
+ }
+ return boluscalcJSON
+ }
+
+ private fun confirmMessageAfterConstraints(pump: PumpInterface): String {
+
+ var confirmMessage = MainApp.gs(R.string.entertreatmentquestion)
+ if (insulinAfterConstraints > 0)
+ confirmMessage += "
" + MainApp.gs(R.string.bolus) + ": " + "" + DecimalFormatter.toPumpSupportedBolus(insulinAfterConstraints) + "U" + ""
+ if (carbs > 0)
+ confirmMessage += "
" + MainApp.gs(R.string.carbs) + ": " + "" + carbs + "g" + ""
+
+ if (Math.abs(insulinAfterConstraints - calculatedTotalInsulin) > pump.getPumpDescription().pumpType.determineCorrectBolusStepSize(insulinAfterConstraints)) {
+ confirmMessage += "
" + MainApp.gs(R.string.bolusconstraintapplied) + ""
+ }
+
+ return confirmMessage
+ }
+
+ fun confirmAndExecute(context: Context) {
+ val profile = ProfileFunctions.getInstance().profile
+ val pump = ConfigBuilderPlugin.getPlugin().activePump
+
+ if (pump != null && profile != null && (calculatedTotalInsulin > 0.0 || carbs > 0.0)) {
+ val confirmMessage = confirmMessageAfterConstraints(pump)
+
+ val builder = AlertDialog.Builder(context)
+ builder.setTitle(MainApp.gs(R.string.confirmation))
+ builder.setMessage(Html.fromHtml(confirmMessage))
+ builder.setPositiveButton(MainApp.gs(R.string.ok)) { _, _ ->
+ synchronized(builder) {
+ if (accepted) {
+ log.debug("guarding: already accepted")
+ return@setPositiveButton
+ }
+ accepted = true
+ if (insulinAfterConstraints > 0 || carbs > 0) {
+ if (useSuperBolus) {
+ val loopPlugin = LoopPlugin.getPlugin()
+ if (loopPlugin.isEnabled(PluginType.LOOP)) {
+ loopPlugin.superBolusTo(System.currentTimeMillis() + 2 * 60L * 60 * 1000)
+ MainApp.bus().post(EventRefreshOverview("WizardDialog"))
+ }
+
+ val pump1 = ConfigBuilderPlugin.getPlugin().activePump
+
+ if (pump1.pumpDescription.tempBasalStyle == PumpDescription.ABSOLUTE) {
+ ConfigBuilderPlugin.getPlugin().commandQueue.tempBasalAbsolute(0.0, 120, true, profile, object : Callback() {
+ override fun run() {
+ if (!result.success) {
+ val i = Intent(MainApp.instance(), ErrorHelperActivity::class.java)
+ i.putExtra("soundid", R.raw.boluserror)
+ i.putExtra("status", result.comment)
+ i.putExtra("title", MainApp.gs(R.string.tempbasaldeliveryerror))
+ i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+ MainApp.instance().startActivity(i)
+ }
+ }
+ })
+ } else {
+
+ ConfigBuilderPlugin.getPlugin().commandQueue.tempBasalPercent(0, 120, true, profile, object : Callback() {
+ override fun run() {
+ if (!result.success) {
+ val i = Intent(MainApp.instance(), ErrorHelperActivity::class.java)
+ i.putExtra("soundid", R.raw.boluserror)
+ i.putExtra("status", result.comment)
+ i.putExtra("title", MainApp.gs(R.string.tempbasaldeliveryerror))
+ i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+ MainApp.instance().startActivity(i)
+ }
+ }
+ })
+ }
+ }
+ val detailedBolusInfo = DetailedBolusInfo()
+ detailedBolusInfo.eventType = CareportalEvent.BOLUSWIZARD
+ detailedBolusInfo.insulin = insulinAfterConstraints
+ detailedBolusInfo.carbs = carbs.toDouble()
+ detailedBolusInfo.context = context
+ detailedBolusInfo.glucose = bg
+ detailedBolusInfo.glucoseType = "Manual"
+ detailedBolusInfo.carbTime = carbTime
+ detailedBolusInfo.boluscalc = nsJSON()
+ detailedBolusInfo.source = Source.USER
+ detailedBolusInfo.notes = notes
+ if (detailedBolusInfo.insulin > 0 || ConfigBuilderPlugin.getPlugin().activePump.pumpDescription.storesCarbInfo) {
+ ConfigBuilderPlugin.getPlugin().commandQueue.bolus(detailedBolusInfo, object : Callback() {
+ override fun run() {
+ if (!result.success) {
+ val i = Intent(MainApp.instance(), ErrorHelperActivity::class.java)
+ i.putExtra("soundid", R.raw.boluserror)
+ i.putExtra("status", result.comment)
+ i.putExtra("title", MainApp.gs(R.string.treatmentdeliveryerror))
+ i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+ MainApp.instance().startActivity(i)
+ }
+ }
+ })
+ } else {
+ TreatmentsPlugin.getPlugin().addToHistoryTreatment(detailedBolusInfo, false)
+ }
+ }
+ }
+ }
+ builder.setNegativeButton(MainApp.gs(R.string.cancel), null)
+ builder.show()
+ }
+ }
+}
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 da4c69149e..1a6e1c3c20 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/DateUtil.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/DateUtil.java
@@ -1,6 +1,6 @@
package info.nightscout.androidaps.utils;
-import android.support.v4.util.LongSparseArray;
+import androidx.collection.LongSparseArray;
import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/JsonHelper.java b/app/src/main/java/info/nightscout/androidaps/utils/JsonHelper.java
index 8f7d9611b1..c130353419 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/JsonHelper.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/JsonHelper.java
@@ -1,6 +1,6 @@
package info.nightscout.androidaps.utils;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import org.json.JSONException;
import org.json.JSONObject;
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/OKDialog.java b/app/src/main/java/info/nightscout/androidaps/utils/OKDialog.java
index 00b3c29692..98d8845ff8 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/OKDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/OKDialog.java
@@ -5,8 +5,8 @@ import android.content.Context;
import android.content.DialogInterface;
import android.os.Handler;
import android.os.SystemClock;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.view.ContextThemeWrapper;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.view.ContextThemeWrapper;
import android.text.Spanned;
import org.slf4j.Logger;
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/SingleClickButton.java b/app/src/main/java/info/nightscout/androidaps/utils/SingleClickButton.java
index eef4ca57fe..74500ebdbc 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/SingleClickButton.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/SingleClickButton.java
@@ -3,7 +3,7 @@ package info.nightscout.androidaps.utils;
import android.app.Activity;
import android.content.Context;
import android.os.SystemClock;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.util.AttributeSet;
import android.view.View;
@@ -14,7 +14,7 @@ import org.slf4j.LoggerFactory;
* Created by mike on 22.12.2017.
*/
-public class SingleClickButton extends android.support.v7.widget.AppCompatButton implements View.OnClickListener {
+public class SingleClickButton extends androidx.appcompat.widget.AppCompatButton implements View.OnClickListener {
private static Logger log = LoggerFactory.getLogger(SingleClickButton.class);
Context context;
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/StringUtils.java b/app/src/main/java/info/nightscout/androidaps/utils/StringUtils.java
index cad2b76291..d089d213d4 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/StringUtils.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/StringUtils.java
@@ -1,5 +1,8 @@
package info.nightscout.androidaps.utils;
+import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.R;
+
/**
* class contains useful String functions
*/
@@ -17,4 +20,8 @@ public class StringUtils {
return string;
}
+
+ public static String formatInsulin(double insulin) {
+ return String.format(MainApp.gs(R.string.formatinsulinunits), insulin);
+ }
}
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/TimeListEdit.java b/app/src/main/java/info/nightscout/androidaps/utils/TimeListEdit.java
index d120e102d1..c8f767f77e 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/TimeListEdit.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/TimeListEdit.java
@@ -2,8 +2,8 @@ package info.nightscout.androidaps.utils;
import android.content.Context;
import android.os.Handler;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.widget.TextViewCompat;
+import androidx.core.content.ContextCompat;
+import androidx.core.widget.TextViewCompat;
import android.text.Editable;
import android.text.TextWatcher;
import android.view.Gravity;
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/XdripCalibrations.java b/app/src/main/java/info/nightscout/androidaps/utils/XdripCalibrations.java
index 99961a156b..f7b8761823 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/XdripCalibrations.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/XdripCalibrations.java
@@ -5,7 +5,7 @@ import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.ResolveInfo;
import android.os.Bundle;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/app/src/main/res/layout/activity_historybrowse.xml b/app/src/main/res/layout/activity_historybrowse.xml
index 96b2b5871c..84f52f48c8 100644
--- a/app/src/main/res/layout/activity_historybrowse.xml
+++ b/app/src/main/res/layout/activity_historybrowse.xml
@@ -1,5 +1,5 @@
-
-
+
diff --git a/app/src/main/res/layout/activity_insight_pairing.xml b/app/src/main/res/layout/activity_insight_pairing.xml
index d90b5f091d..83412a8645 100644
--- a/app/src/main/res/layout/activity_insight_pairing.xml
+++ b/app/src/main/res/layout/activity_insight_pairing.xml
@@ -18,7 +18,7 @@
android:text="@string/searching_for_devices"
android:textSize="20sp" />
-
-
-
-
-
+
-
-
-
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/bgsource_fragment.xml b/app/src/main/res/layout/bgsource_fragment.xml
index 73829c12d4..6619b6bafa 100644
--- a/app/src/main/res/layout/bgsource_fragment.xml
+++ b/app/src/main/res/layout/bgsource_fragment.xml
@@ -10,12 +10,12 @@
android:layout_height="match_parent"
android:orientation="vertical">
-
-
+
diff --git a/app/src/main/res/layout/bgsource_item.xml b/app/src/main/res/layout/bgsource_item.xml
index acd0454327..4cb3be97b8 100644
--- a/app/src/main/res/layout/bgsource_item.xml
+++ b/app/src/main/res/layout/bgsource_item.xml
@@ -1,5 +1,5 @@
-
-
+
diff --git a/app/src/main/res/layout/careportal_fragment.xml b/app/src/main/res/layout/careportal_fragment.xml
index 1e4c72dd72..a9791a1b88 100644
--- a/app/src/main/res/layout/careportal_fragment.xml
+++ b/app/src/main/res/layout/careportal_fragment.xml
@@ -45,7 +45,7 @@
android:paddingStart="15dp"
android:text="@string/careportal_activity_label" />
-
-
+
-
-
+
-
-
+
-
-
+
diff --git a/app/src/main/res/layout/danar_history_item.xml b/app/src/main/res/layout/danar_history_item.xml
index 6df07edd62..b03a26f55a 100644
--- a/app/src/main/res/layout/danar_history_item.xml
+++ b/app/src/main/res/layout/danar_history_item.xml
@@ -1,5 +1,5 @@
-
-
+
diff --git a/app/src/main/res/layout/danar_historyactivity.xml b/app/src/main/res/layout/danar_historyactivity.xml
index 8c7f8a8e6e..f3cc2ece29 100644
--- a/app/src/main/res/layout/danar_historyactivity.xml
+++ b/app/src/main/res/layout/danar_historyactivity.xml
@@ -50,7 +50,7 @@
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal" />
-
-
-
+
diff --git a/app/src/main/res/layout/food_item.xml b/app/src/main/res/layout/food_item.xml
index d4efc403a3..b6b6adbcf8 100644
--- a/app/src/main/res/layout/food_item.xml
+++ b/app/src/main/res/layout/food_item.xml
@@ -1,5 +1,5 @@
-
-
+
diff --git a/app/src/main/res/layout/objectives_fragment.xml b/app/src/main/res/layout/objectives_fragment.xml
index f2b18e703d..56edc011f9 100644
--- a/app/src/main/res/layout/objectives_fragment.xml
+++ b/app/src/main/res/layout/objectives_fragment.xml
@@ -31,7 +31,7 @@
android:text="Reset" />
-
-
-
+
diff --git a/app/src/main/res/layout/overview_fragment.xml b/app/src/main/res/layout/overview_fragment.xml
index a21cf30d03..2192ac62f4 100644
--- a/app/src/main/res/layout/overview_fragment.xml
+++ b/app/src/main/res/layout/overview_fragment.xml
@@ -20,12 +20,12 @@
android:layout_height="wrap_content"
android:orientation="vertical">
-
-
+
-
-
+
-
-
+
-
-
+
-
-
+
diff --git a/app/src/main/res/layout/overview_quickwizardlist_activity.xml b/app/src/main/res/layout/overview_quickwizardlist_activity.xml
index 227f946486..3ef067d044 100644
--- a/app/src/main/res/layout/overview_quickwizardlist_activity.xml
+++ b/app/src/main/res/layout/overview_quickwizardlist_activity.xml
@@ -29,7 +29,7 @@
android:layout_height="wrap_content"
android:id="@+id/overview_quickwizardactivity_add_button" />
-
diff --git a/app/src/main/res/layout/overview_quickwizardlist_item.xml b/app/src/main/res/layout/overview_quickwizardlist_item.xml
index 429e2ca2de..5d186ffaf4 100644
--- a/app/src/main/res/layout/overview_quickwizardlist_item.xml
+++ b/app/src/main/res/layout/overview_quickwizardlist_item.xml
@@ -1,5 +1,5 @@
-
-
+
diff --git a/app/src/main/res/layout/treatments_bolus_fragment.xml b/app/src/main/res/layout/treatments_bolus_fragment.xml
index c04aac5f9f..db8e0bbbbb 100644
--- a/app/src/main/res/layout/treatments_bolus_fragment.xml
+++ b/app/src/main/res/layout/treatments_bolus_fragment.xml
@@ -75,12 +75,12 @@
-
-
+
diff --git a/app/src/main/res/layout/treatments_bolus_item.xml b/app/src/main/res/layout/treatments_bolus_item.xml
index 29cbb6fe1d..ff277dcbc0 100644
--- a/app/src/main/res/layout/treatments_bolus_item.xml
+++ b/app/src/main/res/layout/treatments_bolus_item.xml
@@ -1,5 +1,5 @@
-
-
+
diff --git a/app/src/main/res/layout/treatments_careportal_fragment.xml b/app/src/main/res/layout/treatments_careportal_fragment.xml
index e0918d0301..5460c738af 100644
--- a/app/src/main/res/layout/treatments_careportal_fragment.xml
+++ b/app/src/main/res/layout/treatments_careportal_fragment.xml
@@ -34,12 +34,12 @@
-
-
+
diff --git a/app/src/main/res/layout/treatments_careportal_item.xml b/app/src/main/res/layout/treatments_careportal_item.xml
index 9f688d2438..251272cb25 100644
--- a/app/src/main/res/layout/treatments_careportal_item.xml
+++ b/app/src/main/res/layout/treatments_careportal_item.xml
@@ -1,5 +1,5 @@
-
-
+
diff --git a/app/src/main/res/layout/treatments_extendedbolus_fragment.xml b/app/src/main/res/layout/treatments_extendedbolus_fragment.xml
index cf5b425f8d..5c46d9e3a6 100644
--- a/app/src/main/res/layout/treatments_extendedbolus_fragment.xml
+++ b/app/src/main/res/layout/treatments_extendedbolus_fragment.xml
@@ -9,12 +9,12 @@
android:layout_height="match_parent"
android:orientation="vertical">
-
-
+
diff --git a/app/src/main/res/layout/treatments_extendedbolus_item.xml b/app/src/main/res/layout/treatments_extendedbolus_item.xml
index 421bbccb81..24230e70ac 100644
--- a/app/src/main/res/layout/treatments_extendedbolus_item.xml
+++ b/app/src/main/res/layout/treatments_extendedbolus_item.xml
@@ -1,5 +1,5 @@
-
-
+
diff --git a/app/src/main/res/layout/treatments_profileswitch_fragment.xml b/app/src/main/res/layout/treatments_profileswitch_fragment.xml
index bb63495dce..f6b0881982 100644
--- a/app/src/main/res/layout/treatments_profileswitch_fragment.xml
+++ b/app/src/main/res/layout/treatments_profileswitch_fragment.xml
@@ -17,12 +17,12 @@
android:layout_gravity="center_horizontal"
android:text="@string/refresheventsfromnightscout" />
-
-
+
diff --git a/app/src/main/res/layout/treatments_profileswitch_item.xml b/app/src/main/res/layout/treatments_profileswitch_item.xml
index bcd3836fe2..de457274ff 100644
--- a/app/src/main/res/layout/treatments_profileswitch_item.xml
+++ b/app/src/main/res/layout/treatments_profileswitch_item.xml
@@ -1,5 +1,5 @@
-
-
+
diff --git a/app/src/main/res/layout/treatments_tempbasals_fragment.xml b/app/src/main/res/layout/treatments_tempbasals_fragment.xml
index 062db7a4a8..47c15d6117 100644
--- a/app/src/main/res/layout/treatments_tempbasals_fragment.xml
+++ b/app/src/main/res/layout/treatments_tempbasals_fragment.xml
@@ -34,12 +34,12 @@
-
-
+
diff --git a/app/src/main/res/layout/treatments_tempbasals_item.xml b/app/src/main/res/layout/treatments_tempbasals_item.xml
index 2504292034..f57a3426e0 100644
--- a/app/src/main/res/layout/treatments_tempbasals_item.xml
+++ b/app/src/main/res/layout/treatments_tempbasals_item.xml
@@ -1,5 +1,5 @@
-
-
+
diff --git a/app/src/main/res/layout/treatments_temptarget_fragment.xml b/app/src/main/res/layout/treatments_temptarget_fragment.xml
index 3f3e26e899..c83332fb53 100644
--- a/app/src/main/res/layout/treatments_temptarget_fragment.xml
+++ b/app/src/main/res/layout/treatments_temptarget_fragment.xml
@@ -17,12 +17,12 @@
android:layout_gravity="center_horizontal"
android:text="@string/refresheventsfromnightscout" />
-
-
+
diff --git a/app/src/main/res/layout/treatments_temptarget_item.xml b/app/src/main/res/layout/treatments_temptarget_item.xml
index b85ef8a80a..c26fb8c22e 100644
--- a/app/src/main/res/layout/treatments_temptarget_item.xml
+++ b/app/src/main/res/layout/treatments_temptarget_item.xml
@@ -1,5 +1,5 @@
-
-
+
diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
index a0a0048ca1..f2b6a1bc8a 100644
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@@ -147,6 +147,8 @@
Beperkings skending
Bolus aflewering fout
Tempbasal aflewering fout
+ Basale waarde [%%]
+ %% (100%% = huidig)
Aanvaar nuwe tydelike basale:
Behandeling
Rekenaar
@@ -246,6 +248,7 @@
Pomp IAB
Daaglikse eenhede
Laaste bolus
+ %1$.1fh terug
Ongeldige invoer
Waarde nie behoorlik gestel
Herlaai profiel
@@ -525,6 +528,7 @@
Insulien weerstandige volwasse
Kies asseblief pasiënt ouderdom om veiligheids limiete te stel
Glimp
+ %1$s benodig battery optimisering bemagtiging vir beter werksverrigting
Lus opgeskort
Opgeskort (%1$d m)
Superbolus (%1$d m)
@@ -560,6 +564,8 @@
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
@@ -758,6 +764,7 @@
Loop tans
Kanselleer TBR
Stel TBR (%1$d%% / %2$d min)
+ Bolusing (%1$.1f U)
Verfris
Versoekte bewerking nie ondersteun deur pomp
Onveilige gebruik: uitgebreide of multigolf boluses is aktief. Lus modus is gestel om laag te opskort net 6 ure. Net gewone boluses is ondersteun in lus modus
@@ -1149,6 +1156,12 @@
Verkeerde kode. Opdrag gekanselleer.
Nie gekonfigureer nie
Profiel skakelaar geskep
+ Weergawe Navolger
+ ou weergawe
+ baie ou weergawe
+ Nuwe weergawe reeds beskikbaar vir %1$d! Sal na 60 dae terugval na LGS, lus sal ongeldig gemaak word na 90 dae
+ 2h
+ %1$.2fU
- %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 8453a50ffe..0c3b51a97c 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -1160,6 +1160,8 @@
стара версия
много стара версия
Има нова версия от най-малко %1$d дни! Връщане към LGS след 60 дни, цикълът ще бъде изключен след 90 дни
+ 2ч
+ %1$.2fЕ
- %1$d дeн
- %1$d дни
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 2d0a15d6ac..589dafb8ef 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1162,6 +1162,8 @@ Unerwartetes Verhalten.
Vorherige Version
sehr alte Version
Neue Version für mindestens %1$d Tage verfügbar! Rückfall zur sensorunterstützten Pumpentherapie nach 60 Tagen, Loop wird nach 90 Tagen deaktiviert
+ 2h
+ %1$.2f IE
- %1$d Tag
- %1$d Tage
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 0ae7423e5d..8dd502b75c 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1161,6 +1161,8 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
ancienne version
très ancienne version
Une nouvelle version est disponible depuis au moins %1$d jours ! Retour au traitement par pompe assistée par capteur (Arrêt par Glycémie Basse (AGB), Low Glucose Suspend (LGS) ) après 60 jours et la Boucle sera désactivée après 90 jours
+ 2 h
+ %1$.2fU
- %1$d jour
- %1$d jours
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 313c3fdde5..2d164b3247 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -9,6 +9,7 @@
Reset database
Wil je echt de database wissen?
Afsluiten
+ Gebruik vertraagde bolussen voor >200%%
DanaR Bluetooth apparaat
Gebruik altijd absolute basale waarden
Herstart je telefoon of herstart AndroidAPS vanuit de systeem instellingen a. u. b. \nanders zal AndroidAPS geen logboek hebben (Belangrijk om te controleren of de algoritmes correct werken)!
@@ -53,6 +54,7 @@
AndroidAPS controleren en bedienen met behulp van uw WearOS-horloge.
Toon informatie over de Loop op jouw xDrip+ wijzerplaat.
Bedien AndroidAPS op afstand met SMS commando\'s.
+ Terug
Start
Controleer
Eénheden
@@ -145,6 +147,8 @@
In strijd met beperkingen
Bolus toedien storing
Tijdelijk basaal toedien storing
+ Basaal waarde [%%]
+ %% (100%% = huidig)
Accepteer nieuw tijdelijk basaal:
Bolus
Bolus wizard
@@ -244,6 +248,7 @@
Pomp IOB
Dag totaal
Laatste bolus
+ %1$.1fu geleden
Verkeerde ingave
Waarde niet correct ingesteld
Herlaad profiel
@@ -261,6 +266,10 @@
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 van %1$.2fE succesvol toegediend
+ Er worden %1$.2fE toegediend
+ Bolus van %1$.2fE succesvol toegediend
+ Toedienen van %1$.2fE
Sta SMS commando\'s toe
Vingerprik
Sensor
@@ -305,6 +314,7 @@
Stop
STOP INGEDRUKT
Wacht op pomp
+ Er worden %1$.2fE toegediend
Opzetten van visualisatie en monitoring en analyzeren van basaal en ratio\'s
Controleren van beschikbaarheid BG en insuline pomp data op Nightscout
Starten met de Open Loop modus
@@ -328,12 +338,26 @@ Stel in en gebruik tijdelijk en standaard tijdelijke streefdoelen (bv. bij sport
Loop is uitgeschakeld
Loop is ingeschakeld
%1$.2f gelimiteerd tot %2$.2f
+ Waarde %1$s valt buiten de toegestane harde limieten
Commando\'s op afstand zijn niet toegestaan
+ Bolus op afstand niet beschikbaar. Probeer het later opnieuw.
+ Om een basaal van %1$.2fE/u voor %2$d min te starten antwoord met code %3$s
+ Om naar profiel %1$s %2$d%% te wisselen antwoord met code %3$s
+ Om een vertraagde bolus van %1$.2fE voor %2$d min te starten antwoord met code %3$s
+ Om een basaal van %1$d% voor %2$d min te starten antwoord met code %3$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
+ Vertraagde bolus %1$.2fE voor %2$d minuten succesvol gestart
+ Tijdelijk basaal van %1$d%% voor %2$d minuten succesvol gestart
Start tijdelijk basaal mislukt
+ Starten vertraagde bolus is mislukt
+ Om het tijdelijke basaal te stoppen antwoord met de code %1$s
+ Om de vertraagde bolus te stoppen antwoord met de code %1$s
Tijdelijk basaal afgebroken
+ Vertraagde bolus is geannuleerd
Afbreken van tijdelijk basaal mislukt
+ Annuleren van vertraagde bolus is mislukt
+ Onbekende opdracht of verkeerd antwoord
Vaste maaltijd
Vaste maaltijd instellingen
Naam:
@@ -441,6 +465,7 @@ Stel in en gebruik tijdelijk en standaard tijdelijke streefdoelen (bv. bij sport
Profiel
Standaard waarde: 3.0 Dit is een belangrijke veiligheid parameter van OpenAPS. Dit limiteert je basaal met een max van 3 maal je hoogste basale dosis. Normaal hoef je deze niet te veranderen. Het is echter belangrijk dat je de ingebouwde limieten kent.
Standaard waarde: 4 Dit is een combinatie van enerzijds het OpenAPS veiligheid limieten en anderzijds van “3 x max dagelijks basaal; 4x actueel”. Dit betekent dat het basaal niet hoger kan ingesteld worden dan het ingestelde nummer keer het actueel basaal waarbij de limiet in de pomp geen invloed heeft. Dit is een veiligheidsmaatregel om te voorkomen dat patiënten in gevaarlijke laag bereik komen zonder te snappen hoe het algoritme werkt. Nogmaals de standaard waarde is 4x; de meeste zullen deze waarde nooit moeten aanpassen maar zullen eerder andere waardes moeten aanpassen als ze tegen een limiet aanstoten.
+ Standaard waarde: 1.2\nDit is een vermenigvuldigingsfactor voor autosense (en binnenkort autotune) die zorgt dat de autosens ratio maximaal 20%% kan zijn. Dit maximum bepaalt in hoeverre je basaal kan worden verhoogd, en hoeveel je ISF en BG doel verlaagd kunnen worden.
Standaard waarde: 0.7\nDit is de andere kan van de autosens veiligheid limiet. Dit zet een limiet op hoe laag het basaal kan aangepast worden, en hoe hoog het ISF en het streef BG.
Autosens past de streefwaardes ook aan
Standaardwaarde: waar Dit wordt gebruikt om autosens de bevoegdheid te geven BG doelen aan te passen alsook ISF en basalen
@@ -453,6 +478,7 @@ Stel in en gebruik tijdelijk en standaard tijdelijke streefdoelen (bv. bij sport
Telefoon nummer niet conform
Foutief SMS telefoon nummer
Kalibratie
+ Calibratie %1$.1f naar xDrip verzenden?
xDrip+ niet geïnstalleerd
Kalibratie naar xDrip verzonden
Kalibratie verzonden. Het ontvangen van kalibraties moet actief zijn in xDrip.
@@ -503,6 +529,7 @@ Stel in en gebruik tijdelijk en standaard tijdelijke streefdoelen (bv. bij sport
insuline resistente volwassene
Kies leeftijd van de patient voor veiligheids limieten
Glimp
+ Voor een goede werking van %1$s moeten de accubesparing-opties zijn uitgeschakeld in de telefooninstellingen
Loop pauzeren
Gepauzeerd (%1$d m)
Superbolus (%1$d m)
@@ -538,6 +565,8 @@ Stel in en gebruik tijdelijk en standaard tijdelijke streefdoelen (bv. bij sport
Statusindicatoren inschakelen voor cage, iage, sage, reservoir en batterijniveau op het beginscherm.
Drempel waarschuwing reservoir niveau [E]
Drempel alarm reservoir niveau [E]
+ Drempel waarschuwing batterij niveau [%%]
+ Drempel alarm voor batterij niveau [%%]
IOB
COB
Firmware
@@ -590,6 +619,7 @@ Stel in en gebruik tijdelijk en standaard tijdelijke streefdoelen (bv. bij sport
Opname instellingen
Max absorptietijd maaltijd [uur]
Verwachte tijd in uren totdat alle koolhydraten opgenomen zijn
+ Geef vertraagde bolus weer in %%
SAGE
IAGE
CAGE
@@ -702,6 +732,8 @@ Stel in en gebruik tijdelijk en standaard tijdelijke streefdoelen (bv. bij sport
Stuur BG data naar xDrip+
In xDrip+ kies 640g/Eversense data bron
NSClient BG
+ Basale waarde vervangen door minimaal ondersteunde waarde; %1$s
+ Basale waarde vervangen door maximale ondersteunde waarde: %1$s
BG berekening
Bolus IOB berekening
Basaal IOB berekening
@@ -719,6 +751,8 @@ Stel in en gebruik tijdelijk en standaard tijdelijke streefdoelen (bv. bij sport
Closed modus actief
Maximum IOB juist ingesteld
BG beschikbaar op gekozen bron
+ Basaalstanden niet ingesteld in hele uren: %1$s
+ Ongeldig profiel: %1$s
Bolus in pomp programmeren
Vernieuw
Status
@@ -731,6 +765,7 @@ Stel in en gebruik tijdelijk en standaard tijdelijke streefdoelen (bv. bij sport
Actief
Annuleren van TB
Instellen TBR (%1$d%% / %2$d min)
+ Toedienen bolus (%1$.1f E)
Vernieuwen
Gevraagde is niet mogelijk met de pomp
Opgelet: verlengde en multi wave bolussen zijn actief. Loop is overgeschakeld naar low-suspend modus gedurende 6 uur. Alleen gewone bolussen worden ondersteund in loop modus
@@ -1053,11 +1088,13 @@ Stel in en gebruik tijdelijk en standaard tijdelijke streefdoelen (bv. bij sport
Geluid dempen
Pomp alarm
Infuuswissel noteren
+ Reservoirwissel noteren
Slangwissel noteren
Batterijwissel noteren
Werkingsmodus-wissel noteren
- Alarm noteren
+ Alarmen noteren
TBR-emulatie inschakelen
+ Gebruik vertraagde bolus ipv TBRs om de limiet van 250%% te omzeilen
Verbindingsvertraging [s]
Serienummer
Release softwareversie
@@ -1113,8 +1150,18 @@ Stel in en gebruik tijdelijk en standaard tijdelijke streefdoelen (bv. bij sport
Tomato (MiaoMiao)
Tomato
Zomer/wintertijd omschakeling binnen 24 uur
+ Omschakeling zomer/wintertijd minder dan 3 uur geleden - Closed Loop modus gedeactiveerd
interne opslag bijna vol
Maak minstens %1$d MB vrij in interne opslag! Loop is uitgeschakeld!
+ Verkeerde invoer
+ Verkeerde code. Opdracht geannuleerd.
+ Niet ingesteld
+ Profiel wissel aangemaakt
+ Versie Checker
+ oude versie
+ zeer oude versie
+ Er is als sinds ten minste %1$d dagen een nieuwe versie beschikbaar! Na 60 dagen wordt de loop beperkt tot LGS, na 90 dagen zal de loop worden uitgeschakeld
+ 2u
- %1$d dag
- %1$d dag
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 36ffb7c5e9..4da6630cef 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -1160,6 +1160,8 @@
versão antiga
versão muito antiga
Nova versão para pelo menos %1$d dias disponíveis! Voltar para o LGS após 60 dias, o loop será desativado após 90 dias
+ 2h
+ %1$.2fU
- %1$d dia
- %1$d dias
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index aaa07dfec0..af83011fb8 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -1162,4 +1162,6 @@ Context | Edit Context
старая версия
очень старая версия
Новая версия доступна не менее %1$d дней! После 60 дней переход на остановку при низкой гликемии LGS, замкнутый цикл будет отключен через 90 дней
+ 2ч
+ %1$.2f ед
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 7e4b22eacd..997a859a16 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -9,6 +9,7 @@
重置数据库
你真的想重置数据库吗?
退出
+ 使用>200%%的扩展大剂量（extended boluses）
DanaR 蓝牙设备
总是使用基础率的绝对值
请重启你的手机或者从系统设置里重启AndroidAPS软件 \n 否则 Android APS将不会记录日志 (这对于跟踪和检查算法是否正确很重要)!
@@ -146,6 +147,8 @@
违反约束条件
大剂量输注错误
临时基础输注错误
+ 基础率值 [%%]
+ %% (100%% = 当前)
接受新的临时基础率
治疗
计算器
@@ -245,6 +248,7 @@
泵 IOB
每日单位数
上次大剂量
+ %1$.1f小时前
无效的输入数据
数值设定的不正确
重新加载配置文件
@@ -310,6 +314,7 @@
停止
停止键按下了
正在等待泵
+ 将要输注 %1$.2fU
设置可视化和监视, 并分析基础率和比率
验证 Nightscout 中的血糖是否可用, 并且正在上传泵的胰岛素数据
开始开环
@@ -332,6 +337,7 @@
闭环被禁用
闭环被启用
%1$.2f 超过 %2$.2f的限制
+ 值 %1$s 超过了硬限制
远程命令没有被允许
远程大剂量不可用。请稍后再试。
要开始基础率 %1$.2fU/h 持续时间%2$d 分钟，请回复如下代码 %3$s
@@ -458,6 +464,7 @@
配置文件
默认值: 3 这是一个关键的 OpenAPS 安全阀值。这是限制你的闭环可以最大扩张3倍的日最大基础率。你可能不需要改变这个值 但你应该这个值的含义。日最大基础率的3倍，当前基础率的4倍，这是建议的安全阀值
默认值: 4 这是另一个的关键 OpenAPS 安全阀值, 日最大基础率的3倍，当前基础率的4倍，这是建议的安全阀值。这意味着你的基础率, 无论你的泵上的最大基础率设置的多少，也 不能超过你的当前基础率的4倍。这是为了防止人们在了解该算法的工作原理之前进入危险的领域 。同样, 默认值为 4倍; 大多数人将永远不需要调整, 而是更有可能需要调整其他设置,
+ 默认值: 1.2 \n 这是 autosens 的安全阀值 对 autosens ( 很快autotune) 比率的高值设置最大增加20%% 最大限制, 这反过来决定了 autosens 可以调整的基础率的上限值, 可以调整的胰岛素敏感系数的下限值, 以及它可以设置血糖目标的下限值。
默认值: 0.7 \n 这是autosens 的另一个安全阈值, 。这个值决定了 autosens 可以调整的基础率的下限值, 可以调整的胰岛素敏感系数的上限值, 以及它可以设置血糖目标的上限值。
Autosens 也调整目标血糖
缺省值：是\n 这是用来允许 autosens调整血糖目标，还有 ISF胰岛素敏感系数和基础率这些参数。
@@ -470,6 +477,7 @@
电话号码无效
无效的SMS手机号码
校准
+ 确认将校准值 %1$.1f 发送到 xDrip 吗？
没有安装xDrip+
校准发送到 xDrip
校准值发送了，必须在xDrip开启允许通过其他app使用它的校准功能
@@ -520,6 +528,7 @@
胰岛素抵抗成人
请选择患者年龄以设置安全限制
Glimp
+ %1$s 需要加入电池优化白名单才能正常运行
闭环暂停了
暂停了 (%1$d m)
超级大剂量 (%1$d m)
@@ -555,6 +564,8 @@
在主屏幕上启用cage(碳水时间)、iage(胰岛素时间)、sage(探头使用时间)、储药器和电池电量的状态指示灯。
储药器药量低于阈值[U] 警告
储药器药量低于阈值[U] 严重警告
+ 电池电量低于阈值[%%] 警告
+ 电池电量低于阈值[%%] 严重警告
IOB活性胰岛素
COB活性碳水
固件
@@ -607,6 +618,7 @@
食物吸收设置
膳食最大吸收时间 [h]
预计膳食中所有的碳水化合物被吸收的时间，以小时为单位
+ 用百分比的形式显示扩展 %%
探头AGE
胰岛素AGE
管路AGE
@@ -719,6 +731,8 @@
将血糖数据发送到 xDrip +
在 xDrip + 选择640ｇ/Eversense 数据源
NSClient 血糖
+ 基础率值被泵支持的最小值: %1$s 替换了
+ 基础率值被泵支持的最大值:%1$s 替换了
血糖计算
大剂量IOB (活性胰岛素) 计算
基础率IOB (活性胰岛素) 计算
@@ -736,6 +750,8 @@
闭环模式启用了
合理地设置最大 IOB
所选的血糖值来源的血糖是可用的
+ 基础率值与小时不一致:%1$s
+ 无效的配置文件：%1$s
正在调用泵上的大剂量输注程序
刷新
状态
@@ -748,6 +764,7 @@
正在运行
正在取消临时基础率
正在设置临时基础率 (%1$d%% / %2$d 分钟)
+ 正在输注大剂量 (%1$.1f U)
正在刷新
泵不支持请求的操作
不安全的用法: 扩展大剂量(方波) 或者双波被启用了，闭环只支持常规大剂量， 闭环已经被设置为6个小时的低血糖暂停模式(low-suspend only 6 hours).
@@ -1076,6 +1093,7 @@
记录操作模式更改
记录报警
启用 TBR (临时基础率) 模拟
+ 使用扩展大剂量而不是TBRs(临时基础率) 绕过250%%的限制
断开连接延迟 [s]
序列号
发行软件版本
@@ -1138,6 +1156,10 @@
错误的代码。命令取消
未配置
配置文件切换已创建
+ 版本检查器
+ 旧版本
+ 非常旧版本
+ 至少可用 %1$d 天的新版本！60 天后返回 LGS，90 天后循环将被禁用
- %1$d 天
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 92ae764b03..e1cc34c2c6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -993,6 +993,7 @@
Fabric Upload
Allow automated crash reporting and feature usage data to be sent to the developers via the fabric.io service.
Please update your Dexcom app to supported version
+ Dexcom app is not installed.
Start Activity TT
Start Eating soon TT
TT
@@ -1389,6 +1390,12 @@
old version
very old version
New version for at least %1$d days available! Fallback to LGS after 60 days, loop will be disabled after 90 days
+ 2h
+ %1$.2fU
+
+ Dexcom App (patched)
+ DXCM
+ Receive BG values from the patched Dexcom app.
Notification
Notification: %1$s
diff --git a/app/src/main/res/xml/pref_insight_local.xml b/app/src/main/res/xml/pref_insight_local_full.xml
similarity index 100%
rename from app/src/main/res/xml/pref_insight_local.xml
rename to app/src/main/res/xml/pref_insight_local_full.xml
diff --git a/app/src/main/res/xml/pref_insight_local_pumpcontrol.xml b/app/src/main/res/xml/pref_insight_local_pumpcontrol.xml
new file mode 100644
index 0000000000..74e5586bf6
--- /dev/null
+++ b/app/src/main/res/xml/pref_insight_local_pumpcontrol.xml
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/test/java/info/AAPSMocker.java b/app/src/test/java/info/AAPSMocker.java
index 1cf320b270..1ca2566eb8 100644
--- a/app/src/test/java/info/AAPSMocker.java
+++ b/app/src/test/java/info/AAPSMocker.java
@@ -57,6 +57,7 @@ public class AAPSMocker {
public static CommandQueue queue;
public static ConfigBuilderPlugin configBuilderPlugin;
public static ProfileFunctions profileFunctions;
+ public static ConstraintChecker constraintChecker;
public static void mockStrings() {
Locale.setDefault(new Locale("en", "US"));
@@ -172,7 +173,7 @@ public class AAPSMocker {
}
public static ConstraintChecker mockConstraintsChecker() {
- ConstraintChecker constraintChecker = mock(ConstraintChecker.class);
+ constraintChecker = mock(ConstraintChecker.class);
when(MainApp.getConstraintChecker()).thenReturn(constraintChecker);
return constraintChecker;
}
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 fbbd72f064..edfd30180a 100644
--- a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.java
@@ -283,6 +283,8 @@ public class ConstraintsCheckerTest {
AAPSMocker.mockSP();
AAPSMocker.mockCommandQueue();
+ when(mainApp.getPackageName()).thenReturn("info.nightscout.androidaps");
+
// RS constructor
when(SP.getString(R.string.key_danars_address, "")).thenReturn("");
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/versionChecker/VersionCheckerUtilsKtTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/versionChecker/VersionCheckerUtilsKtTest.kt
index 2d07e40c1d..1e67bb2d4f 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/versionChecker/VersionCheckerUtilsKtTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/versionChecker/VersionCheckerUtilsKtTest.kt
@@ -26,7 +26,7 @@ class VersionCheckerUtilsKtTest {
| version = "2.2.2"
| appName = "Aaoeu"
""".trimMargin()
- val detectedVersion: String? = buildGradle.byteInputStream().findVersion()
+ val detectedVersion: String? = findVersion(buildGradle)
assertEquals("2.2.2", detectedVersion)
}
@@ -41,14 +41,14 @@ class VersionCheckerUtilsKtTest {
| version = "2.2.2-nefarious-underground-mod"
| appName = "Aaoeu"
""".trimMargin()
- val detectedVersion: String? = buildGradle.byteInputStream().findVersion()
+ val detectedVersion: String? = findVersion(buildGradle)
assertEquals(null, detectedVersion)
}
@Test
fun findVersionMatchesDoesNotMatchErrorResponse() {
val buildGradle = """Balls! No build.gradle here. Move along"""
- val detectedVersion: String? = buildGradle.byteInputStream().findVersion()
+ val detectedVersion: String? = findVersion(buildGradle)
assertEquals(null, detectedVersion)
}
@@ -166,7 +166,7 @@ class VersionCheckerUtilsKtTest {
| appName = "Aaoeu"
""".trimMargin()
val bus = prepareBus()
- compareWithCurrentVersion(buildGradle.byteInputStream().findVersion(), currentVersion = "2.2.2")
+ compareWithCurrentVersion(findVersion(buildGradle), currentVersion = "2.2.2")
verify(bus, times(0)).post(any())
@@ -186,7 +186,7 @@ class VersionCheckerUtilsKtTest {
| appName = "Aaoeu"
""".trimMargin()
val bus = prepareBus()
- compareWithCurrentVersion(buildGradle.byteInputStream().findVersion(), currentVersion = "2.2.2")
+ compareWithCurrentVersion(findVersion(buildGradle), currentVersion = "2.2.2")
verify(bus, times(1)).post(any())
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/source/SourceDexcomG5PluginTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/source/SourceDexcomG5PluginTest.java
deleted file mode 100644
index a4977719c6..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/source/SourceDexcomG5PluginTest.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package info.nightscout.androidaps.plugins.source;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-@RunWith(PowerMockRunner.class)
-public class SourceDexcomG5PluginTest {
-
- @Test
- public void getPlugin() {
- Assert.assertNotEquals(null, SourceDexcomG5Plugin.getPlugin());
- }
-
- @Test
- public void advancedFilteringSupported() {
- Assert.assertEquals(true, SourceDexcomG5Plugin.getPlugin().advancedFilteringSupported());
- }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/utils/BolusWizardTest.java b/app/src/test/java/info/nightscout/androidaps/utils/BolusWizardTest.java
index 2143a7101c..e56970182b 100644
--- a/app/src/test/java/info/nightscout/androidaps/utils/BolusWizardTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/utils/BolusWizardTest.java
@@ -3,12 +3,15 @@ package info.nightscout.androidaps.utils;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.mockito.Mockito;
import org.powermock.api.mockito.PowerMockito;
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.data.ConstraintChecker;
+import info.nightscout.androidaps.interfaces.Constraint;
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus;
import info.nightscout.androidaps.data.IobTotal;
import info.nightscout.androidaps.data.Profile;
@@ -17,6 +20,7 @@ import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
import info.nightscout.androidaps.plugins.pump.mdi.MDIPlugin;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -24,38 +28,41 @@ import static org.mockito.Mockito.when;
* Created by kuchjir on 12/12/2017.
*/
@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, GlucoseStatus.class, ConfigBuilderPlugin.class, TreatmentsPlugin.class})
+@PrepareForTest({MainApp.class, GlucoseStatus.class, ConfigBuilderPlugin.class, TreatmentsPlugin.class, ConstraintChecker.class})
public class BolusWizardTest {
private static final double PUMP_BOLUS_STEP = 0.1;
@Test
/** Should calculate the same bolus when different blood glucose but both in target range */
- public void shuldCalculateTheSameBolusWhenBGsInRange() throws Exception {
- BolusWizard bw = new BolusWizard();
+ public void shouldCalculateTheSameBolusWhenBGsInRange() throws Exception {
Profile profile = setupProfile(4d, 8d, 20d, 12d);
- Double bolusForBg42 = bw.doCalc(profile, null, 20, 0.0, 4.2, 0d, 100d, true, true, false, false);
- Double bolusForBg54 = bw.doCalc(profile, null, 20, 0.0, 5.4, 0d, 100d, true, true, false, false);
+ BolusWizard bw = new BolusWizard(profile, "", null, 20, 0.0, 4.2, 0d, 100d, true, true, true, true, false, false, false);
+ Double bolusForBg42 = bw.getCalculatedTotalInsulin();
+ bw = new BolusWizard(profile, "", null, 20, 0.0, 5.4, 0d, 100d, true, true, true, true, false, false, false);
+ Double bolusForBg54 = bw.getCalculatedTotalInsulin();
Assert.assertEquals(bolusForBg42, bolusForBg54);
}
@Test
- public void shuldCalculateHigherBolusWhenHighBG() throws Exception {
- BolusWizard bw = new BolusWizard();
+ public void shouldCalculateHigherBolusWhenHighBG() throws Exception {
Profile profile = setupProfile(4d, 8d, 20d, 12d);
- Double bolusForHighBg = bw.doCalc(profile, null, 20, 0d, 9.8, 0d, 100d, true, true, false, false);
- Double bolusForBgInRange = bw.doCalc(profile, null, 20, 0.0, 5.4, 0d, 100d, true, true, false, false);
+ BolusWizard bw = new BolusWizard(profile, "", null, 20, 0.0, 9.8, 0d, 100d, true, true, true, true, false, false, false);
+ Double bolusForHighBg = bw.getCalculatedTotalInsulin();
+ bw = new BolusWizard(profile, "", null, 20, 0.0, 5.4, 0d, 100d, true, true, true, true, false, false, false);
+ Double bolusForBgInRange = bw.getCalculatedTotalInsulin();
Assert.assertTrue(bolusForHighBg > bolusForBgInRange);
}
@Test
- public void shuldCalculateLowerBolusWhenLowBG() throws Exception {
- BolusWizard bw = new BolusWizard();
+ public void shouldCalculateLowerBolusWhenLowBG() throws Exception {
Profile profile = setupProfile(4d, 8d, 20d, 12d);
- Double bolusForLowBg = bw.doCalc(profile, null, 20, 0d, 3.6, 0d, 100d, true, true, false, false);
- Double bolusForBgInRange = bw.doCalc(profile, null, 20, 0.0, 5.4, 0d, 100d, true, true, false, false);
+ BolusWizard bw = new BolusWizard(profile, "", null, 20, 0.0, 3.6, 0d, 100d, true, true, true, true, false, false, false);
+ Double bolusForLowBg = bw.getCalculatedTotalInsulin();
+ bw = new BolusWizard(profile, "", null, 20, 0.0, 5.4, 0d, 100d, true, true, true, true, false, false, false);
+ Double bolusForBgInRange = bw.getCalculatedTotalInsulin();
Assert.assertTrue(bolusForLowBg < bolusForBgInRange);
}
@@ -82,6 +89,12 @@ public class BolusWizardTest {
pump.getPumpDescription().bolusStep = PUMP_BOLUS_STEP;
when(ConfigBuilderPlugin.getPlugin().getActivePump()).thenReturn(pump);
+ AAPSMocker.mockConstraintsChecker();
+ Mockito.doAnswer(invocation -> {
+ Constraint constraint = invocation.getArgument(0);
+ return constraint;
+ }).when(AAPSMocker.constraintChecker).applyBolusConstraints(any(Constraint.class));
+
return profile;
}
}
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 6826c29a13..398f280881 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,22 +1,23 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
- ext.kotlin_version = '1.3.21'
+ ext.kotlin_version = '1.3.31'
+ ext.butterknifeVersion = '10.1.0'
repositories {
google()
jcenter()
- maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
+ //maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
maven { url 'https://maven.fabric.io/public' }
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.2.0'
+ classpath 'com.android.tools.build:gradle:3.4.1'
classpath 'com.google.gms:google-services:4.2.0'
- classpath 'io.fabric.tools:gradle:1.28.1'
+ classpath 'io.fabric.tools:gradle:1.29.0'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
- classpath 'com.jakewharton:butterknife-gradle-plugin:9.0.0-SNAPSHOT'
+ classpath "com.jakewharton:butterknife-gradle-plugin:$butterknifeVersion"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
diff --git a/gradle.properties b/gradle.properties
index 1d3591c8a4..1bc51c91af 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,4 +15,9 @@
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
\ No newline at end of file
+# org.gradle.parallel=true
+
+org.gradle.jvmargs=-Xmx2g
+
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c25a2b3e46..219a2e077c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
diff --git a/wear/build.gradle b/wear/build.gradle
index 9f094935fd..c26800859a 100644
--- a/wear/build.gradle
+++ b/wear/build.gradle
@@ -1,7 +1,7 @@
apply plugin: 'com.android.application'
ext {
- wearableVersion = "2.0.1"
+ wearableVersion = "2.4.0"
playServicesWearable = "16.0.1"
}
@@ -27,12 +27,12 @@ def generateGitBuild = { ->
}
android {
- compileSdkVersion 27
+ compileSdkVersion 28
defaultConfig {
applicationId "info.nightscout.androidaps"
minSdkVersion 23
- targetSdkVersion 23
+ targetSdkVersion 28
versionCode 1
versionName "1.0.2"
buildConfigField "String", "BUILDVERSION", generateGitBuild()
@@ -90,13 +90,15 @@ allprojects {
dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
- implementation files("libs/hellocharts-library-1.5.5.jar")
+ //implementation files("libs/hellocharts-library-1.5.5.jar")
//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:${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'
- implementation "me.denley.wearpreferenceactivity:wearpreferenceactivity:0.5.0"
+ implementation(name: 'ustwo-clockwise-debug', ext: 'aar')
+ implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+ implementation 'androidx.percentlayout:percentlayout:1.0.0'
+ implementation 'androidx.wear:wear:1.0.0'
+ implementation('me.denley.wearpreferenceactivity:wearpreferenceactivity:0.5.0')
+ implementation('com.github.lecho:hellocharts-library:1.5.8@aar')
}
diff --git a/wear/libs/hellocharts-library-1.5.5.jar b/wear/libs/hellocharts-library-1.5.5.jar
deleted file mode 100644
index 142316706e..0000000000
Binary files a/wear/libs/hellocharts-library-1.5.5.jar and /dev/null differ
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 094b8aad76..8fc8dcf215 100644
--- a/wear/src/main/java/info/nightscout/androidaps/data/ListenerService.java
+++ b/wear/src/main/java/info/nightscout/androidaps/data/ListenerService.java
@@ -10,14 +10,13 @@ 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 androidx.localbroadcastmanager.content.LocalBroadcastManager;
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.NotificationManagerCompat;
+
import android.util.Log;
@@ -37,8 +36,6 @@ import com.google.android.gms.wearable.NodeApi;
import com.google.android.gms.wearable.Wearable;
import com.google.android.gms.wearable.WearableListenerService;
-import java.util.concurrent.TimeUnit;
-
import info.nightscout.androidaps.interaction.AAPSPreferences;
import info.nightscout.androidaps.R;
import info.nightscout.androidaps.interaction.actions.AcceptActivity;
diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/actions/AcceptActivity.java b/wear/src/main/java/info/nightscout/androidaps/interaction/actions/AcceptActivity.java
index f0ae184dfe..07e4bf02b3 100644
--- a/wear/src/main/java/info/nightscout/androidaps/interaction/actions/AcceptActivity.java
+++ b/wear/src/main/java/info/nightscout/androidaps/interaction/actions/AcceptActivity.java
@@ -7,7 +7,7 @@ import android.content.res.Resources;
import android.os.Bundle;
import android.os.SystemClock;
import android.os.Vibrator;
-import android.support.v4.app.NotificationManagerCompat;
+import androidx.core.app.NotificationManagerCompat;
import android.support.wearable.view.DotsPageIndicator;
import android.support.wearable.view.GridPagerAdapter;
import android.support.wearable.view.GridViewPager;
diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/utils/VersionPreference.java b/wear/src/main/java/info/nightscout/androidaps/interaction/utils/VersionPreference.java
index 3bc05af82d..a190b7e65a 100644
--- a/wear/src/main/java/info/nightscout/androidaps/interaction/utils/VersionPreference.java
+++ b/wear/src/main/java/info/nightscout/androidaps/interaction/utils/VersionPreference.java
@@ -1,9 +1,8 @@
package info.nightscout.androidaps.interaction.utils;
import android.content.Context;
-import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
import android.util.AttributeSet;
import android.widget.Toast;
diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/BIGChart.java b/wear/src/main/java/info/nightscout/androidaps/watchfaces/BIGChart.java
index ec2e8c6e5e..1717fbf662 100644
--- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/BIGChart.java
+++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/BIGChart.java
@@ -17,8 +17,8 @@ import android.os.Bundle;
import android.os.PowerManager;
import android.os.SystemClock;
import android.preference.PreferenceManager;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.core.content.ContextCompat;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import android.support.wearable.view.WatchViewStub;
import android.support.wearable.watchface.WatchFaceStyle;
import android.text.format.DateFormat;
diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/BaseWatchFace.java b/wear/src/main/java/info/nightscout/androidaps/watchfaces/BaseWatchFace.java
index 3c10981923..229eb64f1b 100644
--- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/BaseWatchFace.java
+++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/BaseWatchFace.java
@@ -13,7 +13,7 @@ import android.graphics.Rect;
import android.os.Bundle;
import android.os.PowerManager;
import android.preference.PreferenceManager;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import android.support.wearable.view.WatchViewStub;
import android.text.format.DateFormat;
import android.util.Log;
diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/CircleWatchface.java b/wear/src/main/java/info/nightscout/androidaps/watchfaces/CircleWatchface.java
index c795a03ae4..fffb0a555e 100644
--- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/CircleWatchface.java
+++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/CircleWatchface.java
@@ -17,7 +17,7 @@ import android.os.Bundle;
import android.os.PowerManager;
import android.os.SystemClock;
import android.preference.PreferenceManager;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import android.support.wearable.watchface.WatchFaceStyle;
import android.util.Log;
import android.util.TypedValue;
diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/Home.java b/wear/src/main/java/info/nightscout/androidaps/watchfaces/Home.java
index ba557f200b..430a3feb47 100644
--- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/Home.java
+++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/Home.java
@@ -2,7 +2,7 @@ package info.nightscout.androidaps.watchfaces;
import android.content.Intent;
import android.graphics.Color;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
import android.support.wearable.watchface.WatchFaceStyle;
import android.view.LayoutInflater;
diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/Home2.java b/wear/src/main/java/info/nightscout/androidaps/watchfaces/Home2.java
index 367b93a729..41c9fd3029 100644
--- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/Home2.java
+++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/Home2.java
@@ -2,7 +2,7 @@ package info.nightscout.androidaps.watchfaces;
import android.content.Intent;
import android.graphics.Color;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
import android.support.wearable.watchface.WatchFaceStyle;
import android.view.LayoutInflater;
diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/LargeHome.java b/wear/src/main/java/info/nightscout/androidaps/watchfaces/LargeHome.java
index 2cb09c9b7b..ffb8dce3ad 100644
--- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/LargeHome.java
+++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/LargeHome.java
@@ -2,7 +2,7 @@ package info.nightscout.androidaps.watchfaces;
import android.content.Intent;
import android.graphics.Color;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
import android.support.wearable.watchface.WatchFaceStyle;
import android.view.LayoutInflater;
diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/NOChart.java b/wear/src/main/java/info/nightscout/androidaps/watchfaces/NOChart.java
index 991d0c4e80..f799b0cf6e 100644
--- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/NOChart.java
+++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/NOChart.java
@@ -13,13 +13,12 @@ import android.graphics.Paint;
import android.graphics.Point;
import android.graphics.Rect;
import android.graphics.Shader;
-import android.os.Build;
import android.os.Bundle;
import android.os.PowerManager;
import android.os.SystemClock;
import android.preference.PreferenceManager;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.core.content.ContextCompat;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import android.support.wearable.view.WatchViewStub;
import android.support.wearable.watchface.WatchFaceStyle;
import android.text.format.DateFormat;
@@ -32,7 +31,6 @@ import android.view.WindowInsets;
import android.view.WindowManager;
import android.widget.RelativeLayout;
import android.widget.TextView;
-import android.widget.Toast;
import com.google.android.gms.wearable.DataMap;
import com.ustwo.clockwise.common.WatchFaceTime;
@@ -43,13 +41,11 @@ import com.ustwo.clockwise.wearable.WatchFace;
import java.util.ArrayList;
import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.BuildConfig;
import info.nightscout.androidaps.data.BasalWatchData;
import info.nightscout.androidaps.data.BgWatchData;
import info.nightscout.androidaps.data.ListenerService;
import info.nightscout.androidaps.data.TempWatchData;
import info.nightscout.androidaps.interaction.menus.MainMenuActivity;
-import lecho.lib.hellocharts.view.LineChartView;
/**
* Created by adrianLxM.
diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/Steampunk.java b/wear/src/main/java/info/nightscout/androidaps/watchfaces/Steampunk.java
index 3549b2a67d..c42aff1518 100644
--- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/Steampunk.java
+++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/Steampunk.java
@@ -1,7 +1,7 @@
package info.nightscout.androidaps.watchfaces;
import android.content.Intent;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
import android.support.wearable.watchface.WatchFaceStyle;
import android.view.LayoutInflater;
import android.view.animation.Animation;
diff --git a/wear/src/main/res/layout/action_confirm_text.xml b/wear/src/main/res/layout/action_confirm_text.xml
index 291b05116d..9e6355949f 100644
--- a/wear/src/main/res/layout/action_confirm_text.xml
+++ b/wear/src/main/res/layout/action_confirm_text.xml
@@ -1,4 +1,4 @@
-
-
@@ -34,7 +34,7 @@
android:textColor="@color/white" />
-
+
-
\ No newline at end of file
+
\ No newline at end of file