From 0322dd48acb20d62c6e0cfd456756ed92218087f Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Sun, 21 Feb 2021 18:03:26 +0100 Subject: [PATCH] insight -> lib --- app/build.gradle | 1 + app/src/main/AndroidManifest.xml | 16 ---- .../androidaps/db/DatabaseHelper.java | 27 +++---- .../androidaps/db/DatabaseHelperProvider.java | 31 ++++++++ .../dependencyInjection/ActivitiesModule.kt | 6 -- .../dependencyInjection/AppComponent.kt | 4 + .../dependencyInjection/FragmentsModule.kt | 4 - .../dependencyInjection/ServicesModule.kt | 4 - app/src/main/res/values/strings.xml | 77 ------------------- app/src/main/res/values/styles.xml | 6 -- .../interfaces/ConstraintsCheckerTest.kt | 2 +- .../combo/di/ComboActivitiesModule.kt | 11 +++ .../androidaps/combo/di/ComboModule.kt | 2 + .../androidaps/db}/InsightBolusID.java | 6 +- .../androidaps/db}/InsightHistoryOffset.java | 6 +- .../androidaps/db}/InsightPumpID.java | 6 +- .../interfaces/DatabaseHelperInterface.kt | 16 ++++ .../interfaces/UploadQueueInterface.java | 1 + core/src/main/res/values/strings.xml | 4 + crowdin.yml | 6 +- insight/.gitignore | 1 + insight/build.gradle | 20 +++++ insight/consumer-rules.pro | 0 insight/proguard-rules.pro | 21 +++++ insight/src/main/AndroidManifest.xml | 25 ++++++ .../insight/di/InsightActivitiesModule.kt | 18 +++++ .../insight/di/InsightCommModule.kt | 8 ++ .../androidaps/insight/di/InsightModule.kt | 10 +++ .../insight/di/InsightServicesModule.kt | 14 ++++ .../pump/insight/InsightAlertService.java | 2 +- .../pump/insight/LocalInsightFragment.java | 10 +-- .../pump/insight/LocalInsightPlugin.java | 71 +++++++++-------- .../activities/InsightAlertActivity.java | 2 +- .../activities/InsightPairingActivity.java | 2 +- .../InsightPairingInformationActivity.java | 2 +- .../insight/app_layer/AppLayerMessage.java | 0 .../app_layer/ReadParameterBlockMessage.java | 0 .../pump/insight/app_layer/Service.java | 0 ...CloseConfigurationWriteSessionMessage.java | 0 .../OpenConfigurationWriteSessionMessage.java | 0 .../WriteConfigurationBlockMessage.java | 0 .../connection/ActivateServiceMessage.java | 0 .../app_layer/connection/BindMessage.java | 0 .../app_layer/connection/ConnectMessage.java | 0 .../connection/DisconnectMessage.java | 0 .../connection/ServiceChallengeMessage.java | 0 .../history/HistoryReadingDirection.java | 0 .../history/ReadHistoryEventsMessage.java | 0 .../history/StartReadingHistoryMessage.java | 0 .../history/StopReadingHistoryMessage.java | 0 .../BasalDeliveryChangedEvent.java | 0 .../history_events/BolusDeliveredEvent.java | 0 .../history_events/BolusProgrammedEvent.java | 0 .../history_events/CannulaFilledEvent.java | 0 .../CartridgeInsertedEvent.java | 0 .../history_events/CartridgeRemovedEvent.java | 0 .../history_events/DateTimeChangedEvent.java | 0 .../DefaultDateTimeSetEvent.java | 0 .../history/history_events/EndOfTBREvent.java | 0 .../history/history_events/HistoryEvent.java | 0 .../OccurrenceOfAlertEvent.java | 0 .../OccurrenceOfErrorEvent.java | 0 .../OccurrenceOfMaintenanceEvent.java | 0 .../OccurrenceOfWarningEvent.java | 0 .../OperatingModeChangedEvent.java | 0 .../history_events/PowerDownEvent.java | 0 .../history/history_events/PowerUpEvent.java | 0 .../history_events/SniffingDoneEvent.java | 0 .../history_events/StartOfTBREvent.java | 0 .../history_events/TotalDailyDoseEvent.java | 0 .../history_events/TubeFilledEvent.java | 0 .../ActiveBRProfileBlock.java | 0 .../parameter_blocks/BRProfile1Block.java | 0 .../parameter_blocks/BRProfile1NameBlock.java | 0 .../parameter_blocks/BRProfile2Block.java | 0 .../parameter_blocks/BRProfile2NameBlock.java | 0 .../parameter_blocks/BRProfile3Block.java | 0 .../parameter_blocks/BRProfile3NameBlock.java | 0 .../parameter_blocks/BRProfile4Block.java | 0 .../parameter_blocks/BRProfile4NameBlock.java | 0 .../parameter_blocks/BRProfile5Block.java | 0 .../parameter_blocks/BRProfile5NameBlock.java | 0 .../parameter_blocks/BRProfileBlock.java | 0 .../FactoryMaxBasalAmountBlock.java | 0 .../FactoryMaxBolusAmountBlock.java | 0 .../FactoryMinBasalAmountBlock.java | 0 .../FactoryMinBolusAmountBlock.java | 0 .../InsulinAmountLimitationBlock.java | 0 .../parameter_blocks/MaxBasalAmountBlock.java | 0 .../parameter_blocks/MaxBolusAmountBlock.java | 0 .../app_layer/parameter_blocks/NameBlock.java | 0 .../parameter_blocks/ParameterBlock.java | 0 .../SystemIdentificationBlock.java | 0 .../TBROverNotificationBlock.java | 0 .../remote_control/CancelBolusMessage.java | 0 .../remote_control/CancelTBRMessage.java | 0 .../remote_control/ChangeTBRMessage.java | 0 .../remote_control/ConfirmAlertMessage.java | 0 .../remote_control/DeliverBolusMessage.java | 0 .../GetAvailableBolusTypesMessage.java | 0 .../remote_control/SetDateTimeMessage.java | 0 .../SetOperatingModeMessage.java | 0 .../remote_control/SetTBRMessage.java | 0 .../remote_control/SnoozeAlertMessage.java | 0 .../status/GetActiveAlertMessage.java | 0 .../status/GetActiveBasalRateMessage.java | 0 .../status/GetActiveBolusesMessage.java | 0 .../app_layer/status/GetActiveTBRMessage.java | 0 .../status/GetBatteryStatusMessage.java | 0 .../status/GetCartridgeStatusMessage.java | 0 .../app_layer/status/GetDateTimeMessage.java | 0 .../status/GetFirmwareVersionsMessage.java | 0 .../status/GetOperatingModeMessage.java | 0 .../status/GetPumpStatusRegisterMessage.java | 0 .../status/GetTotalDailyDoseMessage.java | 0 .../ResetPumpStatusRegisterMessage.java | 0 .../ConfigurationMessageRequest.java | 0 .../InsightConnectionService.java | 0 .../connection_service/MessageQueue.java | 0 .../connection_service/MessageRequest.java | 0 .../insight/descriptors/ActiveBasalRate.java | 0 .../pump/insight/descriptors/ActiveBolus.java | 0 .../pump/insight/descriptors/ActiveTBR.java | 0 .../pump/insight/descriptors/Alert.java | 0 .../insight/descriptors/AlertCategory.java | 0 .../pump/insight/descriptors/AlertStatus.java | 0 .../pump/insight/descriptors/AlertType.java | 0 .../descriptors/AvailableBolusTypes.java | 0 .../insight/descriptors/BasalProfile.java | 0 .../descriptors/BasalProfileBlock.java | 0 .../insight/descriptors/BatteryStatus.java | 0 .../pump/insight/descriptors/BatteryType.java | 0 .../pump/insight/descriptors/BolusType.java | 0 .../insight/descriptors/CartridgeStatus.java | 0 .../insight/descriptors/CartridgeType.java | 0 .../insight/descriptors/FirmwareVersions.java | 0 .../insight/descriptors/InsightState.java | 0 .../insight/descriptors/MessagePriority.java | 0 .../insight/descriptors/OperatingMode.java | 0 .../pump/insight/descriptors/PumpTime.java | 0 .../insight/descriptors/SymbolStatus.java | 0 .../descriptors/SystemIdentification.java | 0 .../insight/descriptors/TotalDailyDose.java | 0 .../events/EventLocalInsightUpdateGUI.kt | 0 .../insight/exceptions/AppLayerException.java | 0 .../CommandNotSupportedException.java | 0 .../exceptions/ConnectionFailedException.java | 0 .../exceptions/ConnectionLostException.java | 0 .../exceptions/DisconnectedException.java | 0 .../IncompatibleAppVersionException.java | 0 .../IncompatibleSatlVersionException.java | 0 .../insight/exceptions/InsightException.java | 0 .../exceptions/InvalidAppCRCException.java | 0 .../InvalidMacTrailerException.java | 0 .../exceptions/InvalidNonceException.java | 0 .../InvalidPacketLengthsException.java | 0 .../exceptions/InvalidPreambleException.java | 0 .../exceptions/InvalidSatlCRCException.java | 0 .../InvalidSatlCommandException.java | 0 ...ReceivedPacketInInvalidStateException.java | 0 .../insight/exceptions/SatlException.java | 0 .../SecondChannelFailedException.java | 0 .../SocketCreationFailedException.java | 0 .../insight/exceptions/TimeoutException.java | 0 .../exceptions/TooChattyPumpException.java | 0 .../UnknownAppCommandException.java | 0 .../exceptions/UnknownServiceException.java | 0 .../AlreadyConnectedException.java | 0 .../AppLayerErrorException.java | 0 .../BolusAmountNotInRangeException.java | 0 .../BolusDurationNotInRangeException.java | 0 .../BolusLagTimeFeatureDisabledException.java | 0 ...olusTypeAndParameterMismatchException.java | 0 .../CommandExecutionFailedException.java | 0 .../ConfigMemoryAccessException.java | 0 .../CustomBolusNotConfiguredException.java | 0 ...mplausiblePortionLengthValueException.java | 0 .../IncompatibleVersionException.java | 0 .../InvalidAlertInstanceIdException.java | 0 .../InvalidConfigBlockCRCException.java | 0 .../InvalidConfigBlockIdException.java | 0 .../InvalidConfigBlockLengthException.java | 0 .../InvalidDateParameterException.java | 0 .../InvalidDurationPresetException.java | 0 .../InvalidLagTimeException.java | 0 .../InvalidParameterTypeException.java | 0 .../InvalidPayloadCRCException.java | 0 .../InvalidPayloadException.java | 0 .../InvalidPayloadLengthException.java | 0 .../InvalidServicePasswordException.java | 0 .../InvalidTBRDurationException.java | 0 .../InvalidTBRFactorException.java | 0 .../InvalidTBRTemplateException.java | 0 .../InvalidTimeParameterException.java | 0 ...InvalidValuesOfTwoChannelTransmission.java | 0 ...berOfBolusTypeAlreadyRunningException.java | 0 .../NoActiveTBRToCanceLException.java | 0 .../NoActiveTBRToChangeException.java | 0 .../NoConfigBlockDataException.java | 0 .../NoServicePasswordNeededException.java | 0 .../NoSuchBolusToCancelException.java | 0 ...tAllowedToAccessPositionZeroException.java | 0 .../NotConnectedException.java | 0 .../NotReferencedException.java | 0 .../PauseModeNotAllowedException.java | 0 .../PositionProtectedException.java | 0 .../PumpAlreadyInThatStateException.java | 0 .../app_layer_errors/PumpBusyException.java | 0 .../PumpStoppedException.java | 0 ...ReadingHistoryAlreadyStartedException.java | 0 .../ReadingHistoryNotStartedException.java | 0 .../RunModeNotAllowedException.java | 0 .../ServiceAlreadyActivatedException.java | 0 .../ServiceCommandNotAvailableException.java | 0 .../ServiceIncompatibleException.java | 0 .../ServiceNotActivatedException.java | 0 .../StepCountOutOfRangeException.java | 0 .../UnknownAppLayerErrorCodeException.java | 0 .../UnknownCommandException.java | 0 .../UnknownServiceException.java | 0 .../WriteSessionAlreadyOpenException.java | 0 .../WriteSessionClosedException.java | 0 .../app_layer_errors/WrongStateException.java | 0 .../SatlCompatibleStateErrorException.java | 0 ...SatlDecryptVerifyFailedErrorException.java | 0 .../satl_errors/SatlErrorException.java | 0 ...SatlIncompatibleVersionErrorException.java | 0 .../SatlInvalidCRCErrorException.java | 0 .../SatlInvalidCommIdErrorException.java | 0 .../SatlInvalidMacErrorException.java | 0 .../SatlInvalidMessageTypeErrorException.java | 0 .../SatlInvalidNonceErrorException.java | 0 .../SatlInvalidPacketErrorException.java | 0 ...atlInvalidPayloadLengthErrorException.java | 0 .../satl_errors/SatlNoneErrorException.java | 0 .../SatlPairingRejectedException.java | 0 .../SatlUndefinedErrorException.java | 0 .../satl_errors/SatlWrongStateException.java | 0 .../insight/ids/ActiveBasalProfileIDs.java | 0 .../pump/insight/ids/ActiveBolusTypeIDs.java | 0 .../pump/insight/ids/AlertCategoryIDs.java | 0 .../pump/insight/ids/AlertStatusIDs.java | 0 .../pump/insight/ids/AlertTypeIDs.java | 0 .../insight/ids/AlertTypeIncrementalIDs.java | 0 .../pump/insight/ids/AppCommandIDs.java | 0 .../plugins/pump/insight/ids/AppErrorIDs.java | 0 .../pump/insight/ids/BatteryTypeIDs.java | 0 .../pump/insight/ids/BolusTypeIDs.java | 0 .../pump/insight/ids/CartridgeTypeIDs.java | 0 .../pump/insight/ids/HistoryEventIDs.java | 0 .../ids/HistoryReadingDirectionIDs.java | 0 .../pump/insight/ids/OperatingModeIDs.java | 0 .../pump/insight/ids/PairingStatusIDs.java | 0 .../pump/insight/ids/ParameterBlockIDs.java | 0 .../pump/insight/ids/SatlCommandIDs.java | 0 .../pump/insight/ids/SatlErrorIDs.java | 0 .../plugins/pump/insight/ids/ServiceIDs.java | 0 .../pump/insight/ids/SymbolStatusIDs.java | 0 .../pump/insight/satl/ConnectionRequest.java | 0 .../pump/insight/satl/ConnectionResponse.java | 0 .../pump/insight/satl/DataMessage.java | 0 .../pump/insight/satl/DisconnectMessage.java | 0 .../pump/insight/satl/ErrorMessage.java | 0 .../plugins/pump/insight/satl/KeyRequest.java | 0 .../pump/insight/satl/KeyResponse.java | 0 .../pump/insight/satl/PairingStatus.java | 0 .../plugins/pump/insight/satl/SatlError.java | 0 .../pump/insight/satl/SatlMessage.java | 0 .../pump/insight/satl/SynAckResponse.java | 0 .../plugins/pump/insight/satl/SynRequest.java | 0 .../insight/satl/VerifyConfirmRequest.java | 0 .../insight/satl/VerifyConfirmResponse.java | 0 .../insight/satl/VerifyDisplayRequest.java | 0 .../insight/satl/VerifyDisplayResponse.java | 0 .../plugins/pump/insight/utils/AlertUtils.kt | 2 +- .../plugins/pump/insight/utils/BOCUtil.java | 0 .../plugins/pump/insight/utils/ByteBuf.java | 0 .../insight/utils/ConnectionEstablisher.java | 0 .../insight/utils/DelayedActionThread.java | 0 .../insight/utils/ExceptionTranslator.java | 2 +- .../plugins/pump/insight/utils/IDStorage.java | 0 .../pump/insight/utils/InputStreamReader.java | 0 .../plugins/pump/insight/utils/Nonce.java | 0 .../insight/utils/OutputStreamWriter.java | 0 .../insight/utils/PairingDataStorage.java | 0 .../insight/utils/ParameterBlockUtil.java | 0 .../pump/insight/utils/crypto/CRC.java | 0 .../insight/utils/crypto/Cryptograph.java | 0 .../insight/utils/crypto/DerivedKeys.java | 0 .../pump/insight/utils/crypto/KeyPair.java | 0 .../utils/crypto/VerificationString.java | 0 .../src/main/res/drawable/ic_error.xml | 0 .../src/main/res/drawable/ic_insight.xml | 0 .../src/main/res/drawable/ic_insight_128.xml | 0 .../src/main/res/drawable/ic_maintenance.xml | 0 .../src/main/res/drawable/ic_reminder.xml | 0 .../src/main/res/drawable/ic_warning.xml | 0 .../res/layout/activity_insight_alert.xml | 0 .../res/layout/activity_insight_pairing.xml | 0 .../activity_insight_pairing_information.xml | 0 .../src/main/res/layout/bluetooth_device.xml | 0 .../res/layout/local_insight_fragment.xml | 0 .../local_insight_status_delimitter.xml | 0 .../res/layout/local_insight_status_item.xml | 0 .../main/res/values/insight_alert_codes.xml | 0 .../res/values/insight_alert_descriptions.xml | 0 .../main/res/values/insight_alert_titles.xml | 0 .../main/res/values/insight_exceptions.xml | 0 insight/src/main/res/values/strings.xml | 76 ++++++++++++++++++ insight/src/main/res/values/styles.xml | 10 +++ .../main/res/xml/pref_insight_local_full.xml | 0 .../xml/pref_insight_local_pumpcontrol.xml | 0 settings.gradle | 1 + 313 files changed, 345 insertions(+), 188 deletions(-) create mode 100644 combo/src/main/java/info/nightscout/androidaps/combo/di/ComboActivitiesModule.kt rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database => core/src/main/java/info/nightscout/androidaps/db}/InsightBolusID.java (68%) rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database => core/src/main/java/info/nightscout/androidaps/db}/InsightHistoryOffset.java (56%) rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database => core/src/main/java/info/nightscout/androidaps/db}/InsightPumpID.java (66%) create mode 100644 insight/.gitignore create mode 100644 insight/build.gradle create mode 100644 insight/consumer-rules.pro create mode 100644 insight/proguard-rules.pro create mode 100644 insight/src/main/AndroidManifest.xml create mode 100644 insight/src/main/java/info/nightscout/androidaps/insight/di/InsightActivitiesModule.kt create mode 100644 insight/src/main/java/info/nightscout/androidaps/insight/di/InsightCommModule.kt create mode 100644 insight/src/main/java/info/nightscout/androidaps/insight/di/InsightModule.kt create mode 100644 insight/src/main/java/info/nightscout/androidaps/insight/di/InsightServicesModule.kt rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java (99%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java (97%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java (97%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightAlertActivity.java (98%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingActivity.java (99%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingInformationActivity.java (98%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/AppLayerMessage.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/ReadParameterBlockMessage.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/Service.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/configuration/CloseConfigurationWriteSessionMessage.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/configuration/OpenConfigurationWriteSessionMessage.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/configuration/WriteConfigurationBlockMessage.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/connection/ActivateServiceMessage.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/connection/BindMessage.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/connection/ConnectMessage.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/connection/DisconnectMessage.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/connection/ServiceChallengeMessage.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/HistoryReadingDirection.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/ReadHistoryEventsMessage.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/StartReadingHistoryMessage.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/StopReadingHistoryMessage.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/BasalDeliveryChangedEvent.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/BolusDeliveredEvent.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/BolusProgrammedEvent.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/CannulaFilledEvent.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/CartridgeInsertedEvent.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/CartridgeRemovedEvent.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/DateTimeChangedEvent.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/DefaultDateTimeSetEvent.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/EndOfTBREvent.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/HistoryEvent.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/OccurrenceOfAlertEvent.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/OccurrenceOfErrorEvent.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/OccurrenceOfMaintenanceEvent.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/OccurrenceOfWarningEvent.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/OperatingModeChangedEvent.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/PowerDownEvent.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/PowerUpEvent.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/SniffingDoneEvent.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/StartOfTBREvent.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/TotalDailyDoseEvent.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/TubeFilledEvent.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/ActiveBRProfileBlock.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile1Block.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile1NameBlock.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile2Block.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile2NameBlock.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile3Block.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile3NameBlock.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile4Block.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile4NameBlock.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile5Block.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile5NameBlock.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfileBlock.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/FactoryMaxBasalAmountBlock.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/FactoryMaxBolusAmountBlock.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/FactoryMinBasalAmountBlock.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/FactoryMinBolusAmountBlock.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/InsulinAmountLimitationBlock.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/MaxBasalAmountBlock.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/MaxBolusAmountBlock.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/NameBlock.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/ParameterBlock.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/SystemIdentificationBlock.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/TBROverNotificationBlock.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/CancelBolusMessage.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/CancelTBRMessage.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/ChangeTBRMessage.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/ConfirmAlertMessage.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/DeliverBolusMessage.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/GetAvailableBolusTypesMessage.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/SetDateTimeMessage.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/SetOperatingModeMessage.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/SetTBRMessage.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/SnoozeAlertMessage.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetActiveAlertMessage.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetActiveBasalRateMessage.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetActiveBolusesMessage.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetActiveTBRMessage.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetBatteryStatusMessage.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetCartridgeStatusMessage.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetDateTimeMessage.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetFirmwareVersionsMessage.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetOperatingModeMessage.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetPumpStatusRegisterMessage.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetTotalDailyDoseMessage.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/ResetPumpStatusRegisterMessage.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/ConfigurationMessageRequest.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/InsightConnectionService.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/MessageQueue.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/MessageRequest.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/ActiveBasalRate.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/ActiveBolus.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/ActiveTBR.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/Alert.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/AlertCategory.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/AlertStatus.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/AlertType.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/AvailableBolusTypes.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/BasalProfile.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/BasalProfileBlock.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/BatteryStatus.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/BatteryType.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/BolusType.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/CartridgeStatus.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/CartridgeType.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/FirmwareVersions.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/InsightState.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/MessagePriority.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/OperatingMode.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/PumpTime.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/SymbolStatus.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/SystemIdentification.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/TotalDailyDose.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/events/EventLocalInsightUpdateGUI.kt (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/AppLayerException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/CommandNotSupportedException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/ConnectionFailedException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/ConnectionLostException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/DisconnectedException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/IncompatibleAppVersionException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/IncompatibleSatlVersionException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InsightException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidAppCRCException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidMacTrailerException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidNonceException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidPacketLengthsException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidPreambleException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidSatlCRCException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidSatlCommandException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/ReceivedPacketInInvalidStateException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/SatlException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/SecondChannelFailedException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/SocketCreationFailedException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/TimeoutException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/TooChattyPumpException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/UnknownAppCommandException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/UnknownServiceException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/AlreadyConnectedException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/AppLayerErrorException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/BolusAmountNotInRangeException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/BolusDurationNotInRangeException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/BolusLagTimeFeatureDisabledException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/BolusTypeAndParameterMismatchException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/CommandExecutionFailedException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ConfigMemoryAccessException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/CustomBolusNotConfiguredException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ImplausiblePortionLengthValueException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/IncompatibleVersionException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidAlertInstanceIdException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidConfigBlockCRCException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidConfigBlockIdException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidConfigBlockLengthException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidDateParameterException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidDurationPresetException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidLagTimeException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidParameterTypeException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidPayloadCRCException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidPayloadException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidPayloadLengthException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidServicePasswordException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidTBRDurationException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidTBRFactorException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidTBRTemplateException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidTimeParameterException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidValuesOfTwoChannelTransmission.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/MaximumNumberOfBolusTypeAlreadyRunningException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NoActiveTBRToCanceLException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NoActiveTBRToChangeException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NoConfigBlockDataException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NoServicePasswordNeededException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NoSuchBolusToCancelException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NotAllowedToAccessPositionZeroException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NotConnectedException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NotReferencedException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/PauseModeNotAllowedException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/PositionProtectedException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/PumpAlreadyInThatStateException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/PumpBusyException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/PumpStoppedException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ReadingHistoryAlreadyStartedException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ReadingHistoryNotStartedException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/RunModeNotAllowedException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ServiceAlreadyActivatedException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ServiceCommandNotAvailableException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ServiceIncompatibleException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ServiceNotActivatedException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/StepCountOutOfRangeException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/UnknownAppLayerErrorCodeException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/UnknownCommandException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/UnknownServiceException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/WriteSessionAlreadyOpenException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/WriteSessionClosedException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/WrongStateException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlCompatibleStateErrorException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlDecryptVerifyFailedErrorException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlErrorException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlIncompatibleVersionErrorException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidCRCErrorException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidCommIdErrorException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidMacErrorException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidMessageTypeErrorException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidNonceErrorException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidPacketErrorException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidPayloadLengthErrorException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlNoneErrorException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlPairingRejectedException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlUndefinedErrorException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlWrongStateException.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/ActiveBasalProfileIDs.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/ActiveBolusTypeIDs.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/AlertCategoryIDs.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/AlertStatusIDs.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/AlertTypeIDs.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/AlertTypeIncrementalIDs.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/AppCommandIDs.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/AppErrorIDs.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/BatteryTypeIDs.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/BolusTypeIDs.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/CartridgeTypeIDs.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/HistoryEventIDs.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/HistoryReadingDirectionIDs.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/OperatingModeIDs.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/PairingStatusIDs.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/ParameterBlockIDs.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/SatlCommandIDs.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/SatlErrorIDs.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/ServiceIDs.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/SymbolStatusIDs.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/ConnectionRequest.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/ConnectionResponse.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/DataMessage.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/DisconnectMessage.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/ErrorMessage.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/KeyRequest.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/KeyResponse.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/PairingStatus.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/SatlError.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/SatlMessage.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/SynAckResponse.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/SynRequest.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/VerifyConfirmRequest.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/VerifyConfirmResponse.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/VerifyDisplayRequest.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/VerifyDisplayResponse.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/AlertUtils.kt (99%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/BOCUtil.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/ByteBuf.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/ConnectionEstablisher.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/DelayedActionThread.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/ExceptionTranslator.java (98%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/IDStorage.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/InputStreamReader.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/Nonce.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/OutputStreamWriter.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/PairingDataStorage.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/ParameterBlockUtil.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/crypto/CRC.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/crypto/Cryptograph.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/crypto/DerivedKeys.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/crypto/KeyPair.java (100%) rename {app => insight}/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/crypto/VerificationString.java (100%) rename {app => insight}/src/main/res/drawable/ic_error.xml (100%) rename {app => insight}/src/main/res/drawable/ic_insight.xml (100%) rename {app => insight}/src/main/res/drawable/ic_insight_128.xml (100%) rename {app => insight}/src/main/res/drawable/ic_maintenance.xml (100%) rename {app => insight}/src/main/res/drawable/ic_reminder.xml (100%) rename {app => insight}/src/main/res/drawable/ic_warning.xml (100%) rename {app => insight}/src/main/res/layout/activity_insight_alert.xml (100%) rename {app => insight}/src/main/res/layout/activity_insight_pairing.xml (100%) rename {app => insight}/src/main/res/layout/activity_insight_pairing_information.xml (100%) rename {app => insight}/src/main/res/layout/bluetooth_device.xml (100%) rename {app => insight}/src/main/res/layout/local_insight_fragment.xml (100%) rename {app => insight}/src/main/res/layout/local_insight_status_delimitter.xml (100%) rename {app => insight}/src/main/res/layout/local_insight_status_item.xml (100%) rename {app => insight}/src/main/res/values/insight_alert_codes.xml (100%) rename {app => insight}/src/main/res/values/insight_alert_descriptions.xml (100%) rename {app => insight}/src/main/res/values/insight_alert_titles.xml (100%) rename {app => insight}/src/main/res/values/insight_exceptions.xml (100%) create mode 100644 insight/src/main/res/values/strings.xml create mode 100644 insight/src/main/res/values/styles.xml rename {app => insight}/src/main/res/xml/pref_insight_local_full.xml (100%) rename {app => insight}/src/main/res/xml/pref_insight_local_pumpcontrol.xml (100%) diff --git a/app/build.gradle b/app/build.gradle index 84ad51a2e5..889521cc89 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -182,6 +182,7 @@ dependencies { implementation project(':dana') implementation project(':danars') implementation project(':danar') + implementation project(':insight') implementation project(':rileylink') implementation project(':medtronic') implementation project(':omnipod-eros') diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1abc55ecfe..ddd02dd5e8 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -219,8 +219,6 @@ android:exported="false" /> - - - - - diff --git a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java index ae7a6e4436..9eb8a59a5e 100644 --- a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java +++ b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java @@ -46,6 +46,7 @@ import info.nightscout.androidaps.events.EventReloadTreatmentData; import info.nightscout.androidaps.events.EventTempBasalChange; import info.nightscout.androidaps.events.EventTempTargetChange; import info.nightscout.androidaps.interfaces.ActivePluginProvider; +import info.nightscout.androidaps.interfaces.DatabaseHelperInterface; import info.nightscout.androidaps.interfaces.ProfileInterface; import info.nightscout.androidaps.interfaces.ProfileStore; import info.nightscout.androidaps.logging.AAPSLogger; @@ -54,9 +55,6 @@ import info.nightscout.androidaps.plugins.bus.RxBusWrapper; import info.nightscout.androidaps.plugins.general.nsclient.NSUpload; import info.nightscout.androidaps.plugins.general.openhumans.OpenHumansUploader; import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventNewHistoryData; -import info.nightscout.androidaps.plugins.pump.insight.database.InsightBolusID; -import info.nightscout.androidaps.plugins.pump.insight.database.InsightHistoryOffset; -import info.nightscout.androidaps.plugins.pump.insight.database.InsightPumpID; import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin; import info.nightscout.androidaps.utils.JsonHelper; import info.nightscout.androidaps.utils.PercentageSplitter; @@ -83,9 +81,6 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper { public static final String DATABASE_DBREQUESTS = "DBRequests"; public static final String DATABASE_CAREPORTALEVENTS = "CareportalEvents"; public static final String DATABASE_TDDS = "TDDs"; - public static final String DATABASE_INSIGHT_HISTORY_OFFSETS = "InsightHistoryOffsets"; - public static final String DATABASE_INSIGHT_BOLUS_IDS = "InsightBolusIDs"; - public static final String DATABASE_INSIGHT_PUMP_IDS = "InsightPumpIDs"; public static final String DATABASE_OPEN_HUMANS_QUEUE = "OpenHumansQueue"; private static final int DATABASE_VERSION = 13; @@ -138,10 +133,10 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper { TableUtils.createTableIfNotExists(connectionSource, InsightPumpID.class); TableUtils.createTableIfNotExists(connectionSource, OmnipodHistoryRecord.class); TableUtils.createTableIfNotExists(connectionSource, OHQueueItem.class); - database.execSQL("INSERT INTO sqlite_sequence (name, seq) SELECT \"" + DATABASE_INSIGHT_BOLUS_IDS + "\", " + System.currentTimeMillis() + " " + - "WHERE NOT EXISTS (SELECT 1 FROM sqlite_sequence WHERE name = \"" + DATABASE_INSIGHT_BOLUS_IDS + "\")"); - database.execSQL("INSERT INTO sqlite_sequence (name, seq) SELECT \"" + DATABASE_INSIGHT_PUMP_IDS + "\", " + System.currentTimeMillis() + " " + - "WHERE NOT EXISTS (SELECT 1 FROM sqlite_sequence WHERE name = \"" + DATABASE_INSIGHT_PUMP_IDS + "\")"); + database.execSQL("INSERT INTO sqlite_sequence (name, seq) SELECT \"" + DatabaseHelperInterface.Companion.DATABASE_INSIGHT_BOLUS_IDS + "\", " + System.currentTimeMillis() + " " + + "WHERE NOT EXISTS (SELECT 1 FROM sqlite_sequence WHERE name = \"" + DatabaseHelperInterface.Companion.DATABASE_INSIGHT_BOLUS_IDS + "\")"); + database.execSQL("INSERT INTO sqlite_sequence (name, seq) SELECT \"" + DatabaseHelperInterface.Companion.DATABASE_INSIGHT_PUMP_IDS + "\", " + System.currentTimeMillis() + " " + + "WHERE NOT EXISTS (SELECT 1 FROM sqlite_sequence WHERE name = \"" + DatabaseHelperInterface.Companion.DATABASE_INSIGHT_PUMP_IDS + "\")"); } catch (SQLException e) { aapsLogger.error("Can't create database", e); throw new RuntimeException(e); @@ -169,13 +164,13 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper { TableUtils.createTableIfNotExists(connectionSource, InsightHistoryOffset.class); TableUtils.createTableIfNotExists(connectionSource, InsightBolusID.class); TableUtils.createTableIfNotExists(connectionSource, InsightPumpID.class); - database.execSQL("INSERT INTO sqlite_sequence (name, seq) SELECT \"" + DATABASE_INSIGHT_BOLUS_IDS + "\", " + System.currentTimeMillis() + " " + - "WHERE NOT EXISTS (SELECT 1 FROM sqlite_sequence WHERE name = \"" + DATABASE_INSIGHT_BOLUS_IDS + "\")"); - database.execSQL("INSERT INTO sqlite_sequence (name, seq) SELECT \"" + DATABASE_INSIGHT_PUMP_IDS + "\", " + System.currentTimeMillis() + " " + - "WHERE NOT EXISTS (SELECT 1 FROM sqlite_sequence WHERE name = \"" + DATABASE_INSIGHT_PUMP_IDS + "\")"); + database.execSQL("INSERT INTO sqlite_sequence (name, seq) SELECT \"" + DatabaseHelperInterface.Companion.DATABASE_INSIGHT_BOLUS_IDS + "\", " + System.currentTimeMillis() + " " + + "WHERE NOT EXISTS (SELECT 1 FROM sqlite_sequence WHERE name = \"" + DatabaseHelperInterface.Companion.DATABASE_INSIGHT_BOLUS_IDS + "\")"); + database.execSQL("INSERT INTO sqlite_sequence (name, seq) SELECT \"" + DatabaseHelperInterface.Companion.DATABASE_INSIGHT_PUMP_IDS + "\", " + System.currentTimeMillis() + " " + + "WHERE NOT EXISTS (SELECT 1 FROM sqlite_sequence WHERE name = \"" + DatabaseHelperInterface.Companion.DATABASE_INSIGHT_PUMP_IDS + "\")"); } else if (oldVersion < 11) { - database.execSQL("UPDATE sqlite_sequence SET seq = " + System.currentTimeMillis() + " WHERE name = \"" + DATABASE_INSIGHT_BOLUS_IDS + "\""); - database.execSQL("UPDATE sqlite_sequence SET seq = " + System.currentTimeMillis() + " WHERE name = \"" + DATABASE_INSIGHT_PUMP_IDS + "\""); + database.execSQL("UPDATE sqlite_sequence SET seq = " + System.currentTimeMillis() + " WHERE name = \"" + DatabaseHelperInterface.Companion.DATABASE_INSIGHT_BOLUS_IDS + "\""); + database.execSQL("UPDATE sqlite_sequence SET seq = " + System.currentTimeMillis() + " WHERE name = \"" + DatabaseHelperInterface.Companion.DATABASE_INSIGHT_PUMP_IDS + "\""); } TableUtils.createTableIfNotExists(connectionSource, OHQueueItem.class); } catch (SQLException e) { diff --git a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelperProvider.java b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelperProvider.java index 41f7cabdd9..71d61d7276 100644 --- a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelperProvider.java +++ b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelperProvider.java @@ -108,4 +108,35 @@ public class DatabaseHelperProvider implements DatabaseHelperInterface { return MainApp.getDbHelper().getProfileSwitchData(from, ascending); } + @Override public void createOrUpdate(@NotNull InsightBolusID record) { + MainApp.getDbHelper().createOrUpdate(record); + } + + @Override public void createOrUpdate(@NotNull InsightPumpID record) { + MainApp.getDbHelper().createOrUpdate(record); + } + + @Override public void createOrUpdate(@NotNull InsightHistoryOffset record) { + MainApp.getDbHelper().createOrUpdate(record); + } + + @Override public void delete(@NotNull ExtendedBolus extendedBolus) { + MainApp.getDbHelper().delete(extendedBolus); + } + + @Nullable @Override public ExtendedBolus getExtendedBolusByPumpId(long pumpId) { + return MainApp.getDbHelper().getExtendedBolusByPumpId(pumpId); + } + + @Nullable @Override public InsightBolusID getInsightBolusID(@NotNull String pumpSerial, int bolusID, long timestamp) { + return MainApp.getDbHelper().getInsightBolusID(pumpSerial, bolusID, timestamp); + } + + @Nullable @Override public InsightHistoryOffset getInsightHistoryOffset(@NotNull String pumpSerial) { + return MainApp.getDbHelper().getInsightHistoryOffset(pumpSerial); + } + + @Nullable @Override public InsightPumpID getPumpStoppedEvent(@NotNull String pumpSerial, long before) { + return MainApp.getDbHelper().getPumpStoppedEvent(pumpSerial, before); + } } diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt index 54f139f0e8..b26cc28ec1 100644 --- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt +++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt @@ -11,9 +11,6 @@ import info.nightscout.androidaps.plugins.general.overview.activities.QuickWizar import info.nightscout.androidaps.plugins.general.smsCommunicator.activities.SmsCommunicatorOtpActivity import info.nightscout.androidaps.plugins.pump.common.dialog.RileyLinkBLEConfigActivity import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusActivity -import info.nightscout.androidaps.plugins.pump.insight.activities.InsightAlertActivity -import info.nightscout.androidaps.plugins.pump.insight.activities.InsightPairingActivity -import info.nightscout.androidaps.plugins.pump.insight.activities.InsightPairingInformationActivity import info.nightscout.androidaps.plugins.pump.medtronic.dialog.MedtronicHistoryActivity import info.nightscout.androidaps.setupwizard.SetupWizardActivity @@ -22,9 +19,6 @@ import info.nightscout.androidaps.setupwizard.SetupWizardActivity abstract class ActivitiesModule { @ContributesAndroidInjector abstract fun contributesHistoryBrowseActivity(): HistoryBrowseActivity - @ContributesAndroidInjector abstract fun contributesInsightAlertActivity(): InsightAlertActivity - @ContributesAndroidInjector abstract fun contributesInsightPairingActivity(): InsightPairingActivity - @ContributesAndroidInjector abstract fun contributesInsightPairingInformationActivity(): InsightPairingInformationActivity @ContributesAndroidInjector abstract fun contributesLogSettingActivity(): LogSettingActivity @ContributesAndroidInjector abstract fun contributeMainActivity(): MainActivity @ContributesAndroidInjector abstract fun contributesMedtronicHistoryActivity(): MedtronicHistoryActivity diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt index 61cb5334b0..85c7a817ba 100644 --- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt +++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt @@ -5,10 +5,12 @@ import dagger.Component import dagger.android.AndroidInjectionModule import dagger.android.AndroidInjector import info.nightscout.androidaps.MainApp +import info.nightscout.androidaps.combo.di.ComboModule import info.nightscout.androidaps.core.di.CoreModule import info.nightscout.androidaps.dana.di.DanaModule import info.nightscout.androidaps.danar.di.DanaRModule import info.nightscout.androidaps.danars.di.DanaRSModule +import info.nightscout.androidaps.danars.di.InsightModule import info.nightscout.androidaps.database.DatabaseModule import info.nightscout.androidaps.plugins.pump.common.dagger.RileyLinkModule import info.nightscout.androidaps.plugins.pump.omnipod.eros.dagger.OmnipodErosModule @@ -43,6 +45,8 @@ import javax.inject.Singleton DanaModule::class, DanaRModule::class, DanaRSModule::class, + ComboModule::class, + InsightModule::class, WorkersModule::class, OHUploaderModule::class ] diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt index d00f9b20fd..7fcdf4af07 100644 --- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt +++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt @@ -30,10 +30,8 @@ import info.nightscout.androidaps.plugins.general.wear.WearFragment import info.nightscout.androidaps.plugins.insulin.InsulinFragment import info.nightscout.androidaps.plugins.profile.local.LocalProfileFragment import info.nightscout.androidaps.plugins.profile.ns.NSProfileFragment -import info.nightscout.androidaps.plugins.pump.combo.ComboFragment import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusGeneralFragment import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusHistoryFragment -import info.nightscout.androidaps.plugins.pump.insight.LocalInsightFragment import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicFragment import info.nightscout.androidaps.plugins.pump.medtronic.dialog.RileyLinkStatusDeviceMedtronic import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.OmnipodOverviewFragment @@ -52,7 +50,6 @@ abstract class FragmentsModule { @ContributesAndroidInjector abstract fun contributesActionsFragment(): ActionsFragment @ContributesAndroidInjector abstract fun contributesAutomationFragment(): AutomationFragment @ContributesAndroidInjector abstract fun contributesBGSourceFragment(): BGSourceFragment - @ContributesAndroidInjector abstract fun contributesComboFragment(): ComboFragment @ContributesAndroidInjector abstract fun contributesConfigBuilderFragment(): ConfigBuilderFragment @@ -64,7 +61,6 @@ abstract class FragmentsModule { @ContributesAndroidInjector abstract fun contributesOpenAPSAMAFragment(): OpenAPSAMAFragment @ContributesAndroidInjector abstract fun contributesOpenAPSSMBFragment(): OpenAPSSMBFragment @ContributesAndroidInjector abstract fun contributesOverviewFragment(): OverviewFragment - @ContributesAndroidInjector abstract fun contributesLocalInsightFragment(): LocalInsightFragment @ContributesAndroidInjector abstract fun contributesLoopFragment(): LoopFragment @ContributesAndroidInjector abstract fun contributesMaintenanceFragment(): MaintenanceFragment @ContributesAndroidInjector abstract fun contributesMedtronicFragment(): MedtronicFragment diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ServicesModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ServicesModule.kt index 50f8695bf9..bc4db59d70 100644 --- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ServicesModule.kt +++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ServicesModule.kt @@ -7,8 +7,6 @@ import info.nightscout.androidaps.plugins.general.overview.notifications.Dismiss import info.nightscout.androidaps.plugins.general.persistentNotification.DummyService import info.nightscout.androidaps.plugins.general.wear.wearintegration.WatchUpdaterService import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkService -import info.nightscout.androidaps.plugins.pump.insight.InsightAlertService -import info.nightscout.androidaps.plugins.pump.insight.connection_service.InsightConnectionService import info.nightscout.androidaps.plugins.pump.medtronic.service.RileyLinkMedtronicService import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.service.RileyLinkOmnipodService import info.nightscout.androidaps.services.AlarmSoundService @@ -24,8 +22,6 @@ abstract class ServicesModule { @ContributesAndroidInjector abstract fun contributesLocationService(): LocationService @ContributesAndroidInjector abstract fun contributesNSClientService(): NSClientService @ContributesAndroidInjector abstract fun contributesWatchUpdaterService(): WatchUpdaterService - @ContributesAndroidInjector abstract fun contributesInsightAlertService(): InsightAlertService - @ContributesAndroidInjector abstract fun contributesInsightConnectionService(): InsightConnectionService @ContributesAndroidInjector abstract fun contributesRileyLinkService(): RileyLinkService @ContributesAndroidInjector abstract fun contributesRileyLinkMedtronicService(): RileyLinkMedtronicService @ContributesAndroidInjector abstract fun contributesRileyLinkOmnipodService(): RileyLinkOmnipodService diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b289d4727e..617a74818c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -382,7 +382,6 @@ Show queue Queue: Status: - Paused nsclientinternal_url nsclientinternal_api_secret Clear log @@ -640,7 +639,6 @@ Maximal IOB set properly BG available from selected source Extended bolus delivery error - Sight enableSMB_always enableSMB_with_COB enableSMB_with_temptarget @@ -752,9 +750,6 @@ openapsmb_max_iob Maximum total IOB OpenAPS can\'t go over [U] This value is called Max IOB in OpenAPS context\nOpenAPS will not add more insulin if current IOB is greater than this value - Pump stopped - Pump started - Pump paused Meal max absorption time [h] Time at which any meal is considered absorbed. Remaining carbs will be cut off. Time @@ -826,7 +821,6 @@ Application needs location permission for BT scan and WiFi identification Application needs storage permission to be able store log files and export settings Request - Exit Open navigation Close navigation Plugin preferences @@ -882,76 +876,6 @@ Minimal request change [%] Open Loop will popup new change request only if change is bigger than this value in %. Default value is 20% short_tabtitles - Searching for devices… - Pairing completed - Do the codes displayed on this device and on your pump match? - Insight pairing - Accu-Chek Insight - %1$.2f U / %2$.2f U delivered - %1$s: %2$s - Tube changed - Pump time updated - Confirm - Mute - Pump alert - Log site changes - Log reservoir changes - Log tube changes - Log battery changes - Log operating mode changes - Log alerts - Enable TBR emulation - Use extended boluses instead of TBRs to bypass the 250%% limit - insight_disable_vibration - Disable vibrations on manual bolus delivery - For bolus and extended bolus (only available with Insight firmware 3.x) - insight_disable_vibration_auto - Disable vibrations on automated bolus delivery - For SMB and Temp Basal with TBR emulation (only available with Insight firmware 3.x) - Disconnect delay [s] - Serial number - Release software version - UI processor software version - PC processor software version - MD tel processor software version - Safety processor software version - BT info page version - Bluetooth address - System ID appendix - Manufacturing date - Delete pairing - Pairing information - Start pump - Stop pump - Operating mode - Status - TDD Bolus - TDD Basal - TDD Total - Recovering - Not paired - Last connected - Started - Stopped - %1$d%% for %2$d / %3$d min - Extended bolus - Multiwave bolus - %1$.2f / %2$.2f U for %3$d min - Enable notification of TBR end\n(pump setting) - Disable notification of TBR end\n(pump setting) - Pump integration for Accu-Chek Insight pumps - Not inserted - Last conn: %1$d min ago - TBR: %1$d%% for %2$d / %3$d min - Extended: %1$.2f / %2$.2f U for %3$d min - Multiwave: %1$.2f / %2$.2f U for %3$d min - TDD: %1$.2f - Reser.: %1$.2f U - Batt.: %1$d%% - Max. recovery duration [s] - Min. recovery duration [s] - Recovery duration - Timeout during handshake - reset bluetooth Sun Sat Fri @@ -1199,7 +1123,6 @@ SMB execution time Temp basal request time Temp basal execution time - Insight Pump Alerts diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index b79d02361d..ecfecd2140 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -16,12 +16,6 @@ @color/dialog_title_icon_tint - - + + \ No newline at end of file diff --git a/app/src/main/res/xml/pref_insight_local_full.xml b/insight/src/main/res/xml/pref_insight_local_full.xml similarity index 100% rename from app/src/main/res/xml/pref_insight_local_full.xml rename to insight/src/main/res/xml/pref_insight_local_full.xml diff --git a/app/src/main/res/xml/pref_insight_local_pumpcontrol.xml b/insight/src/main/res/xml/pref_insight_local_pumpcontrol.xml similarity index 100% rename from app/src/main/res/xml/pref_insight_local_pumpcontrol.xml rename to insight/src/main/res/xml/pref_insight_local_pumpcontrol.xml diff --git a/settings.gradle b/settings.gradle index 57fc55802f..fcdbd94eb0 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,4 @@ +include ':insight' include ':app' include ':wear' include ':database'