Merge pull request #1623 from TebbeUbben/insight-dev

Updates to Insight driver

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

@@ -1745,7 +1745,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             return getDaoInsightPumpID().queryBuilder()
                     .orderBy("timestamp", false)
                     .where().eq("pumpSerial", pumpSerial)
-                    .and().eq("eventType", "PumpStopped")
+                    .and().in("eventType", "PumpStopped", "PumpPaused")
                     .and().lt("timestamp", before)
                     .queryForFirst();
         } catch (SQLException e) {

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

@@ -823,7 +823,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                 confirmMessage += "\n" + MainApp.gs(R.string.bolus) + ": " + formatNumber2decimalplaces.format(insulinAfterConstraints) + "U";
                 confirmMessage += "\n" + MainApp.gs(R.string.carbs) + ": " + carbsAfterConstraints + "g";
 
-                if (!insulinAfterConstraints.equals(wizard.calculatedTotalInsulin) || !carbsAfterConstraints.equals(quickWizardEntry.carbs())) {
+                if (Math.abs(insulinAfterConstraints - wizard.calculatedTotalInsulin) >= 0.01 || !carbsAfterConstraints.equals(quickWizardEntry.carbs())) {
                     AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
                     builder.setTitle(MainApp.gs(R.string.treatmentdeliveryerror));
                     builder.setMessage(MainApp.gs(R.string.constraints_violation) + "\n" + MainApp.gs(R.string.changeyourinput));
@@ -847,7 +847,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                             return;
                         }
                         accepted = true;
-                        if (finalInsulinAfterConstraints > 0 || finalCarbsAfterConstraints > 0) {
+                        if (Math.abs(insulinAfterConstraints - wizard.calculatedTotalInsulin) >= 0.01 || finalCarbsAfterConstraints > 0) {
                             if (wizard.superBolus) {
                                 final LoopPlugin loopPlugin = LoopPlugin.getPlugin();
                                 if (loopPlugin.isEnabled(PluginType.LOOP)) {

app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/InsightAlertService.java

@@ -48,7 +48,7 @@ public class InsightAlertService extends Service implements InsightConnectionSer
         public void onServiceConnected(ComponentName name, IBinder binder) {
             connectionService = ((InsightConnectionService.LocalBinder) binder).getService();
             connectionService.registerStateCallback(InsightAlertService.this);
-            stateChanged(connectionService.getState());
+            onStateChanged(connectionService.getState());
         }
 
         @Override
@@ -114,7 +114,7 @@ public class InsightAlertService extends Service implements InsightConnectionSer
     }
 
     @Override
-    public void stateChanged(InsightState state) {
+    public void onStateChanged(InsightState state) {
         if (state == InsightState.CONNECTED) {
             thread = new Thread(this::queryActiveAlert);
             thread.start();

app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/LocalInsightPlugin.java

@@ -41,6 +41,7 @@ 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.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ProfileFunctions;
 import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
 import info.nightscout.androidaps.plugins.NSClientInternal.UploadQueue;
@@ -68,12 +69,7 @@ import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.his
 import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events.StartOfTBREvent;
 import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events.TotalDailyDoseEvent;
 import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events.TubeFilledEvent;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks.ActiveBRProfileBlock;
 import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks.BRProfile1Block;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks.BRProfile2Block;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks.BRProfile3Block;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks.BRProfile4Block;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks.BRProfile5Block;
 import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks.BRProfileBlock;
 import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks.FactoryMinBolusAmountBlock;
 import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks.MaxBasalAmountBlock;
@@ -115,6 +111,7 @@ import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.Operating
 import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.PumpTime;
 import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.TotalDailyDose;
 import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.InsightException;
+import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.AppLayerErrorException;
 import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.NoActiveTBRToCanceLException;
 import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ExceptionTranslator;
 import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ParameterBlockUtil;
@@ -153,8 +150,8 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
     };
 
     private final Object $bolusLock = new Object[0];
-    private boolean bolusInProgress;
+    private int bolusID;
-    private int bolusID = -1;
+    private boolean bolusCancelled;
     private List<BasalProfileBlock> profileBlocks;
     private boolean limitsFetched;
     private double maximumBolusAmount;
@@ -260,13 +257,16 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
 
     @Override
     public boolean isConnected() {
-        if (connectionService == null || alertService == null) return false;
+        return connectionService != null
-        return connectionService.getState() == InsightState.CONNECTED;
+                && alertService != null
+                && connectionService.hasRequestedConnection(this)
+                && connectionService.getState() == InsightState.CONNECTED;
     }
 
     @Override
     public boolean isConnecting() {
-        if (connectionService == null || alertService == null) return false;
+        if (connectionService == null || alertService == null || !connectionService.hasRequestedConnection(this))
+            return false;
         InsightState state = connectionService.getState();
         return state == InsightState.CONNECTING
                 || state == InsightState.APP_CONNECT_MESSAGE
@@ -305,11 +305,13 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
     public void getPumpStatus() {
         try {
             tbrOverNotificationBlock = ParameterBlockUtil.readParameterBlock(connectionService, Service.CONFIGURATION, TBROverNotificationBlock.class);
-            fetchStatus();
+            readHistory();
             fetchBasalProfile();
             fetchLimitations();
             updatePumpTimeIfNeeded();
-            readHistory();
+            fetchStatus();
+        } catch (AppLayerErrorException e) {
+            log.info("Exception while fetching status: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
         } catch (InsightException e) {
             log.info("Exception while fetching status: " + e.getClass().getCanonicalName());
         } catch (Exception e) {
@@ -450,6 +452,11 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
                 fetchStatus();
             } catch (Exception ignored) {
             }
+        } catch (AppLayerErrorException e) {
+            log.info("Exception while setting profile: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
+            Notification notification = new Notification(Notification.FAILED_UDPATE_PROFILE, MainApp.gs(R.string.failedupdatebasalprofile), Notification.URGENT);
+            MainApp.bus().post(new EventNewNotification(notification));
+            result.comment = ExceptionTranslator.getString(e);
         } catch (InsightException e) {
             log.info("Exception while setting profile: " + e.getClass().getCanonicalName());
             Notification notification = new Notification(Notification.FAILED_UDPATE_PROFILE, MainApp.gs(R.string.failedupdatebasalprofile), Notification.URGENT);
@@ -519,6 +526,7 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
                     bolusMessage.setExtendedAmount(0);
                     bolusMessage.setImmediateAmount(detailedBolusInfo.insulin);
                     bolusID = connectionService.requestMessage(bolusMessage).await().getBolusId();
+                    bolusCancelled = false;
                 }
                 result.success = true;
                 result.enacted = true;
@@ -540,10 +548,18 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
                 detailedBolusInfo.pumpId = insightBolusID.id;
                 TreatmentsPlugin.getPlugin().addToHistoryTreatment(detailedBolusInfo, true);
                 while (true) {
+                    synchronized ($bolusLock) {
+                        if (bolusCancelled) break;
+                    }
+                    OperatingMode operatingMode = connectionService.requestMessage(new GetOperatingModeMessage()).await().getOperatingMode();
+                    if (operatingMode != OperatingMode.STARTED) break;
                     List<ActiveBolus> activeBoluses = connectionService.requestMessage(new GetActiveBolusesMessage()).await().getActiveBoluses();
                     ActiveBolus activeBolus = null;
                     for (ActiveBolus bolus : activeBoluses) {
-                        if (bolus.getBolusID() == bolusID) activeBolus = bolus;
+                        if (bolus.getBolusID() == bolusID) {
+                            activeBolus = bolus;
+                            break;
+                        }
                     }
                     if (activeBolus != null) {
                         trials = -1;
@@ -552,14 +568,25 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
                         bolusingEvent.status = MainApp.gs(R.string.insight_delivered, activeBolus.getInitialAmount() - activeBolus.getRemainingAmount(), activeBolus.getInitialAmount());
                         if (percentBefore != bolusingEvent.percent)
                             MainApp.bus().post(bolusingEvent);
-                    } else if (trials == -1 || trials++ >= 5) break;
+                    } else {
-                    Thread.sleep(200);
+                        synchronized ($bolusLock) {
-                }
+                            if (bolusCancelled || trials == -1 || trials++ >= 5) {
+                                if (!bolusCancelled) {
                                     bolusingEvent.status = MainApp.gs(R.string.insight_delivered, detailedBolusInfo.insulin, detailedBolusInfo.insulin);
                                     bolusingEvent.percent = 100;
                                     MainApp.bus().post(bolusingEvent);
+                                }
+                                break;
+                            }
+                        }
+                    }
+                    Thread.sleep(200);
+                }
                 readHistory();
                 fetchStatus();
+            } catch (AppLayerErrorException e) {
+                log.info("Exception while delivering bolus: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
+                result.comment = ExceptionTranslator.getString(e);
             } catch (InsightException e) {
                 log.info("Exception while delivering bolus: " + e.getClass().getCanonicalName());
                 result.comment = ExceptionTranslator.getString(e);
@@ -578,19 +605,22 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
     @Override
     public void stopBolusDelivering() {
         new Thread(() -> {
-            synchronized ($bolusLock) {
             try {
+                synchronized ($bolusLock) {
                     alertService.ignore(AlertType.WARNING_38);
                     CancelBolusMessage cancelBolusMessage = new CancelBolusMessage();
                     cancelBolusMessage.setBolusID(bolusID);
                     connectionService.requestMessage(cancelBolusMessage).await();
+                    bolusCancelled = true;
+                }
                 confirmAlert(AlertType.WARNING_38);
+            } catch (AppLayerErrorException e) {
+                log.info("Exception while canceling bolus: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
             } catch (InsightException e) {
                 log.info("Exception while canceling bolus: " + e.getClass().getCanonicalName());
             } catch (Exception e) {
                 log.error("Exception while canceling bolus", e);
             }
-            }
         }).start();
     }
 
@@ -633,6 +663,8 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
         try {
             fetchStatus();
             readHistory();
+        } catch (AppLayerErrorException e) {
+            log.info("Exception after setting TBR: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
         } catch (InsightException e) {
             log.info("Exception after setting TBR: " + e.getClass().getCanonicalName());
         } catch (Exception e) {
@@ -667,6 +699,9 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
             result.comment = MainApp.gs(R.string.virtualpump_resultok);
             readHistory();
             fetchStatus();
+        } catch (AppLayerErrorException e) {
+            log.info("Exception while setting TBR: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
+            result.comment = ExceptionTranslator.getString(e);
         } catch (InsightException e) {
             log.info("Exception while setting TBR: " + e.getClass().getCanonicalName());
             result.comment = ExceptionTranslator.getString(e);
@@ -683,6 +718,8 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
         try {
             fetchStatus();
             readHistory();
+        } catch (AppLayerErrorException e) {
+            log.info("Exception after delivering extended bolus: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
         } catch (InsightException e) {
             log.info("Exception after delivering extended bolus: " + e.getClass().getCanonicalName());
         } catch (Exception e) {
@@ -715,6 +752,9 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
             result.success = true;
             result.enacted = true;
             result.comment = MainApp.gs(R.string.virtualpump_resultok);
+        } catch (AppLayerErrorException e) {
+            log.info("Exception while delivering extended bolus: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
+            result.comment = ExceptionTranslator.getString(e);
         } catch (InsightException e) {
             log.info("Exception while delivering extended bolus: " + e.getClass().getCanonicalName());
             result.comment = ExceptionTranslator.getString(e);
@@ -737,6 +777,8 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
         try {
             fetchStatus();
             readHistory();
+        } catch (AppLayerErrorException e) {
+            log.info("Exception after canceling TBR: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
         } catch (InsightException e) {
             log.info("Exception after canceling TBR: " + e.getClass().getCanonicalName());
         } catch (Exception e) {
@@ -759,6 +801,9 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
         } catch (NoActiveTBRToCanceLException e) {
             result.success = true;
             result.comment = MainApp.gs(R.string.virtualpump_resultok);
+        } catch (AppLayerErrorException e) {
+            log.info("Exception while canceling TBR: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
+            result.comment = ExceptionTranslator.getString(e);
         } catch (InsightException e) {
             log.info("Exception while canceling TBR: " + e.getClass().getCanonicalName());
             result.comment = ExceptionTranslator.getString(e);
@@ -775,10 +820,12 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
         try {
             fetchStatus();
             readHistory();
+        } catch (AppLayerErrorException e) {
+            log.info("Exception after canceling extended bolus: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
         } catch (InsightException e) {
-            log.info("Exception after canceling bolus: " + e.getClass().getCanonicalName());
+            log.info("Exception after canceling extended bolus: " + e.getClass().getCanonicalName());
         } catch (Exception e) {
-            log.error("Exception after canceling bolus", e);
+            log.error("Exception after canceling extended bolus", e);
         }
         return result;
     }
@@ -817,11 +864,14 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
             }
             result.success = true;
             result.comment = MainApp.gs(R.string.virtualpump_resultok);
+        } catch (AppLayerErrorException e) {
+            log.info("Exception while canceling extended bolus: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
+            result.comment = ExceptionTranslator.getString(e);
         } catch (InsightException e) {
-            log.info("Exception while canceling bolus: " + e.getClass().getCanonicalName());
+            log.info("Exception while canceling extended bolus: " + e.getClass().getCanonicalName());
             result.comment = ExceptionTranslator.getString(e);
         } catch (Exception e) {
-            log.error("Exception while canceling bolus", e);
+            log.error("Exception while canceling extended bolus", e);
             result.comment = ExceptionTranslator.getString(e);
         }
         return result;
@@ -840,6 +890,8 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
                     } else break;
                 }
             }
+        } catch (AppLayerErrorException e) {
+            log.info("Exception while confirming alert: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
         } catch (InsightException e) {
             log.info("Exception while confirming alert: " + e.getClass().getCanonicalName());
         } catch (Exception e) {
@@ -911,6 +963,9 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
             result.enacted = true;
             fetchStatus();
             readHistory();
+        } catch (AppLayerErrorException e) {
+            log.info("Exception while stopping pump: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
+            result.comment = ExceptionTranslator.getString(e);
         } catch (InsightException e) {
             log.info("Exception while stopping pump: " + e.getClass().getCanonicalName());
             result.comment = ExceptionTranslator.getString(e);
@@ -931,8 +986,12 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
             result.enacted = true;
             fetchStatus();
             readHistory();
+        } catch (AppLayerErrorException e) {
+            log.info("Exception while starting pump: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
+            result.comment = ExceptionTranslator.getString(e);
         } catch (InsightException e) {
             log.info("Exception while starting pump: " + e.getClass().getCanonicalName());
+            result.comment = ExceptionTranslator.getString(e);
         } catch (Exception e) {
             log.error("Exception while starting pump", e);
             result.comment = ExceptionTranslator.getString(e);
@@ -948,6 +1007,10 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
             ParameterBlockUtil.writeConfigurationBlock(connectionService, tbrOverNotificationBlock);
             result.success = true;
             result.enacted = true;
+        } catch (AppLayerErrorException e) {
+            tbrOverNotificationBlock.setEnabled(valueBefore);
+            log.info("Exception while updating TBR notification block: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
+            result.comment = ExceptionTranslator.getString(e);
         } catch (InsightException e) {
             tbrOverNotificationBlock.setEnabled(valueBefore);
             log.info("Exception while updating TBR notification block: " + e.getClass().getSimpleName());
@@ -1018,11 +1081,7 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
                     startMessage.setDirection(HistoryReadingDirection.BACKWARD);
                     startMessage.setOffset(0xFFFFFFFF);
                     connectionService.requestMessage(startMessage).await();
-                    for (int i = 0; i < 50; i++) {
+                    historyEvents = connectionService.requestMessage(new ReadHistoryEventsMessage()).await().getHistoryEvents();
-                        List<HistoryEvent> newEvents = connectionService.requestMessage(new ReadHistoryEventsMessage()).await().getHistoryEvents();
-                        if (newEvents.size() == 0) break;
-                        historyEvents.addAll(newEvents);
-                    }
                 } else {
                     StartReadingHistoryMessage startMessage = new StartReadingHistoryMessage();
                     startMessage.setDirection(HistoryReadingDirection.FORWARD);
@@ -1034,17 +1093,29 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
                         historyEvents.addAll(newEvents);
                     }
                 }
-                processHistoryEvents(pumpSerial, historyEvents);
+                Collections.sort(historyEvents);
+                Collections.reverse(historyEvents);
+                if (historyOffset != null) processHistoryEvents(pumpSerial, historyEvents);
+                if (historyEvents.size() > 0) {
+                    historyOffset = new InsightHistoryOffset();
+                    historyOffset.pumpSerial = pumpSerial;
+                    historyOffset.offset = historyEvents.get(0).getEventPosition();
+                    MainApp.getDbHelper().createOrUpdate(historyOffset);
+                }
+            } catch (AppLayerErrorException e) {
+                log.info("Exception while reading history: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
             } catch (InsightException e) {
-                log.info("Error while reading history: " + e.getClass().getSimpleName());
+                log.info("Exception while reading history: " + e.getClass().getSimpleName());
             } catch (Exception e) {
-                log.error("Error while reading history", e);
+                log.error("Exception while reading history", e);
             } finally {
                 try {
                     connectionService.requestMessage(new StopReadingHistoryMessage()).await();
                 } catch (Exception ignored) {
                 }
             }
+        } catch (AppLayerErrorException e) {
+            log.info("Exception while reading history: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
         } catch (InsightException e) {
             log.info("Exception while reading history: " + e.getClass().getSimpleName());
         } catch (Exception e) {
@@ -1054,8 +1125,6 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
     }
 
     private void processHistoryEvents(String serial, List<HistoryEvent> historyEvents) {
-        Collections.sort(historyEvents);
-        Collections.reverse(historyEvents);
         List<TemporaryBasal> temporaryBasals = new ArrayList<>();
         List<InsightPumpID> pumpStartedEvents = new ArrayList<>();
         for (HistoryEvent historyEvent : historyEvents)
@@ -1064,7 +1133,7 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
         Collections.reverse(temporaryBasals);
         for (InsightPumpID pumpID : pumpStartedEvents) {
             InsightPumpID stoppedEvent = MainApp.getDbHelper().getPumpStoppedEvent(pumpID.pumpSerial, pumpID.timestamp);
-            if (stoppedEvent == null) continue;
+            if (stoppedEvent == null || stoppedEvent.eventType.equals("PumpPaused")) continue;
             long tbrStart = stoppedEvent.timestamp + 10000;
             TemporaryBasal temporaryBasal = new TemporaryBasal();
             temporaryBasal.durationInMinutes = (int) ((pumpID.timestamp - tbrStart) / 60000);
@@ -1078,12 +1147,6 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
         Collections.sort(temporaryBasals, (o1, o2) -> (int) (o1.date - o2.date));
         for (TemporaryBasal temporaryBasal : temporaryBasals)
             TreatmentsPlugin.getPlugin().addToHistoryTempBasal(temporaryBasal);
-        if (historyEvents.size() > 0) {
-            InsightHistoryOffset historyOffset = new InsightHistoryOffset();
-            historyOffset.pumpSerial = serial;
-            historyOffset.offset = historyEvents.get(0).getEventPosition();
-            MainApp.getDbHelper().createOrUpdate(historyOffset);
-        }
     }
 
     private boolean processHistoryEvent(String serial, List<TemporaryBasal> temporaryBasals, List<InsightPumpID> pumpStartedEvents, HistoryEvent event) {
@@ -1170,22 +1233,22 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
         switch (event.getNewValue()) {
             case STARTED:
                 pumpID.eventType = "PumpStarted";
-                MainApp.getDbHelper().createOrUpdate(pumpID);
                 pumpStartedEvents.add(pumpID);
                 if (SP.getBoolean("insight_log_operating_mode_changes", false))
                     logNote(timestamp, MainApp.gs(R.string.pump_started));
                 break;
             case STOPPED:
-                if (SP.getBoolean("insight_log_operating_mode_changes", false))
                 pumpID.eventType = "PumpStopped";
-                MainApp.getDbHelper().createOrUpdate(pumpID);
+                if (SP.getBoolean("insight_log_operating_mode_changes", false))
                     logNote(timestamp, MainApp.gs(R.string.pump_stopped));
                 break;
             case PAUSED:
+                pumpID.eventType = "PumpPaused";
                 if (SP.getBoolean("insight_log_operating_mode_changes", false))
                     logNote(timestamp, MainApp.gs(R.string.pump_paused));
                 break;
         }
+        MainApp.getDbHelper().createOrUpdate(pumpID);
     }
 
     private void processStartOfTBREvent(String serial, List<TemporaryBasal> temporaryBasals, StartOfTBREvent event) {
@@ -1471,7 +1534,7 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
     }
 
     @Override
-    public void stateChanged(InsightState state) {
+    public void onStateChanged(InsightState state) {
         if (state == InsightState.CONNECTED) statusLoaded = false;
         else if (state == InsightState.NOT_PAIRED) {
             connectionService.withdrawConnectionRequest(this);
@@ -1485,7 +1548,13 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
             activeTBR = null;
             activeBoluses = null;
             tbrOverNotificationBlock = null;
+            new Handler(Looper.getMainLooper()).post(() -> MainApp.bus().post(new EventRefreshOverview("LocalInsightPlugin::onStateChanged")));
         }
         new Handler(Looper.getMainLooper()).post(() -> MainApp.bus().post(new EventLocalInsightUpdateGUI()));
     }
+
+    @Override
+    public void onPumpPaired() {
+        ConfigBuilderPlugin.getPlugin().getCommandQueue().readStatus("Pump paired", null);
+    }
 }

app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/activities/InsightPairingActivity.java

@@ -21,7 +21,6 @@ import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -56,7 +55,7 @@ public class InsightPairingActivity extends AppCompatActivity implements Insight
                 service.requestConnection(InsightPairingActivity.this);
                 service.registerStateCallback(InsightPairingActivity.this);
                 service.registerExceptionCallback(InsightPairingActivity.this);
-                stateChanged(service.getState());
+                onStateChanged(service.getState());
             }
         }
 
@@ -116,7 +115,7 @@ public class InsightPairingActivity extends AppCompatActivity implements Insight
     }
 
     @Override
-    public void stateChanged(InsightState state) {
+    public void onStateChanged(InsightState state) {
         runOnUiThread(() -> {
             switch (state) {
                 case NOT_PAIRED:

app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/connection_service/InsightConnectionService.java

@@ -20,7 +20,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.BolusProgressReporter;
 import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.AppLayerMessage;
 import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.ReadParameterBlockMessage;
 import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.configuration.CloseConfigurationWriteSessionMessage;
@@ -245,7 +244,7 @@ public class InsightConnectionService extends Service implements ConnectionEstab
             wakeLock.release();
         else if (!wakeLock.isHeld()) wakeLock.acquire();
         this.state = state;
-        for (StateCallback stateCallback : stateCallbacks) stateCallback.stateChanged(state);
+        for (StateCallback stateCallback : stateCallbacks) stateCallback.onStateChanged(state);
         log.info("Insight state changed: " + state.name());
     }
 
@@ -278,6 +277,10 @@ public class InsightConnectionService extends Service implements ConnectionEstab
         }
     }
 
+    public synchronized boolean hasRequestedConnection(Object lock) {
+        return connectionRequests.contains(lock);
+    }
+
     private void cleanup() {
         messageQueue.completeActiveRequest(new ConnectionLostException());
         messageQueue.completePendingRequests(new ConnectionLostException());
@@ -704,6 +707,7 @@ public class InsightConnectionService extends Service implements ConnectionEstab
                 pairingDataStorage.setPaired(true);
                 log.info("Pairing completed YEE-HAW ♪ ┏(・o･)┛ ♪ ┗( ･o･)┓ ♪");
                 setState(InsightState.CONNECTED);
+                for (StateCallback stateCallback : stateCallbacks) stateCallback.onPumpPaired();
             }
         } else processGenericAppLayerMessage(message);
     }
@@ -771,7 +775,10 @@ public class InsightConnectionService extends Service implements ConnectionEstab
     }
 
     public interface StateCallback {
-        void stateChanged(InsightState state);
+        void onStateChanged(InsightState state);
+        default void onPumpPaired() {
+
+        }
     }
 
     public interface ExceptionCallback {

app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/AppLayerErrorException.java

@@ -14,4 +14,8 @@ public abstract class AppLayerErrorException extends AppLayerException {
     public String getMessage() {
         return "Error code: " + errorCode;
     }
+
+    public int getErrorCode() {
+        return errorCode;
+    }
 }

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

@@ -886,7 +886,7 @@
     <string name="combo_error_bolus_verification_failed">Delivering the bolus and verifying the pump\'s history failed, please check the pump. If a bolus was delivered, it will be added to treatments during the next connection to the pump.</string>
     <string name="combo_reservoir_level_insufficient_for_bolus">Not enough insulin for bolus left in reservoir</string>
     <string name="extendedbolusdeliveryerror">Extended bolus delivery error</string>
-    <string name="insightpump_shortname">Insight</string>
+    <string name="insightpump_shortname">Sight</string>
     <string name="insightpump">Insight Pump</string>
     <string name="status_no_colon">Status</string>
     <string name="changed">Changed</string>
@@ -1281,8 +1281,8 @@
     <string name="extended_bolus">Extended bolus</string>
     <string name="multiwave_bolus">Multiwave bolus</string>
     <string name="eb_formatter">%1$.2f / %2$.2f U for %3$d min</string>
-    <string name="enable_tbr_over_notification">Enable TBR over notification</string>
+    <string name="enable_tbr_over_notification">Enable notification of TBR end\n(pump setting)</string>
-    <string name="disable_tbr_over_notification">Disable TBR over notification</string>
+    <string name="disable_tbr_over_notification">Disable notification of TBR end\n(pump setting)</string>
     <string name="refresh">Refresh</string>
     <string name="description_pump_insight_local">Pump integration for Accu-Chek Insight pumps</string>
     <string name="not_inserted">Not inserted</string>