revert dev changes

app/src/main/assets/OpenAPSSMB/basal-set-temp.js

@@ -19,22 +19,23 @@ tempBasalFunctions.setTempBasal = function setTempBasal(rate, duration, profile,
     //var maxSafeBasal = Math.min(profile.max_basal, 3 * profile.max_daily_basal, 4 * profile.current_basal);
 
     var maxSafeBasal = tempBasalFunctions.getMaxSafeBasal(profile);
-    var round_basal = require('./round-basal');
+var round_basal = require('./round-basal');
 
     if (rate < 0) {
         rate = 0;
-    } else if (rate > maxSafeBasal) {
+    } // if >30m @ 0 required, zero temp will be extended to 30m instead
+    else if (rate > maxSafeBasal) {
         rate = maxSafeBasal;
     }
 
     var suggestedRate = round_basal(rate, profile);
-    if (typeof(currenttemp) !== 'undefined' && typeof(currenttemp.duration) !== 'undefined' && typeof(currenttemp.rate) !== 'undefined' && currenttemp.duration > (duration-10) && currenttemp.duration <= 120 && suggestedRate <= currenttemp.rate * 1.2 && suggestedRate >= currenttemp.rate * 0.8 && duration > 0 ) {
+    if (typeof(currenttemp) !== 'undefined' && typeof(currenttemp.duration) !== 'undefined' && typeof(currenttemp.rate) !== 'undefined' && currenttemp.duration > (duration-10) && currenttemp.duration <= 120 && suggestedRate <= currenttemp.rate * 1.2 && suggestedRate >= currenttemp.rate * 0.8) {
         rT.reason += " "+currenttemp.duration+"m left and " + currenttemp.rate + " ~ req " + suggestedRate + "U/hr: no temp required";
         return rT;
     }
 
     if (suggestedRate === profile.current_basal) {
-      if (profile.skip_neutral_temps === true) {
+      if (profile.skip_neutral_temps) {
         if (typeof(currenttemp) !== 'undefined' && typeof(currenttemp.duration) !== 'undefined' && currenttemp.duration > 0) {
           reason(rT, 'Suggested rate is same as profile rate, a temp basal is active, canceling current temp');
           rT.duration = 0;

app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java

@@ -156,12 +156,6 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
         }
     }
 
-    @Override
-    public void onDowngrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-        log.info("Do nothing for downgrading...");
-        log.debug("oldVersion: {}, newVersion: {}", oldVersion, newVersion);
-    }
-
     public int getOldVersion() {
         return oldVersion;
     }

app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/BolusProgressDialog.java

@@ -107,9 +107,9 @@ public class BolusProgressDialog extends DialogFragment implements View.OnClickL
 
     @Override
     public void onPause() {
-        running = false;
         super.onPause();
         MainApp.unsubscribe(this);
+        running = false;
         if (L.isEnabled(L.UI))
             log.debug("onPause");
     }
@@ -173,12 +173,10 @@ public class BolusProgressDialog extends DialogFragment implements View.OnClickL
             Activity activity = getActivity();
             if (activity != null) {
                 activity.runOnUiThread(() -> {
-                    try {
-                        if (running) {
                     if (L.isEnabled(L.UI))
                         log.debug("executing");
+                    try {
                         dismiss();
-                        }
                     } catch (Exception e) {
                         log.error("Unhandled exception", e);
                     }

app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java

@@ -1364,7 +1364,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
 
         // Sensitivity
         if (sensitivityView != null) {
-            AutosensData autosensData = IobCobCalculatorPlugin.getPlugin().getLastAutosensData("Overview");
+            AutosensData autosensData = IobCobCalculatorPlugin.getPlugin().getLastAutosensDataSynchronized("Overview");
             if (autosensData != null)
                 sensitivityView.setText(String.format("%.0f%%", autosensData.autosensResult.ratio * 100));
             else

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

@@ -807,7 +807,7 @@
     <string name="hour">hodin</string>
     <string name="day">dní</string>
     <string name="week">týdnů</string>
-    <string name="time_plural"></string>
+    <string name="time_plural"> </string>
     <string name="insight_keepalive_format_string">%1$d vyprší %2$s</string>
     <string name="insight_keep_alive_status">Stav keep-alive</string>
     <string name="statistics">Statistika</string>
@@ -1052,7 +1052,6 @@
     <string name="insulinlimitviolation">Překročen limit inzulínu</string>
     <string name="loop_openmode_min_change">Minimální změna pro výzvu [%]</string>
     <string name="loop_openmode_min_change_summary">Smyčka vytvoří novou žádost o změnu pouze v případě, že změna je větší než tato hodnota. Výchozí hodnota je 20 %</string>
-    <string name="pairfirst">Spárujte pumpu s telefonem!</string>
     <plurals name="objective_days">
         <item quantity="one">%1$d den</item>
         <item quantity="few">%1$d dnů</item>