Merge pull request #849 from jotomo/combo-cleanup

Combo cleanup

app/src/main/java/info/nightscout/androidaps/Config.java

@@ -42,6 +42,4 @@ public class Config {
     public static final boolean logDanaBTComm = true;
     public static boolean logDanaMessageDetail = true;
     public static final boolean logDanaSerialEngine = true;
-
-    public static final boolean enableComboBetaFeatures = false;
 }

app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboAlertHistoryDialog.java

@@ -1,52 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpCombo;
-
-import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import java.text.DateFormat;
-import java.util.List;
-
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.PumpAlert;
-import info.nightscout.androidaps.R;
-
-public class ComboAlertHistoryDialog extends DialogFragment {
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View layout = inflater.inflate(R.layout.combo_alert_history_fragment, container, false);
-        TextView text = (TextView) layout.findViewById(R.id.combo_error_history_text);
-        List<PumpAlert> errors = ComboPlugin.getPlugin().getPump().errorHistory;
-        if (errors.isEmpty()) {
-            text.setText(R.string.combo_no_alert_data_note);
-        } else {
-            StringBuilder sb = new StringBuilder();
-            DateFormat dateTimeFormatter = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT);
-            boolean first = true;
-            for (PumpAlert error : errors) {
-                if (first) {
-                    first = false;
-                } else {
-                    sb.append("\n");
-                }
-                sb.append(dateTimeFormatter.format(error.timestamp));
-                sb.append("  ");
-                sb.append(error.message);
-                if (error.warningCode != null) {
-                    sb.append(" (W");
-                    sb.append(error.warningCode);
-                    sb.append(")");
-                }
-                if (error.errorCode != null) {
-                    sb.append(" (E");
-                    sb.append(error.errorCode);
-                    sb.append(")");
-                }
-            }
-            text.setText(sb.toString());
-        }
-        return layout;
-    }
-}

app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboFragment.java

@@ -6,6 +6,7 @@ import android.app.AlertDialog;
 import android.graphics.Color;
 import android.graphics.Typeface;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -16,7 +17,6 @@ import com.squareup.otto.Subscribe;
 
 import org.apache.commons.lang3.StringUtils;
 
-import info.nightscout.androidaps.Config;
 import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.PumpState;
 import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.Bolus;
 import info.nightscout.androidaps.MainApp;
@@ -29,7 +29,7 @@ import info.nightscout.androidaps.queue.events.EventQueueChanged;
 import info.nightscout.utils.DateUtil;
 import info.nightscout.utils.SP;
 
-public class ComboFragment extends SubscriberFragment implements View.OnClickListener, View.OnLongClickListener {
+public class ComboFragment extends SubscriberFragment implements View.OnClickListener {
     private TextView stateView;
     private TextView activityView;
     private TextView batteryView;
@@ -39,43 +39,28 @@ public class ComboFragment extends SubscriberFragment implements View.OnClickLis
     private TextView baseBasalRate;
     private TextView tempBasalText;
     private Button refreshButton;
-    private Button alertsButton;
-    private Button tddsButton;
     private TextView bolusCount;
     private TextView tbrCount;
-    private Button fullHistoryButton;
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.combopump_fragment, container, false);
 
-        stateView = (TextView) view.findViewById(R.id.combo_state);
+        stateView = view.findViewById(R.id.combo_state);
-        activityView = (TextView) view.findViewById(R.id.combo_activity);
+        activityView = view.findViewById(R.id.combo_activity);
-        batteryView = (TextView) view.findViewById(R.id.combo_pumpstate_battery);
+        batteryView = view.findViewById(R.id.combo_pumpstate_battery);
-        reservoirView = (TextView) view.findViewById(R.id.combo_insulinstate);
+        reservoirView = view.findViewById(R.id.combo_insulinstate);
-        lastBolusView = (TextView) view.findViewById(R.id.combo_last_bolus);
+        lastBolusView = view.findViewById(R.id.combo_last_bolus);
-        lastConnectionView = (TextView) view.findViewById(R.id.combo_lastconnection);
+        lastConnectionView = view.findViewById(R.id.combo_lastconnection);
-        baseBasalRate = (TextView) view.findViewById(R.id.combo_base_basal_rate);
+        baseBasalRate = view.findViewById(R.id.combo_base_basal_rate);
-        tempBasalText = (TextView) view.findViewById(R.id.combo_temp_basal);
+        tempBasalText = view.findViewById(R.id.combo_temp_basal);
-        bolusCount = (TextView) view.findViewById(R.id.combo_bolus_count);
+        bolusCount = view.findViewById(R.id.combo_bolus_count);
-        tbrCount = (TextView) view.findViewById(R.id.combo_tbr_count);
+        tbrCount = view.findViewById(R.id.combo_tbr_count);
 
-        refreshButton = (Button) view.findViewById(R.id.combo_refresh_button);
+        refreshButton = view.findViewById(R.id.combo_refresh_button);
         refreshButton.setOnClickListener(this);
 
-        alertsButton = (Button) view.findViewById(R.id.combo_alerts_button);
-        alertsButton.setOnClickListener(this);
-        alertsButton.setOnLongClickListener(this);
-
-        tddsButton = (Button) view.findViewById(R.id.combo_tdds_button);
-        tddsButton.setOnClickListener(this);
-        tddsButton.setOnLongClickListener(this);
-
-        fullHistoryButton = (Button) view.findViewById(R.id.combo_full_history_button);
-        fullHistoryButton.setOnClickListener(this);
-        fullHistoryButton.setOnLongClickListener(this);
-
         updateGUI();
         return view;
     }
@@ -99,75 +84,9 @@ public class ComboFragment extends SubscriberFragment implements View.OnClickLis
                     }
                 });
                 break;
-            case R.id.combo_alerts_button:
-                ComboAlertHistoryDialog ehd = new ComboAlertHistoryDialog();
-                ehd.show(getFragmentManager(), ComboAlertHistoryDialog.class.getSimpleName());
-                break;
-            case R.id.combo_tdds_button:
-                ComboTddHistoryDialog thd = new ComboTddHistoryDialog();
-                thd.show(getFragmentManager(), ComboTddHistoryDialog.class.getSimpleName());
-                break;
-            case R.id.combo_full_history_button:
-                AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
-                builder.setMessage(R.string.combo_read_full_history_info);
-                builder.show();
-                break;
         }
     }
 
-    // TODO clean up when when queuing
-    @Override
-    public boolean onLongClick(View view) {
-        switch (view.getId()) {
-            case R.id.combo_alerts_button:
-                alertsButton.setEnabled(false);
-                tddsButton.setEnabled(false);
-                fullHistoryButton.setEnabled(false);
-                new Thread(() -> ComboPlugin.getPlugin().readAlertData(new Callback() {
-                    @Override
-                    public void run() {
-                        runOnUiThread(() -> {
-                            alertsButton.setEnabled(true);
-                            tddsButton.setEnabled(true);
-                            fullHistoryButton.setEnabled(true);
-                        });
-                    }
-                })).start();
-                return true;
-            case R.id.combo_tdds_button:
-                alertsButton.setEnabled(false);
-                tddsButton.setEnabled(false);
-                fullHistoryButton.setEnabled(false);
-                new Thread(() -> ComboPlugin.getPlugin().readTddData(new Callback() {
-                    @Override
-                    public void run() {
-                        runOnUiThread(() -> {
-                            alertsButton.setEnabled(true);
-                            tddsButton.setEnabled(true);
-                            fullHistoryButton.setEnabled(true);
-                        });
-                    }
-                })).start();
-                return true;
-            case R.id.combo_full_history_button:
-                alertsButton.setEnabled(false);
-                tddsButton.setEnabled(false);
-                fullHistoryButton.setEnabled(false);
-                new Thread(() -> ComboPlugin.getPlugin().readAllPumpData(new Callback() {
-                    @Override
-                    public void run() {
-                        runOnUiThread(() -> {
-                            alertsButton.setEnabled(true);
-                            tddsButton.setEnabled(true);
-                            fullHistoryButton.setEnabled(true);
-                        });
-                    }
-                })).start();
-                return true;
-        }
-        return false;
-    }
-
     @Subscribe
     public void onStatusEvent(final EventComboPumpUpdateGUI ignored) {
         updateGUI();
@@ -210,13 +129,6 @@ public class ComboFragment extends SubscriberFragment implements View.OnClickLis
             }
 
             if (plugin.isInitialized()) {
-                refreshButton.setVisibility(View.VISIBLE);
-                if (Config.enableComboBetaFeatures) {
-                    alertsButton.setVisibility(View.VISIBLE);
-                    tddsButton.setVisibility(View.VISIBLE);
-                }
-                fullHistoryButton.setVisibility(View.VISIBLE);
-
                 // battery
                 batteryView.setTextSize(20);
                 if (ps.batteryState == PumpState.EMPTY) {

app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java

@@ -68,8 +68,8 @@ import info.nightscout.utils.SP;
  */
 public class ComboPlugin extends PluginBase implements PumpInterface, ConstraintsInterface {
     private static final Logger log = LoggerFactory.getLogger(ComboPlugin.class);
-    public static final String COMBO_TBRS_SET = "combo_tbrs_set";
+    static final String COMBO_TBRS_SET = "combo_tbrs_set";
-    public static final String COMBO_BOLUSES_DELIVERED = "combo_boluses_delivered";
+    static final String COMBO_BOLUSES_DELIVERED = "combo_boluses_delivered";
 
     private static ComboPlugin plugin = null;
 
@@ -1124,11 +1124,11 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
      */
     private boolean readHistory(@Nullable PumpHistoryRequest request) {
         CommandResult historyResult = runCommand(MainApp.gs(R.string.combo_activity_reading_pump_history), 3, () -> ruffyScripter.readHistory(request));
-        if (!historyResult.success) {
+        PumpHistory history = historyResult.history;
+        if (!historyResult.success || history == null) {
             return false;
         }
 
-        PumpHistory history = historyResult.history;
         updateDbFromPumpHistory(history);
 
         // update local cache
@@ -1171,64 +1171,6 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
         return pumpBolus.timestamp + Math.min(secondsFromBolus, 59 * 1000);
     }
 
-    // TODO use queue once ready
-    void readTddData(Callback post) {
-//        ConfigBuilderPlugin.getCommandQueue().custom(new Callback() {
-//            @Override
-//            public void run() {
-        readHistory(new PumpHistoryRequest().tddHistory(PumpHistoryRequest.FULL));
-//            }
-//        }, post);
-        if (post != null) {
-            post.run();
-        }
-        CommandQueue commandQueue = ConfigBuilderPlugin.getCommandQueue();
-        if (commandQueue.performing() == null && commandQueue.size() == 0) {
-            ruffyScripter.disconnect();
-        }
-    }
-
-    // TODO use queue once ready
-    void readAlertData(Callback post) {
-//        ConfigBuilderPlugin.getCommandQueue().custom(new Callback() {
-//            @Override
-//            public void run() {
-        readHistory(new PumpHistoryRequest().pumpErrorHistory(PumpHistoryRequest.FULL));
-//            }
-//        }, post);
-        if (post != null) {
-            post.run();
-        }
-        CommandQueue commandQueue = ConfigBuilderPlugin.getCommandQueue();
-        if (commandQueue.performing() == null && commandQueue.size() == 0) {
-            ruffyScripter.disconnect();
-        }
-    }
-
-    // TODO use queue once ready
-    void readAllPumpData(Callback post) {
-//        ConfigBuilderPlugin.getCommandQueue().custom(new Callback() {
-//            @Override
-//            public void run() {
-        readHistory(new PumpHistoryRequest()
-                .bolusHistory(PumpHistoryRequest.FULL)
-                .pumpErrorHistory(PumpHistoryRequest.FULL)
-                .tddHistory(PumpHistoryRequest.FULL));
-        CommandResult readBasalResult = runCommand(MainApp.gs(R.string.combo_actvity_reading_basal_profile), 2, ruffyScripter::readBasalProfile);
-        if (readBasalResult.success) {
-            pump.basalProfile = readBasalResult.basalProfile;
-        }
-//            }
-//        }, post);
-        if (post != null) {
-            post.run();
-        }
-        CommandQueue commandQueue = ConfigBuilderPlugin.getCommandQueue();
-        if (commandQueue.performing() == null && commandQueue.size() == 0) {
-            ruffyScripter.disconnect();
-        }
-    }
-
     /**
      * Reads QuickInfo to update reservoir level and determine if new boluses exist on the pump
      * and if so, queries the history for all new records.
@@ -1378,7 +1320,6 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
 
     @Override
     public PumpEnactResult loadTDDs() {
-
         PumpEnactResult result = new PumpEnactResult();
         result.success = readHistory(new PumpHistoryRequest().tddHistory(PumpHistoryRequest.FULL));
         if (result.success) {

app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboTddHistoryDialog.java

@@ -1,58 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpCombo;
-
-import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import java.text.DateFormat;
-import java.util.List;
-import java.util.Locale;
-
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.Tdd;
-import info.nightscout.androidaps.R;
-
-public class ComboTddHistoryDialog extends DialogFragment {
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View layout = inflater.inflate(R.layout.combo_tdd_history_fragment, container, false);
-        TextView text = (TextView) layout.findViewById(R.id.combo_tdd_history_text);
-        List<Tdd> tdds = ComboPlugin.getPlugin().getPump().tddHistory;
-        if (tdds.isEmpty()) {
-            text.setText(R.string.combo_no_tdd_data_note);
-        } else {
-            StringBuilder sb = new StringBuilder();
-            DateFormat dateFormatter = DateFormat.getDateInstance();
-            double avg = 0;
-            double min = 999;
-            double max = 0;
-            int count = 0;
-            for (Tdd tdd : tdds) {
-                if (tdd.total > 0) {
-                    avg += tdd.total;
-                    count++;
-                }
-                if (tdd.total < min) min = tdd.total;
-                if (tdd.total > max) max = tdd.total;
-            }
-            avg = avg / count;
-            sb.append(String.format(Locale.getDefault(), getString(R.string.combo_tdd_minimum), min));
-            sb.append("\n");
-            sb.append(String.format(Locale.getDefault(), getString(R.string.combo_tdd_average), avg));
-            sb.append("\n");
-            sb.append(String.format(Locale.getDefault(), getString(R.string.combo_tdd_maximum), max));
-            sb.append("\n");
-            for (Tdd tdd : tdds) {
-                sb.append("\n");
-                sb.append(dateFormatter.format(tdd.timestamp));
-                sb.append("  ");
-                sb.append(String.format(Locale.getDefault(), "%3.1f", tdd.total));
-                sb.append(" U");
-            }
-            text.setText(sb.toString());
-        }
-        return layout;
-    }
-}

app/src/main/res/layout/combo_alert_history_fragment.xml

@@ -1,53 +0,0 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".plugins.PumpCombo.ComboFragment">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <TextView
-            android:id="@+id/textView3"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center_horizontal"
-            android:layout_marginTop="5dp"
-            android:text="Alerts"
-            android:textStyle="bold" />
-
-        <View
-            android:id="@+id/profileview_datedelimiter"
-            android:layout_width="match_parent"
-            android:layout_height="2dip"
-            android:layout_marginLeft="20dp"
-            android:layout_marginRight="20dp"
-            android:layout_marginTop="5dp"
-            android:background="@color/listdelimiter" />
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/combo_error_history_text"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textAlignment="textStart"
-                android:padding="10dp"
-                android:gravity="start"/>
-        </LinearLayout>
-
-    </ScrollView>
-
-    </LinearLayout>
-
-</FrameLayout>

app/src/main/res/layout/combo_tdd_history_fragment.xml

@@ -1,54 +0,0 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".plugins.PumpCombo.ComboFragment">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <TextView
-            android:id="@+id/textView3"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center_horizontal"
-            android:layout_marginTop="5dp"
-            android:text="@string/combo_tdds"
-            android:textStyle="bold" />
-
-        <View
-            android:id="@+id/profileview_datedelimiter"
-            android:layout_width="match_parent"
-            android:layout_height="2dip"
-            android:layout_marginLeft="20dp"
-            android:layout_marginRight="20dp"
-            android:layout_marginTop="5dp"
-            android:background="@color/listdelimiter" />
-
-        <ScrollView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/combo_tdd_history_text"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="start"
-                    android:padding="10dp"
-                    android:textAlignment="textStart" />
-            </LinearLayout>
-
-        </ScrollView>
-
-    </LinearLayout>
-
-
-</FrameLayout>

app/src/main/res/layout/combopump_fragment.xml

@@ -499,46 +499,6 @@
                 android:paddingLeft="0dp"
                 android:paddingRight="0dp"
                 android:text="@string/combo_refresh" />
-
-            <info.nightscout.utils.SingleClickButton
-                android:id="@+id/combo_alerts_button"
-                style="@style/ButtonSmallFontStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="0.5"
-                android:layout_marginRight="-4dp"
-                android:drawableTop="@drawable/icon_cp_announcement"
-                android:paddingLeft="0dp"
-                android:paddingRight="0dp"
-                android:visibility="gone"
-                android:text="@string/combo_pump_alerts" />
-
-            <info.nightscout.utils.SingleClickButton
-                android:id="@+id/combo_tdds_button"
-                style="@style/ButtonSmallFontStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="0.5"
-                android:layout_marginRight="-4dp"
-                android:drawableTop="@drawable/icon_danarstats"
-                android:paddingLeft="0dp"
-                android:paddingRight="0dp"
-                android:visibility="gone"
-                android:text="@string/combo_tdds" />
-
-            <info.nightscout.utils.SingleClickButton
-                android:id="@+id/combo_full_history_button"
-                style="@style/ButtonSmallFontStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="0.5"
-                android:layout_marginRight="-4dp"
-                android:drawableTop="@drawable/icon_danarhistory"
-                android:paddingLeft="0dp"
-                android:paddingRight="0dp"
-                android:visibility="gone"
-                android:text="@string/combo_history" />
-
         </LinearLayout>
 
     </LinearLayout>

app/src/main/res/values-bg/strings.xml

@@ -678,9 +678,6 @@
     <string name="shortenergy">En</string>
     <string name="raise_notifications_as_android_notifications">Използвай системни известия за аларми и съобщения</string>
     <string name="combo_warning">Внимание</string>
-    <string name="combo_tdd_minimum" formatted="false">Минимум: %3.1f U</string>
-    <string name="combo_tdd_maximum" formatted="false">Максимум: %3.1f U</string>
-    <string name="combo_tdd_average" formatted="false">Средно: %3.1f U</string>
     <string name="combo_reservoir_normal">Нормално</string>
     <string name="combo_reservoir_low">Ниско</string>
     <string name="combo_reservoir_level_insufficient_for_bolus">Няма достатъчно инсулин в резервоара</string>

app/src/main/res/values-cs/strings.xml

@@ -704,7 +704,6 @@
     <string name="bolus_frequency_exceeded">Bolus stejné velikosti už byl během poslední minuty požadován. Jako preventivní ochrana před zdvojeným bolusem byla operace zakázána.</string>
     <string name="combo_pump_connected_now">Teď</string>
     <string name="combo_activity_reading_pump_history">Načítání historie pumpy</string>
-    <string name="combo_pump_alerts">Výstrahy</string>
     <string name="combo_activity_setting_basal_profile">Nastavení bazálního profilu</string>
     <string name="combo_pump_cartridge_low_warrning">V zásobníku je málo inzulínu</string>
     <string name="combo_pump_battery_low_warrning">Slabá baterie v pumpě</string>
@@ -713,18 +712,12 @@
     <string name="combo_error_bolus_verification_failed">Provádění bolusu a čtení historie selhalo. Zkontrolujte pumpu a zadejte bolus přes péči</string>
     <string name="combo_error_no_bolus_delivered">Provádění bolusu selhalo. Zdá se, že žádný bolus nebyl podán. Zkontrolujte pumpu a případně pošlete bolus znovu. Jako bezpečnostní opatření podání bolusu není opakováno.</string>
     <string name="combo_error_partial_bolus_delivered" formatted="false">Pouze %.2f U z bolusu %.2f bylo podáno díky chybě. Zkontrolujte pumpu a proveďte nápravu.</string>
-    <string name="combo_history">Historie</string>
     <string name="combo_pump_tbr_cancelled_warrning">Varování o ukončeném dočasném bazálu bylo potvrzeno.</string>
     <string name="combo_warning">Varování</string>
     <string name="combo_reservoir_empty">Prázdný</string>
     <string name="combo_reservoir_low">Nízký</string>
     <string name="combo_reservoir_normal">Normální</string>
-    <string name="combo_tdd_average" formatted="false">Průměr: %3.1f U</string>
-    <string name="combo_tdd_maximum" formatted="false">Maximum: %3.1f U</string>
-    <string name="combo_tdd_minimum" formatted="false">Minimum: %3.1f U</string>
-    <string name="combo_no_alert_data_note">Pro přečtení historie chyb dlouze stiskněte tlačítko ALERTS. Varování: může to způsobit chybu, že pumpa bude odmítat všechny připojení a je pak vyžadováno stisknutí tlačítka na pumpě pro obnovení komunikace.</string>
     <string name="combo_notification_check_time_date">Je vyžadována aktualizace času na pumpě</string>
-    <string name="combo_no_tdd_data_note">Pro přečtení celkových denních dávek dlouze stikněte na pumpě tlačítko TDDS. Varování: může to způsobit chybu, že pumpa bude odmítat všechna připojení a je pak vyžadováno stisknutí tlačítka na pumpě pro obnovení komunikace.</string>
     <string name="combo_reservoir_level_insufficient_for_bolus">Nedostatek inzulínu pro takovýto bolus</string>
     <string name="extendedbolusdeliveryerror">Chyba spuštění extended bolusu</string>
     <string name="smb_shortname">SMB</string>
@@ -823,8 +816,6 @@
     <string name="bolusrecordedonly">Bolus bude pouze zaznamenán</string>
     <string name="ns_autobackfill">Automaticky doplňovat chybějící glykémie z NS</string>
     <string name="hypo">Hypoglykémie</string>
-    <string name="combo_tdds">CDD</string>
-    <string name="combo_read_full_history_info">Dlouhé stisknutí tohoto tlačítka pro plné načtení historie a bazálního profilu z pumpy. Obvykle to není nutné, protože se to děje průběžně, ale může to pomoci v případě změny datumu v pumpě nebo v případě výměny pumpy.</string>
     <string name="overview_show_sensitivity">Citlivost</string>
     <string name="overview_show_deviations">Odchylky</string>
     <string name="overview_show_cob">Zbývající sacharidy</string>

app/src/main/res/values-de/strings.xml

@@ -666,7 +666,6 @@
     <string name="combo_pump_state_suspended_by_user">Gestoppt (Benutzer)</string>
     <string name="combo_pump_state_suspended_due_to_error">Gestoppt (Fehler)</string>
     <string name="combo_pump_state_running">In Betrieb</string>
-    <string name="combo_tdds">TDDS</string>
     <string name="combo_programming_bolus">Bolusabgabe wird vorbereitet</string>
     <string name="combo_pump_action_cancelling_tbr">TBR wird abgebrochen</string>
     <string name="combo_pump_action_setting_tbr">TBR wird gesetzt (%d%% / %d Min.)</string>
@@ -680,7 +679,6 @@
     <string name="combo_error_bolus_verification_failed">Der abgegebene Bolus konnte nicht bestätigt werden. Bitte prüfe auf der Pumpe, ob ein Bolus abgegeben wurde und erstelle einen Eintrag im Careportal falls nötig.</string>
     <string name="combo_error_no_bolus_delivered">Die Bolusabgabe ist fehlgeschlagen: Es wurde scheinbar kein Bolus abgegeben. Bitte prüfe auf der Pumpe, ob ein Bolus abgegeben wurde. Um doppelte Boli durch Programmfehler zu vermeiden, werden Boli nicht automatisch wiederholt.</string>
     <string name="combo_error_partial_bolus_delivered">Wegen eines Fehlers wurden nur %.2f IE von den angeforderten %.2f IE abgegeben. Bitte prüfe den abgegebenen Bolus auf der Pumpe.</string>
-    <string name="combo_history">Historie</string>
     <string name="combo_pump_action_refreshing">Status wird aktualisiert</string>
     <string name="combo_pump_state_initializing">Die Pumpe wird initialisiert</string>
     <string name="combo_pump_connected_now">Jetzt</string>
@@ -689,19 +687,13 @@
     <string name="combo_reservoir_empty">Leer</string>
     <string name="combo_reservoir_low">Niedrig</string>
     <string name="combo_reservoir_normal">Normal</string>
-    <string name="combo_tdd_average">Durchschnitt: %3.1f IE</string>
-    <string name="combo_tdd_maximum">Maximum: %3.1f IE</string>
-    <string name="combo_tdd_minimum">Minimum: %3.1f IE</string>
     <string name="combo_pump_unsupported_operation">Diese Aktion wird von der Pumpe nicht unterstützt</string>
-    <string name="combo_pump_alerts">Alarme</string>
     <string name="combo_pump_battery_low_warrning">Die Batterie in der Pumpe ist fast leer</string>
     <string name="combo_pump_cartridge_low_warrning">Das Reservoir in der Pumpe ist fast leer</string>
     <string name="combo_is_in_error_state">Die Pumpe zeigt einen Fehler an E%d: %s</string>
     <string name="combo_force_disabled_notification">Unsichere Verwendung: In der Pumpe ist nicht das erste Basalratenprofil gewählt. Der Loop wird deaktiviert bis dies korrigiert ist.</string>
     <string name="combo_low_suspend_forced_notification">Unsichere Verwendung: Ein erweiterter oder Multiwave-Bolus ist aktiv. Der Loop wird für die nächsten 6 Stunden kein zusätzliches Insulin abgeben.</string>
-    <string name="combo_no_alert_data_note">Um die Fehlerhistorie der Pumpe zu lesen, drücke lange auf ALARME.</string>
     <string name="combo_notification_check_time_date">Bitte aktualisiere die Uhrzeit der Pumpe</string>
-    <string name="combo_no_tdd_data_note">Um die TDD-Statistik der Pumpe zu lesen, drücken Sie den TDDS Knopf lange.\nWARNUNG: Es gibt einen bekannten Fehler in der Pumpe der dazu führt, dass die Pumpe nach dieser Aktion erst wieder Verbindungen annimmt, wenn auf der Pumpe selbst ein Konpf gedrückt wird. Aus diesem Grund sollte diese Aktion nicht durchgeführt werden.</string>
     <string name="combo_reservoir_level_insufficient_for_bolus">Nicht mehr genug Insulin im Reservoir für den Bolus</string>
     <string name="yes">Ja</string>
     <string name="no">Nein</string>
@@ -723,7 +715,6 @@
     <string name="openapsama_link_to_preferncejson_doc_txt">Achtung! Normalerweise musst Du diese Werte nicht ändern. Bitte KLICKE HIER und LESE den Text. Verändere Werte erst, wenn Du den Inhalt des Textes verstanden hast.</string>
     <string name="combo_actvity_reading_basal_profile">Basalratenprofil wird gelesen</string>
     <string name="pump_basebasalrate">%.2f IE/h</string>
-    <string name="combo_read_full_history_info">Drücke den Button lange, um die gesamte Historie und das Basal-Profil der Pumpe auszulesen. Dies ist eigentlich unnötig, weil die Historie regelmäßig gelesen wird. Hilfreich kann dies jedoch sein, wenn Datum und Zeit grundlegend verändert wurden oder die Pumpe ausgetauscht wurde.</string>
     <string name="combo_error_no_connection_no_bolus_delivered">Keine Verbindung zur Pumpe: Es wurde kein Bolus abgegeben.</string>
     <string name="extendedbolusdeliveryerror">Fehler bei der Abgabe eines verlängerten Bolus</string>
     <string name="combo_bolus_rejected_due_to_pump_history_change">Nach der Berechnung des Bolus hat sich die Pumpenhistorie geändert. Daher wurde kein Bolus abgegeben. Bitte prüfe, ob überhaupt noch ein Bolus benötigt wird. Wenn die gleiche Bolusmenge erforderlich ist, warte zwei Minuten ab, denn es werden aus Sicherheitsgründen keine gleich großen Boli abgegeben, wenn sie innerhalb von zwei Minuten angefordert wurden (unabhängig davon, ob sie verabreicht wurden oder nicht).</string>

app/src/main/res/values-es/strings.xml

@@ -676,7 +676,6 @@
     <string name="zerovalueinprofile" formatted="false">Perfil invalido: %s</string>
     <string name="combo_programming_bolus">Programando bomba para emitir bolo</string>
     <string name="combo_refresh">Actualizar</string>
-    <string name="combo_tdds">TDDS</string>
     <string name="combo_pump_state_label">Estado</string>
     <string name="combo_pump_activity_label">Actividad</string>
     <string name="combo_no_pump_connection" formatted="false">Ninguna coneccnion por %d min</string>
@@ -694,21 +693,14 @@
     <string name="bolus_frequency_exceeded">Un bolo de mismo valor ha sido dado durante el pasado minuto. Para evitar bolos dobles y asegurarse contra bugs esto no es permitido.</string>
     <string name="combo_pump_connected_now">Ahora</string>
     <string name="combo_activity_reading_pump_history">Leiendo historia bomba</string>
-    <string name="combo_pump_alerts">Alarmas</string>
     <string name="combo_activity_setting_basal_profile">" Activando perfil base "</string>
     <string name="combo_pump_cartridge_low_warrning">"Nivel del deposito bajo "</string>
     <string name="combo_pump_battery_low_warrning">Bateria casi agotada</string>
     <string name="combo_is_in_error_state" formatted="false">La bomba muesta el error E%d: %s</string>
-    <string name="combo_no_alert_data_note">Para leer historial de los errores, pincha unos segundo el boton \"ALARMAS\" ATENCION: esto puede causar un bug. La bomba no vuelve a conectarse - necesitas pulsar un boton en la misma bomba para reiniciarse. Deberias evitar esto.</string>
-    <string name="combo_no_tdd_data_note">Para leer el hisorial TDD de la bomba pulsa el boton TDDS unso segundos. ATENCION: esto puede causar un bug. La bomba no vuelve a conectarse - necesitas pulsar un boton en la misma bomba para reiniciarse. Deberias evitar esto.</string>
-    <string name="combo_tdd_minimum" formatted="false">Mínimo: %3.1f U</string>
-    <string name="combo_tdd_average" formatted="false">Media: %3.1f U</string>
-    <string name="combo_tdd_maximum" formatted="false">Máximo: %3.1f U</string>
     <string name="combo_reservoir_low">Bajo</string>
     <string name="combo_reservoir_empty">Vacio</string>
     <string name="combo_reservoir_normal">Normal</string>
     <string name="combo_notification_check_time_date">Se necesita actualizar reloj de la bomba</string>
-    <string name="combo_history">Historial</string>
     <string name="combo_warning">Alerta</string>
     <string name="combo_pump_tbr_cancelled_warrning">TBR cancelada, advertencia acceptada</string>
     <string name="combo_error_no_bolus_delivered">Emision del bolo fallado. Ningún bolo se ha emitido. Para asegurarse, por favor controle la bomba para evitar bolo doble. Para evitar bugs no se reinician bolos automaticamente.</string>

app/src/main/res/values-fr/strings.xml

@@ -684,7 +684,6 @@
     <string name="zerovalueinprofile">Profile incorrect: %s</string>
     <string name="combo_programming_bolus">Programmer la pompe pour administrer un bolus</string>
     <string name="combo_refresh">Actualiser</string>
-    <string name="combo_tdds">TDDS</string>
     <string name="combo_pump_state_label">État</string>
     <string name="combo_pump_activity_label">Activité</string>
     <string name="combo_no_pump_connection" formatted="false">Pas de connexion depuis %d min</string>
@@ -708,21 +707,14 @@
     <string name="bolus_frequency_exceeded">Un bolus avec la même quantité d’insuline a été demandé au cours de la dernière minute. Pour prévenir l’administration accidentelle de deux bolus à la fois et pour protéger contre les bugs quand ceci (bolus) non autorisé</string>
     <string name="combo_pump_connected_now">Maintenant</string>
     <string name="combo_activity_reading_pump_history">Lecture historique pompe</string>
-    <string name="combo_pump_alerts">Alertes</string>
     <string name="combo_activity_setting_basal_profile">Définir le profil basal</string>
     <string name="combo_pump_cartridge_low_warrning">Niveau cartouche pompe bas</string>
     <string name="combo_pump_battery_low_warrning">Niveau batterie pompe bas</string>
     <string name="combo_is_in_error_state" formatted="false">La pompe  affiche l’erreur E%d: %s</string>
-    <string name="combo_no_alert_data_note">Pour lire l’historique des erreurs de pompe, Appuyez longuement sur le bouton ALERTES, WARNING : ceci peut provoquer un bug et ce dernier va ordonner la pompe à rejeter toutes les tentatives de connexion et qui va nécessiter d’appuyer un bouton sur la pompe pour restaurer et par conséquent le bug devrait être évité</string>
-    <string name="combo_no_tdd_data_note">Pour lire l’historique DTQ de la pompe, Appuyez longuement les boutons DTQS, WARNING :  ceci peut provoquer un bug ce qui ordonne la pompe à rejeter toutes les tentatives de connexion et qui va nécessiter d’appuyer un bouton sur la pompe pour restaurer et par conséquent le bug devrait être évité</string>
-    <string name="combo_tdd_minimum" formatted="false">Minimum: %3.1f U</string>
-    <string name="combo_tdd_average" formatted="false">Moyen: %3.1f U</string>
-    <string name="combo_tdd_maximum" formatted="false">Maximum: %3.1f U</string>
     <string name="combo_reservoir_low">Bas</string>
     <string name="combo_reservoir_empty">Vide</string>
     <string name="combo_reservoir_normal">Normal</string>
     <string name="combo_notification_check_time_date">Mise à jour nécessaire pour l\'heure de la pompe</string>
-    <string name="combo_history">Historique</string>
     <string name="combo_warning">Warning</string>
     <string name="combo_pump_tbr_cancelled_warrning">TBR ANNULÉ warning confirmé</string>
     <string name="combo_error_no_bolus_delivered">Administration bolus échouée. Il semble qu’aucun bolus n’a été administré. Pour être sûr, Veuillez vérifier la pompe pour éviter un double bolus ensuite re bolusez une nouvelle fois</string>

app/src/main/res/values-nl/strings.xml

@@ -693,12 +693,9 @@
 	<string name="combo_notification_check_time_date">Pomp klok moet bijgesteld worden</string>
 	<string name="combo_reservoir_empty">Leeg</string>
 	<string name="combo_reservoir_low">Bijna leeg</string>
-	<string name="combo_tdd_maximum">Maximum: %3.1f E</string>
+    <string name="combo_reservoir_normal">Normaal</string>
-	<string name="combo_reservoir_normal">Normaal</string>
     <string name="combo_pump_action_refreshing">Vernieuwen</string>
-	<string name="combo_history">Historiek</string>
+    <string name="combo_pump_battery_low_warrning">Batterij pomp is bijna leeg</string>
-	<string name="combo_pump_alerts">Storingen</string>
-	<string name="combo_pump_battery_low_warrning">Batterij pomp is bijna leeg</string>
 	<string name="combo_pump_unsupported_operation">Gevraagde is niet momeglijk met de pomp</string>
 	<string name="combo_pump_connected_now">Zojuist</string>
 	<string name="combo_pump_tbr_cancelled_warrning">TB GEANNULEERD Waarschuwing is bevestigd</string>
@@ -709,20 +706,15 @@
 	<string name="combo_pump_cartridge_low_warrning">Insuline ampul is bijna leeg</string>
 	<string name="combo_is_in_error_state">Pomp is in storing, controleer op de pomp: E%d %s</string>
 	<string name="combo_pump_action_bolusing">Bolus (%.1f E)</string>
-	<string name="combo_tdd_minimum">Minimum: %3.1f E</string>
+    <string name="combo_activity_setting_basal_profile">Instellen van basaal profiel</string>
-	<string name="combo_tdd_average">Gemiddelde: %3.1f E</string>
-	<string name="combo_activity_setting_basal_profile">Instellen van basaal profiel</string>
 	<string name="combo_activity_reading_pump_history">Lezen van pomp historiek</string>
-    <string name="combo_no_alert_data_note">Om de pomp fouthistoriek op te halen, druk lang op de Storingen knop.</string>
+    <string name="combo_error_partial_bolus_delivered">Maar %.2f E van de gevraagde %.2f E zijn toegediend door een storing. Gelieve op de pomp te controleren en het gepaste gevolg uit te voeren.</string>
-	<string name="combo_error_partial_bolus_delivered">Maar %.2f E van de gevraagde %.2f E zijn toegediend door een storing. Gelieve op de pomp te controleren en het gepaste gevolg uit te voeren.</string>
+    <string name="combo_error_bolus_verification_failed">Toedienen en controleren van de bolus in de pomp historiek is mislukt, controleer de pomp en creëer een manuele bolus in het Careportal tabblad</string>
-	<string name="combo_no_tdd_data_note">"Om de TTD van de pomp op te halen, lang duwen op de TDDS knop OPGELET: dit kan een bug veroorzaken waardoor de pomp alle verbindingen verbreekt en het vereist is op een knop op de pomp te duwen, dit wordt daarom afgeraden."</string>
-	<string name="combo_error_bolus_verification_failed">Toedienen en controleren van de bolus in de pomp historiek is mislukt, controleer de pomp en creëer een manuele bolus in het Careportal tabblad</string>
 	<string name="combo_error_no_bolus_delivered">Bolus toedienen mislukt. Waarschijnlijk is er geen bolus toegediend. Gelieve de pomp te controleren om een dubbele bolus te vermijden. Als bescherming tegen programmeerfouten worden bolussen niet automatisch opnieuw uitgevoerd.</string>
 	<string name="combo_pump_activity_label">Actie</string>
 	<string name="combo_pump_action_setting_tbr">Instellen TBR (%d%% / %d min)</string>
     <string name="combo_force_disabled_notification">Onvoorzichtig gebruik: Vertraagde of multi wave bolussen zijn toegediend in de afgelopen 6 uur op het geselecteerde basaal patroon is niet 1. Loop is onderbroken tot de 6 uur nadat deze bolussen of andere basale patronen zijn gedetecteerd. Alleen normale bolussen en basaal patroon 1 zijn mogelijk binnen basaal patroon 1</string>
-	<string name="combo_tdds">TDDS</string>
+    <string name="combo_low_suspend_forced_notification">Opgelet: verlengde en multi wafe bolussen zijn actief. Loop is naar onderdruk lage waardes enkel overgeschakeld gedurende 6 uur. Alleen gewone bolussen worden onderdsteund in loop modus.</string>
-	<string name="combo_low_suspend_forced_notification">Opgelet: verlengde en multi wafe bolussen zijn actief. Loop is naar onderdruk lage waardes enkel overgeschakeld gedurende 6 uur. Alleen gewone bolussen worden onderdsteund in loop modus.</string>
 	<string name="combo_reservoir_level_insufficient_for_bolus">Niet genoeg insuline aanwezig in reservoir voor de bolus</string>
     <string name="careportal_combobolus">Combinatie-Bolus</string>
     <string name="pump_basebasalrate">%.2f E/u</string>
@@ -732,7 +724,6 @@
     <string name="combo_actvity_reading_basal_profile">Basaal profiel wordt gelezen</string>
     <string name="basalprofilenotaligned">Basale patroon niet geschikt op complete uren: %s</string>
     <string name="zerovalueinprofile">Ongeldig profiel: %s</string>
-    <string name="combo_read_full_history_info">Lang duwen op deze knop zal de volledige historiek en basaal profiel uit de pomp ophalen. Dit is normaal gezien niet nodig, daar de pomp historiek permanent wordt gelezen, maar kan nuttig zijn wanneer de pomp dat en tijd grote afwijkingen hadden of de pomp vervangen is.</string>
     <string name="combo_error_no_connection_no_bolus_delivered">Er kon geen verbinding met de pomp gemaakt worden. De Bolus is niet toegediend.</string>
     <string name="extendedbolusdeliveryerror">Vertraagde bolus toedien storing</string>
     <string name="combo_bolus_rejected_due_to_pump_history_change">De pomp historiek is gewijzigd nadat de bolus berend was. De bolus is NIET toegediend. Programmeer een nieuwe bolus indien nodig. Als dezelfde bolus hoeveelheid moet worden toegediend, gelieve 2 minuten te wachten. Gelijke bolussen worden geweigerd om veiligheidsredenen (toegediend of niet).</string>

app/src/main/res/values/strings.xml

@@ -780,7 +780,6 @@
     <string name="zerovalueinprofile" formatted="false">Invalid profile: %s</string>
     <string name="combo_programming_bolus">Programming pump for bolusing</string>
     <string name="combo_refresh">Refresh</string>
-    <string name="combo_tdds">TDDS</string>
     <string name="combo_pump_state_label">State</string>
     <string name="combo_pump_activity_label">Activity</string>
     <string name="combo_no_pump_connection">No connection for %d min</string>
@@ -801,23 +800,15 @@
     <string name="combo_pump_connected_now">Now</string>
     <string name="combo_activity_reading_pump_history">Reading pump history</string>
     <string name="danar_history">pump history</string>
-    <string name="combo_pump_alerts">Alerts</string>
     <string name="combo_activity_setting_basal_profile">Setting basal profile</string>
     <string name="combo_pump_cartridge_low_warrning">Pump cartridge level is low</string>
     <string name="combo_pump_battery_low_warrning">Pump battery is low</string>
     <string name="combo_is_in_error_state">The pump is showing the error E%d: %s</string>
-    <string name="combo_no_alert_data_note">To read the pump\'s error history, long press this button</string>
-    <string name="combo_no_tdd_data_note">To read the pump\'s TDD history, long press this button</string>
-    <string name="combo_tdd_minimum">Minimum: %3.1f U</string>
-    <string name="combo_tdd_average">Average: %3.1f U</string>
-    <string name="combo_tdd_maximum">Maximum: %3.1f U</string>
     <string name="combo_reservoir_low">Low</string>
     <string name="combo_reservoir_empty">Empty</string>
     <string name="combo_reservoir_normal">Normal</string>
     <string name="combo_notification_check_time_date">Pump clock update needed</string>
-    <string name="combo_history">History</string>
     <string name="combo_warning">Warning</string>
-    <string name="combo_read_full_history_info">Long press this button to force a full read of history and basal profile from the pump. This is generally not needed, since the pump\'s history is read continuously, but can be useful if the pump\'s date and time changed significantly or the pump was replaced.</string>
     <string name="combo_pump_tbr_cancelled_warrning">TBR CANCELLED warning was confirmed</string>
     <string name="combo_error_no_connection_no_bolus_delivered">The pump could not be reached. No bolus was given</string>
     <string name="combo_error_no_bolus_delivered">Bolus delivery failed. It appears no bolus was delivered. To be sure, please check the pump to avoid a double bolus and then bolus again. To guard against bugs, boluses are not automatically retried.</string>