cleanup

app/src/main/java/info/nightscout/androidaps/di/AppComponent.kt

@@ -16,12 +16,12 @@ import info.nightscout.androidaps.dependencyInjection.AutotuneModule
 import info.nightscout.androidaps.diaconn.di.DiaconnG8Module
 import info.nightscout.androidaps.insight.di.InsightDatabaseModule
 import info.nightscout.androidaps.insight.di.InsightModule
-import info.nightscout.androidaps.plugin.general.openhumans.dagger.OpenHumansModule
+import info.nightscout.androidaps.plugin.general.openhumans.di.OpenHumansModule
 import info.nightscout.androidaps.plugins.pump.common.di.PumpCommonModule
 import info.nightscout.androidaps.plugins.pump.common.di.RileyLinkModule
 import info.nightscout.androidaps.plugins.pump.medtronic.di.MedtronicModule
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.dagger.OmnipodDashModule
-import info.nightscout.androidaps.plugins.pump.omnipod.eros.dagger.OmnipodErosModule
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.di.OmnipodDashModule
+import info.nightscout.androidaps.plugins.pump.omnipod.eros.di.OmnipodErosModule
 import info.nightscout.shared.di.SharedModule
 import javax.inject.Singleton
 

medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicHistoryDataUTest.kt

@@ -2,34 +2,21 @@ package info.nightscout.androidaps.plugins.pump.medtronic.comm
 
 import android.util.Log
 import info.nightscout.androidaps.TestBase
-import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil
-import org.mockito.Mock
 import info.nightscout.androidaps.plugins.bus.RxBus
-import info.nightscout.androidaps.interfaces.ResourceHelper
-import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
-import info.nightscout.shared.sharedPreferences.SP
-import info.nightscout.shared.logging.AAPSLogger
-import info.nightscout.shared.logging.AAPSLoggerTest
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil
-import info.nightscout.androidaps.plugins.pump.medtronic.driver.MedtronicPumpStatus
-import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil
-import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.MedtronicPumpHistoryDecoder
-import kotlin.Throws
+import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil
 import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.RawHistoryPage
+import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.MedtronicPumpHistoryDecoder
 import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryEntry
 import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryEntryType
 import info.nightscout.androidaps.plugins.pump.medtronic.data.MedtronicHistoryData
 import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.TempBasalProcessDTO
 import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicDeviceType
+import info.nightscout.androidaps.plugins.pump.medtronic.driver.MedtronicPumpStatus
+import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil
 import info.nightscout.androidaps.utils.rx.TestAapsSchedulers
 import info.nightscout.androidaps.utils.serialisation.SealedClassHelper.gson
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.mockito.ArgumentMatchers
-import org.mockito.Mockito
-import org.mockito.MockitoAnnotations
-import java.lang.Exception
 
 //import uk.org.lidalia.slf4jtest.TestLogger;
 //import uk.org.lidalia.slf4jtest.TestLoggerFactory;
@@ -44,50 +31,30 @@ class MedtronicHistoryDataUTest : TestBase() {
     //         "16 00 12 EC 14 47 13 33 00 14 F2 14 47 13 00 16 01 14 F2 14 47 13 33 00 1C C9 15 47 13 00 16 00 1C C9 15 47 13 33 4E 31 D3 15 47 13 00 16 01 31 D3 15 47 13 33 00 1A F1 15 47 13 00 16 00 1A F1 15 47 13 33 50 1D F1 15 47 13 00 16 01 1D F1 15 47 13 33 50 11 D8 16 47 13 00 16 01 11 D8 16 47 13 33 50 31 FB 16 47 13 00 16 01 31 FB 16 47 13 33 50 12 E3 17 47 13 00 16 01 12 E3 17 47 13 33 00 1E FB 17 47 13 00 16 00 1E FB 17 47 13 33 D8 21 FB 17 47 13 00 16 01 21 FB 17 47 13 07 00 00 05 CC 27 93 6D 27 93 05 0C 00 E8 00 00 00 00 05 CC 05 CC 64 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0C 00 E8 00 00 00 33 00 36 C4 00 48 13 00 16 00 36 C4 00 48 13 33 D8 29 C9 00 48 13 00 16 01 29 C9 00 48 13 33 00 12 E7 00 48 13 00 16 00 12 E7 00 48 13 33 BC 19 C9 01 48 13 00 16 01 19 C9 01 48 13 33 00 26 CE 01 48 13 00 16 00 26 CE 01 48 13 33 44 29 CE 01 48 13 00 16 01 29 CE 01 48 13 33 00 13 D3 01 48 13 00 16 00 13 D3 01 48 13 33 64 31 F1 01 48 13 00 16 01 31 F1 01 48 13 33 00 0B F7 01 48 13 00 16 00 0B F7 01 48 13 33 00 12 D8 02 48 13 00 16 01 12 D8 02 48 13 33 00 10 F1 02 48 13 00 16 00 10 F1 02 48 13 33 00 30 C4 03 48 13 00 16 01 30 C4 03 48 13 33 00 04 CA 03 48 13 00 16 00 04 CA 03 48 13 33 00 2F D3 03 48 13 00 16 01 2F D3 03 48 13 33 00 30 D8 03 48 13 00 16 00 30 D8 03 48 13 33 00 13 E7 03 48 13 00 16 01 13 E7 03 48 13 33 00 2E FB 03 48 13 00 16 00 2E FB 03 48 13 19 00 00 C1 04 08 13 07 00 00 04 0C 28 93 6D 28 93 05 0C 00 E8 00 00 00 00 04 0C 04 0C 64 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0C 00 E8 00 00 00 06 3E 03 7A 19 DC 48 49 13 0C 3E 0C E6 08 09 13 07 00 00 01 E4 29 93 6D 29 93 05 0C 00 E8 00 00 00 00 01 E4 01 E4 64 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0C 00 E8 00 00 00 1A 00 13 D2 0D 0A 13 1A 01 28 D2 0D 0A 13 21 00 2A D8 0D 0A 13 03 00 00 00 0E 2D D9 2D 0A 13 33 98 26 DE 0D 4A 13 00 16 01 26 DE 0D 4A 13 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 5D 70"
     //     )
 
-
-
-
     //lateinit var rxBus: RxBus
     lateinit var medtronicHistoryData: MedtronicHistoryData
-    lateinit var medtronicPumpStatus : MedtronicPumpStatus
-
+    lateinit var medtronicPumpStatus: MedtronicPumpStatus
 
     @Before
     fun setup() {
-        MockitoAnnotations.initMocks(this)
-
         rxBus = RxBus(TestAapsSchedulers(), aapsLogger)
 
-        medtronicPumpStatus = MedtronicPumpStatus(
-            rh, sp, rxBus,
-            rileyLinkUtil
+        medtronicPumpStatus = MedtronicPumpStatus(rh, sp, rxBus, rileyLinkUtil)
+        medtronicUtil = MedtronicUtil(aapsLogger, rxBus, rileyLinkUtil, medtronicPumpStatus)
+        decoder = MedtronicPumpHistoryDecoder(aapsLogger, medtronicUtil, byteUtil)
+        medtronicHistoryData = MedtronicHistoryData(
+            packetInjector, aapsLogger, sp, rh, rxBus, activePlugin,
+            medtronicUtil, decoder, medtronicPumpStatus, pumpSync, pumpSyncStorage
         )
 
-        medtronicUtil = MedtronicUtil(
-            aapsLogger, rxBus, rileyLinkUtil,
-            medtronicPumpStatus
-        )
-
-        decoder = MedtronicPumpHistoryDecoder(
-            aapsLogger,
-            medtronicUtil, byteUtil
-        )
-
-        medtronicHistoryData = MedtronicHistoryData(packetInjector, aapsLogger, sp, rh, rxBus, activePlugin,
-                                                        medtronicUtil,   decoder,
-                                                        medtronicPumpStatus,
-                                                        pumpSync,
-                                                        pumpSyncStorage)
-
 
         System.setProperty("org.slf4j.simpleLogger.defaultLogLevel", "trace")
 
     }
 
-
     //@Test
     @Throws(Exception::class) fun testTBR() {
-        var historyPageData = ByteUtil
+        val historyPageData = ByteUtil
             .createByteArrayFromString(
                 "16 00 12 EC 14 47 13 33 00 14 F2 14 47 13 00 16 01 14 F2 14 47 13 33 00 1C C9 15 47 13 00 16 00 1C C9 15 47 13 33 4E 31 D3 15 47 13 00 16 01 31 D3 15 47 13 33 00 1A F1 15 47 13 00 16 00 1A F1 15 47 13 33 50 1D F1 15 47 13 00 16 01 1D F1 15 47 13 33 50 11 D8 16 47 13 00 16 01 11 D8 16 47 13 33 50 31 FB 16 47 13 00 16 01 31 FB 16 47 13 33 50 12 E3 17 47 13 00 16 01 12 E3 17 47 13 33 00 1E FB 17 47 13 00 16 00 1E FB 17 47 13 33 D8 21 FB 17 47 13 00 16 01 21 FB 17 47 13 07 00 00 05 CC 27 93 6D 27 93 05 0C 00 E8 00 00 00 00 05 CC 05 CC 64 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0C 00 E8 00 00 00 33 00 36 C4 00 48 13 00 16 00 36 C4 00 48 13 33 D8 29 C9 00 48 13 00 16 01 29 C9 00 48 13 33 00 12 E7 00 48 13 00 16 00 12 E7 00 48 13 33 BC 19 C9 01 48 13 00 16 01 19 C9 01 48 13 33 00 26 CE 01 48 13 00 16 00 26 CE 01 48 13 33 44 29 CE 01 48 13 00 16 01 29 CE 01 48 13 33 00 13 D3 01 48 13 00 16 00 13 D3 01 48 13 33 64 31 F1 01 48 13 00 16 01 31 F1 01 48 13 33 00 0B F7 01 48 13 00 16 00 0B F7 01 48 13 33 00 12 D8 02 48 13 00 16 01 12 D8 02 48 13 33 00 10 F1 02 48 13 00 16 00 10 F1 02 48 13 33 00 30 C4 03 48 13 00 16 01 30 C4 03 48 13 33 00 04 CA 03 48 13 00 16 00 04 CA 03 48 13 33 00 2F D3 03 48 13 00 16 01 2F D3 03 48 13 33 00 30 D8 03 48 13 00 16 00 30 D8 03 48 13 33 00 13 E7 03 48 13 00 16 01 13 E7 03 48 13 33 00 2E FB 03 48 13 00 16 00 2E FB 03 48 13 19 00 00 C1 04 08 13 07 00 00 04 0C 28 93 6D 28 93 05 0C 00 E8 00 00 00 00 04 0C 04 0C 64 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0C 00 E8 00 00 00 06 3E 03 7A 19 DC 48 49 13 0C 3E 0C E6 08 09 13 07 00 00 01 E4 29 93 6D 29 93 05 0C 00 E8 00 00 00 00 01 E4 01 E4 64 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0C 00 E8 00 00 00 1A 00 13 D2 0D 0A 13 1A 01 28 D2 0D 0A 13 21 00 2A D8 0D 0A 13 03 00 00 00 0E 2D D9 2D 0A 13 33 98 26 DE 0D 4A 13 00 16 01 26 DE 0D 4A 13 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 5D 70"
             )
@@ -141,10 +108,10 @@ class MedtronicHistoryDataUTest : TestBase() {
             .createByteArrayFromString(
                 "33 20 53 78 15 51 16 00 16 01 53 78 15 51 16 33 00 6F 40 16 51 16 00 16 00 6F 40 16 51 16 7B 16 6F 40 16 11 16 2C 1E 00 33 30 71 40 16 51 16 00 16 01 71 40 16 51 16 33 00 6E 45 16 51 16 00 16 00 6E 45 16 51 16 7B 16 6E 45 16 11 16 2C 1E 00 33 3A 70 45 16 51 16 00 16 01 70 45 16 51 16 33 00 71 5E 16 51 16 00 16 00 71 5E 16 51 16 7B 16 71 5E 16 11 16 2C 1E 00 33 40 73 5E 16 51 16 00 16 01 73 5E 16 51 16 33 00 74 6D 16 51 16 00 16 00 74 6D 16 51 16 7B 16 74 6D 16 11 16 2C 1E 00 33 14 76 6D 16 51 16 00 16 01 76 6D 16 51 16 33 00 77 72 16 51 16 00 16 00 77 72 16 51 16 7B 16 77 72 16 11 16 2C 1E 00 7B 17 40 40 17 11 16 2E 1E 00 33 28 51 41 17 51 16 00 16 01 51 41 17 51 16 33 00 56 46 17 51 16 00 16 00 56 46 17 51 16 7B 17 56 46 17 11 16 2E 1E 00 33 34 59 46 17 51 16 00 16 01 59 46 17 51 16 33 00 70 4A 17 51 16 00 16 00 70 4A 17 51 16 7B 17 70 4A 17 11 16 2E 1E 00 33 58 72 4A 17 51 16 00 16 01 72 4A 17 51 16 33 00 6E 59 17 51 16 00 16 00 6E 59 17 51 16 7B 17 6E 59 17 11 16 2E 1E 00 33 18 70 59 17 51 16 00 16 01 70 59 17 51 16 33 00 70 5E 17 51 16 00 16 00 70 5E 17 51 16 7B 17 70 5E 17 11 16 2E 1E 00 33 0C 72 5E 17 51 16 00 16 01 72 5E 17 51 16 33 00 72 63 17 51 16 00 16 00 72 63 17 51 16 7B 17 72 63 17 11 16 2E 1E 00 33 1C 70 72 17 51 16 00 16 01 70 72 17 51 16 33 00 51 78 17 51 16 00 16 00 51 78 17 51 16 7B 17 52 78 17 11 16 2E 1E 00 33 12 54 78 17 51 16 00 16 01 54 78 17 51 16 07 00 00 04 4E 51 96 00 00 00 6E 51 96 05 00 00 00 00 00 00 00 04 4E 03 A2 54 00 AC 10 00 00 00 00 00 00 00 00 00 AC 00 00 00 24 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 33 00 46 46 00 52 16 00 16 00 46 46 00 52 16 7B 00 47 46 00 12 16 00 1E 00 33 20 47 64 00 52 16 00 16 01 47 64 00 52 16 33 00 6D 77 00 52 16 00 16 00 6D 77 00 52 16 7B 00 6D 77 00 12 16 00 1E 00 33 12 70 77 00 52 16 00 16 01 70 77 00 52 16 33 00 58 78 00 52 16 00 16 00 58 78 00 52 16 7B 00 59 78 00 12 16 00 1E 00 33 00 5C 78 00 52 16 00 16 02 5C 78 00 52 16 21 00 66 79 00 12 16 03 00 00 00 9C 74 42 21 12 16 03 00 03 00 03 6E 4D 01 12 16 33 00 79 4E 01 52 16 00 16 00 79 4E 01 52 16 7B 01 79 4E 01 12 16 02 1E 00 33 2A 6B 4F 01 52 16 00 16 01 6B 4F 01 52 16 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 2E D1"
                 //"33 20 53 78 15 51 16 00 16 01 53 78 15 51 16 33 00 6F 40 16 51 16 00 16 00 6F 40 16 51 16 7B 16 6F 40 16 11 16 2C 1E 00 33 30 71 40 16 51 16 00 16 01 71 40 16 51 16 33 00 6E 45
-            // 16 51 16 00 16 00 6E 45 16 51 16 7B 16 6E 45 16 11 16 2C 1E 00 33 3A 70 45 16 51 16 00 16 01 70 45 16 51 16 33 00 71 5E 16 51 16 00 16 00 71 5E 16 51 16 7B 16 71 5E 16 11 16 2C 1E 00 33 40 73 5E 16 51 16 00 16 01 73 5E 16 51 16 33 00 74 6D 16 51 16 00 16 00 74 6D 16 51 16 7B 16 74 6D 16 11 16 2C 1E 00 33 14 76 6D 16 51 16 00 16 01 76 6D 16 51 16 33 00 77 72 16 51 16 00 16 00 77 72 16 51 16 7B 16 77 72 16 11 16 2C 1E 00 7B 17 40 40 17 11 16 2E 1E 00 33 28 51 41 17 51 16 00 16 01 51 41 17 51 16 33 00 56 46 17 51 16 00 16 00 56 46 17 51 16 7B 17 56 46 17 11 16 2E 1E 00 33 34 59 46 17 51 16 00 16 01 59 46 17 51 16 33 00 70 4A 17 51 16 00 16 00 70 4A 17 51 16 7B 17 70 4A 17 11 16 2E 1E 00 33 58 72 4A 17 51 16 00 16 01 72 4A 17 51 16 33 00 6E 59 17 51 16 00 16 00 6E 59 17 51 16 7B 17 6E 59 17 11 16 2E 1E 00 33 18 70 59 17 51 16 00 16 01 70 59 17 51 16 33 00 70 5E 17 51 16 00 16 00 70 5E 17 51 16 7B 17 70 5E 17 11 16 2E 1E 00 33 0C 72 5E 17 51 16 00 16 01 72 5E 17 51 16 33 00 72 63 17 51 16 00 16 00 72 63 17 51 16 7B 17 72 63 17 11 16 2E 1E 00 33 1C 70 72 17 51 16 00 16 01 70 72 17 51 16 33 00 51 78 17 51 16 00 16 00 51 78 17 51 16 7B 17 52 78 17 11 16 2E 1E 00 33 12 54 78 17 51 16 00 16 01 54 78 17 51 16 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 4D 6D"
+                // 16 51 16 00 16 00 6E 45 16 51 16 7B 16 6E 45 16 11 16 2C 1E 00 33 3A 70 45 16 51 16 00 16 01 70 45 16 51 16 33 00 71 5E 16 51 16 00 16 00 71 5E 16 51 16 7B 16 71 5E 16 11 16 2C 1E 00 33 40 73 5E 16 51 16 00 16 01 73 5E 16 51 16 33 00 74 6D 16 51 16 00 16 00 74 6D 16 51 16 7B 16 74 6D 16 11 16 2C 1E 00 33 14 76 6D 16 51 16 00 16 01 76 6D 16 51 16 33 00 77 72 16 51 16 00 16 00 77 72 16 51 16 7B 16 77 72 16 11 16 2C 1E 00 7B 17 40 40 17 11 16 2E 1E 00 33 28 51 41 17 51 16 00 16 01 51 41 17 51 16 33 00 56 46 17 51 16 00 16 00 56 46 17 51 16 7B 17 56 46 17 11 16 2E 1E 00 33 34 59 46 17 51 16 00 16 01 59 46 17 51 16 33 00 70 4A 17 51 16 00 16 00 70 4A 17 51 16 7B 17 70 4A 17 11 16 2E 1E 00 33 58 72 4A 17 51 16 00 16 01 72 4A 17 51 16 33 00 6E 59 17 51 16 00 16 00 6E 59 17 51 16 7B 17 6E 59 17 11 16 2E 1E 00 33 18 70 59 17 51 16 00 16 01 70 59 17 51 16 33 00 70 5E 17 51 16 00 16 00 70 5E 17 51 16 7B 17 70 5E 17 11 16 2E 1E 00 33 0C 72 5E 17 51 16 00 16 01 72 5E 17 51 16 33 00 72 63 17 51 16 00 16 00 72 63 17 51 16 7B 17 72 63 17 11 16 2E 1E 00 33 1C 70 72 17 51 16 00 16 01 70 72 17 51 16 33 00 51 78 17 51 16 00 16 00 51 78 17 51 16 7B 17 52 78 17 11 16 2E 1E 00 33 12 54 78 17 51 16 00 16 01 54 78 17 51 16 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 4D 6D"
             )
 
-        medtronicUtil.medtronicPumpModel =MedtronicDeviceType.Medtronic_723_Revel
+        medtronicUtil.medtronicPumpModel = MedtronicDeviceType.Medtronic_723_Revel
         medtronicUtil.isModelSet = true
 
         val historyPage = RawHistoryPage(aapsLogger)
@@ -152,7 +119,7 @@ class MedtronicHistoryDataUTest : TestBase() {
         val pumpHistoryEntries: MutableList<PumpHistoryEntry> = decoder.processPageAndCreateRecords(historyPage)
         println("PumpHistoryEntries: " + pumpHistoryEntries.size)
 
-        val rewindRecords: MutableList<PumpHistoryEntry> =  medtronicHistoryData.getFilteredItems(pumpHistoryEntries, PumpHistoryEntryType.Rewind)
+        val rewindRecords: MutableList<PumpHistoryEntry> = medtronicHistoryData.getFilteredItems(pumpHistoryEntries, PumpHistoryEntryType.Rewind)
 
         preProcessListTBR(pumpHistoryEntries)
 
@@ -172,7 +139,7 @@ class MedtronicHistoryDataUTest : TestBase() {
 
         println("PumpHistoryEntries: getFilteredItems: " + tbrs.size)
 
-        println("PumpHistoryEntries: getRewindItems: $rewindRecords.size : " + gson.toJson(rewindRecords) )
+        println("PumpHistoryEntries: getRewindItems: $rewindRecords.size : " + gson.toJson(rewindRecords))
 
         val processList: MutableList<TempBasalProcessDTO> = medtronicHistoryData.createTBRProcessList(tbrs, rewindRecords)
 

medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoderUTest.kt

@@ -2,19 +2,14 @@ package info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump
 
 //import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.TestBase
-import info.nightscout.androidaps.plugins.bus.RxBus
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil
 import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil
 import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.RawHistoryPage
 import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicDeviceType
 import info.nightscout.androidaps.plugins.pump.medtronic.driver.MedtronicPumpStatus
 import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil
-import info.nightscout.androidaps.utils.rx.TestAapsSchedulers
 import org.junit.Assert
 import org.junit.Before
-import org.junit.Ignore
 import org.junit.Test
-import org.mockito.Mock
 
 /**
  * Created by andy on 11/1/18.
@@ -28,17 +23,17 @@ class MedtronicPumpHistoryDecoderUTest : TestBase() {
     //@Mock lateinit var rileyLinkUtil: RileyLinkUtil
     //@Mock lateinit var sp: SP
 
-    private var medtronicPumpStatus: MedtronicPumpStatus? = null
+    private lateinit var medtronicPumpStatus: MedtronicPumpStatus
+
     //private var medtronicUtil: MedtronicUtil? = null
     //private var decoder: MedtronicPumpHistoryDecoder? = null
-    var rxBusWrapper = RxBus(TestAapsSchedulers(), aapsLogger)
 
     @Before fun setup() {
         medtronicPumpStatus =
-            MedtronicPumpStatus(rh, sp, rxBusWrapper, rileyLinkUtil)
+            MedtronicPumpStatus(rh, sp, rxBus, rileyLinkUtil)
         medtronicUtil =
-            MedtronicUtil(aapsLogger, rxBusWrapper, rileyLinkUtil, medtronicPumpStatus!!)
-        decoder = MedtronicPumpHistoryDecoder(aapsLogger, medtronicUtil!!, ByteUtil())
+            MedtronicUtil(aapsLogger, rxBus, rileyLinkUtil, medtronicPumpStatus)
+        decoder = MedtronicPumpHistoryDecoder(aapsLogger, medtronicUtil, ByteUtil())
     }
 
     /*
@@ -191,12 +186,11 @@ class MedtronicPumpHistoryDecoderUTest : TestBase() {
     ): List<PumpHistoryEntry> {
         val historyPageData = ByteUtil.createByteArrayFromString(historyPageString)
         aapsLogger.debug("History Page Length:" + historyPageData.size)
-        medtronicUtil!!.medtronicPumpModel = medtronicDeviceType
-        medtronicUtil!!.isModelSet = true
+        medtronicUtil.medtronicPumpModel = medtronicDeviceType
+        medtronicUtil.isModelSet = true
         val historyPage = RawHistoryPage(aapsLogger)
         historyPage.appendData(historyPageData)
-        val pumpHistoryEntries: List<PumpHistoryEntry> =
-            decoder!!.processPageAndCreateRecords(historyPage)
+        val pumpHistoryEntries: List<PumpHistoryEntry> = decoder.processPageAndCreateRecords(historyPage)
         displayHistoryRecords(pumpHistoryEntries)
         return pumpHistoryEntries
     }

medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryDataUTest.kt

@@ -1,70 +1,37 @@
 package info.nightscout.androidaps.plugins.pump.medtronic.data
 
-import java.lang.reflect.Type
-import com.google.gson.reflect.TypeToken
 import com.google.gson.Gson
 import com.google.gson.internal.LinkedTreeMap
-// import dagger.android.AndroidInjector
-// import dagger.android.HasAndroidInjector
+import com.google.gson.reflect.TypeToken
 import info.nightscout.androidaps.TestBase
-import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.androidaps.interfaces.PumpSync
-import info.nightscout.androidaps.plugins.bus.RxBus
-import info.nightscout.androidaps.plugins.pump.common.sync.PumpSyncStorage
 import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.MedtronicPumpHistoryDecoder
 import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryEntry
 import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.TempBasalPair
 import info.nightscout.androidaps.plugins.pump.medtronic.driver.MedtronicPumpStatus
 import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil
-import info.nightscout.androidaps.interfaces.ResourceHelper
-import info.nightscout.shared.sharedPreferences.SP
 import org.junit.Before
-import org.junit.Ignore
-
 import org.junit.Test
 import org.mockito.Mock
+import java.lang.reflect.Type
 
-@Suppress("UNCHECKED_CAST") 
+@Suppress("UNCHECKED_CAST")
 class MedtronicHistoryDataUTest : TestBase() {
 
-    //@Mock lateinit var activePlugin: ActivePlugin
-    //@Mock lateinit var medtronicUtil: MedtronicUtil
-    //@Mock lateinit var medtronicPumpHistoryDecoder: MedtronicPumpHistoryDecoder
     @Mock lateinit var medtronicPumpStatus: MedtronicPumpStatus
-    // @Mock lateinit var pumpSync: PumpSync
-    // @Mock lateinit var pumpSyncStorage: PumpSyncStorage
-
-    //@Mock lateinit var rxBus: RxBus
-
-    // val packetInjector = HasAndroidInjector {
-    //     AndroidInjector {
-    //
-    //     }
-    // }
 
     @Before
     fun setUp() {
-        medtronicUtil = MedtronicUtil(
-            aapsLogger, rxBus, rileyLinkUtil,
-            medtronicPumpStatus
-        )
-
-        decoder = MedtronicPumpHistoryDecoder(
-            aapsLogger,
-            medtronicUtil, byteUtil
-        )
+        medtronicUtil = MedtronicUtil(aapsLogger, rxBus, rileyLinkUtil, medtronicPumpStatus)
+        decoder = MedtronicPumpHistoryDecoder(aapsLogger, medtronicUtil, byteUtil)
     }
 
-
-
     @Test
     fun createTBRProcessList() {
 
-        var unitToTest = MedtronicHistoryData(packetInjector, aapsLogger, sp, rh, rxBus, activePlugin,
-        medtronicUtil,   decoder,
-        medtronicPumpStatus,
-        pumpSync,
-        pumpSyncStorage)
+        val unitToTest = MedtronicHistoryData(
+            packetInjector, aapsLogger, sp, rh, rxBus, activePlugin,
+            medtronicUtil, decoder, medtronicPumpStatus, pumpSync, pumpSyncStorage
+        )
 
         val gson = Gson()
 
@@ -74,26 +41,26 @@ class MedtronicHistoryDataUTest : TestBase() {
         val yourClassList: MutableList<PumpHistoryEntry> = gson.fromJson(fileText, listType)
 
         for (pumpHistoryEntry in yourClassList) {
-            val stringObject = pumpHistoryEntry.decodedData["Object"] as LinkedTreeMap<String,Object>
+            val stringObject = pumpHistoryEntry.decodedData["Object"] as LinkedTreeMap<String, Any>
 
-            val rate : Double = stringObject.get("insulinRate") as Double
-            val durationMinutes: Double = stringObject.get("durationMinutes") as Double
-            val durationMinutesInt : Int = durationMinutes.toInt()
+            val rate: Double = stringObject["insulinRate"] as Double
+            val durationMinutes: Double = stringObject["durationMinutes"] as Double
+            val durationMinutesInt: Int = durationMinutes.toInt()
 
-            var  tmbPair = TempBasalPair(rate, false, durationMinutesInt)
+            val tmbPair = TempBasalPair(rate, false, durationMinutesInt)
 
             pumpHistoryEntry.decodedData.remove("Object")
             pumpHistoryEntry.addDecodedData("Object", tmbPair)
         }
 
-        System.out.println("TBR Pre-Process List: " + gson.toJson(yourClassList))
+        println("TBR Pre-Process List: " + gson.toJson(yourClassList))
 
         val createTBRProcessList = unitToTest.createTBRProcessList(yourClassList, mutableListOf())
 
-        System.out.println("TBR Process List: " + createTBRProcessList.size)
+        println("TBR Process List: " + createTBRProcessList.size)
 
         for (tempBasalProcessDTO in createTBRProcessList) {
-            System.out.println(tempBasalProcessDTO.toTreatmentString())
+            println(tempBasalProcessDTO.toTreatmentString())
         }
 
     }
@@ -101,11 +68,13 @@ class MedtronicHistoryDataUTest : TestBase() {
     @Test
     fun createTBRProcessList_SpecialCase() {
 
-        var unitToTest = MedtronicHistoryData(packetInjector, aapsLogger, sp, rh, rxBus, activePlugin,
-                                              medtronicUtil,   decoder,
-                                              medtronicPumpStatus,
-                                              pumpSync,
-                                              pumpSyncStorage)
+        val unitToTest = MedtronicHistoryData(
+            packetInjector, aapsLogger, sp, rh, rxBus, activePlugin,
+            medtronicUtil, decoder,
+            medtronicPumpStatus,
+            pumpSync,
+            pumpSyncStorage
+        )
 
         val gson = Gson()
 
@@ -115,26 +84,26 @@ class MedtronicHistoryDataUTest : TestBase() {
         val yourClassList: MutableList<PumpHistoryEntry> = gson.fromJson(fileText, listType)
 
         for (pumpHistoryEntry in yourClassList) {
-            val stringObject = pumpHistoryEntry.decodedData["Object"] as LinkedTreeMap<String,Object>
+            val stringObject = pumpHistoryEntry.decodedData["Object"] as LinkedTreeMap<String, Any>
 
-            val rate : Double = stringObject.get("insulinRate") as Double
-            val durationMinutes: Double = stringObject.get("durationMinutes") as Double
-            val durationMinutesInt : Int = durationMinutes.toInt()
+            val rate: Double = stringObject["insulinRate"] as Double
+            val durationMinutes: Double = stringObject["durationMinutes"] as Double
+            val durationMinutesInt: Int = durationMinutes.toInt()
 
-            var  tmbPair = TempBasalPair(rate, false, durationMinutesInt)
+            val tmbPair = TempBasalPair(rate, false, durationMinutesInt)
 
             pumpHistoryEntry.decodedData.remove("Object")
             pumpHistoryEntry.addDecodedData("Object", tmbPair)
         }
 
-        System.out.println("TBR Pre-Process List (Special): " + gson.toJson(yourClassList))
+        println("TBR Pre-Process List (Special): " + gson.toJson(yourClassList))
 
         val createTBRProcessList = unitToTest.createTBRProcessList(yourClassList, mutableListOf())
 
-        System.out.println("TBR Process List (Special): " + createTBRProcessList.size)
+        println("TBR Process List (Special): " + createTBRProcessList.size)
 
         for (tempBasalProcessDTO in createTBRProcessList) {
-            System.out.println(tempBasalProcessDTO.toTreatmentString())
+            println(tempBasalProcessDTO.toTreatmentString())
         }
 
     }

omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/di/OmnipodInjectHelpers.kt

@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.common.dagger
+package info.nightscout.androidaps.plugins.pump.omnipod.common.di
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider

omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/di/OmnipodWizardModule.kt

@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.common.dagger
+package info.nightscout.androidaps.plugins.pump.omnipod.common.di
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider

omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/fragment/action/InitializePodFragment.kt

@@ -5,7 +5,7 @@ import androidx.annotation.IdRes
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.ViewModelProvider
 import info.nightscout.androidaps.plugins.pump.omnipod.common.R
-import info.nightscout.androidaps.plugins.pump.omnipod.common.dagger.OmnipodPluginQualifier
+import info.nightscout.androidaps.plugins.pump.omnipod.common.di.OmnipodPluginQualifier
 import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.action.InitializePodViewModel
 import javax.inject.Inject
 

omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/fragment/action/InsertCannulaFragment.kt

@@ -5,7 +5,7 @@ import androidx.annotation.IdRes
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.ViewModelProvider
 import info.nightscout.androidaps.plugins.pump.omnipod.common.R
-import info.nightscout.androidaps.plugins.pump.omnipod.common.dagger.OmnipodPluginQualifier
+import info.nightscout.androidaps.plugins.pump.omnipod.common.di.OmnipodPluginQualifier
 import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.action.InsertCannulaViewModel
 import javax.inject.Inject
 

omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/fragment/info/AttachPodFragment.kt

@@ -9,7 +9,7 @@ import androidx.fragment.app.viewModels
 import androidx.lifecycle.ViewModelProvider
 import androidx.navigation.fragment.findNavController
 import info.nightscout.androidaps.plugins.pump.omnipod.common.R
-import info.nightscout.androidaps.plugins.pump.omnipod.common.dagger.OmnipodPluginQualifier
+import info.nightscout.androidaps.plugins.pump.omnipod.common.di.OmnipodPluginQualifier
 import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.info.AttachPodViewModel
 import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.common.fragment.InfoFragmentBase
 import javax.inject.Inject

omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/fragment/info/PodActivatedFragment.kt

@@ -4,7 +4,7 @@ import android.os.Bundle
 import androidx.annotation.IdRes
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.ViewModelProvider
-import info.nightscout.androidaps.plugins.pump.omnipod.common.dagger.OmnipodPluginQualifier
+import info.nightscout.androidaps.plugins.pump.omnipod.common.di.OmnipodPluginQualifier
 import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.info.PodActivatedViewModel
 import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.common.fragment.InfoFragmentBase
 import javax.inject.Inject

omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/fragment/info/StartPodActivationFragment.kt

@@ -5,7 +5,7 @@ import androidx.annotation.IdRes
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.ViewModelProvider
 import info.nightscout.androidaps.plugins.pump.omnipod.common.R
-import info.nightscout.androidaps.plugins.pump.omnipod.common.dagger.OmnipodPluginQualifier
+import info.nightscout.androidaps.plugins.pump.omnipod.common.di.OmnipodPluginQualifier
 import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.info.StartPodActivationViewModel
 import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.common.fragment.InfoFragmentBase
 import javax.inject.Inject

omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/fragment/action/DeactivatePodFragment.kt

@@ -9,7 +9,7 @@ import androidx.fragment.app.viewModels
 import androidx.lifecycle.ViewModelProvider
 import androidx.navigation.fragment.findNavController
 import info.nightscout.androidaps.plugins.pump.omnipod.common.R
-import info.nightscout.androidaps.plugins.pump.omnipod.common.dagger.OmnipodPluginQualifier
+import info.nightscout.androidaps.plugins.pump.omnipod.common.di.OmnipodPluginQualifier
 import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.common.fragment.ActionFragmentBase
 import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.deactivation.viewmodel.action.DeactivatePodViewModel
 import javax.inject.Inject

omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/fragment/info/PodDeactivatedFragment.kt

@@ -4,7 +4,7 @@ import android.os.Bundle
 import androidx.annotation.IdRes
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.ViewModelProvider
-import info.nightscout.androidaps.plugins.pump.omnipod.common.dagger.OmnipodPluginQualifier
+import info.nightscout.androidaps.plugins.pump.omnipod.common.di.OmnipodPluginQualifier
 import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.common.fragment.InfoFragmentBase
 import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.deactivation.viewmodel.info.PodDeactivatedViewModel
 import javax.inject.Inject

omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/fragment/info/PodDiscardedFragment.kt

@@ -4,7 +4,7 @@ import android.os.Bundle
 import androidx.annotation.IdRes
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.ViewModelProvider
-import info.nightscout.androidaps.plugins.pump.omnipod.common.dagger.OmnipodPluginQualifier
+import info.nightscout.androidaps.plugins.pump.omnipod.common.di.OmnipodPluginQualifier
 import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.common.fragment.InfoFragmentBase
 import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.deactivation.viewmodel.info.PodDiscardedViewModel
 import javax.inject.Inject

omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/fragment/info/StartPodDeactivationFragment.kt

@@ -5,7 +5,7 @@ import androidx.annotation.IdRes
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.ViewModelProvider
 import info.nightscout.androidaps.plugins.pump.omnipod.common.R
-import info.nightscout.androidaps.plugins.pump.omnipod.common.dagger.OmnipodPluginQualifier
+import info.nightscout.androidaps.plugins.pump.omnipod.common.di.OmnipodPluginQualifier
 import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.common.fragment.InfoFragmentBase
 import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.deactivation.viewmodel.info.StartPodDeactivationViewModel
 import javax.inject.Inject

omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/di/OmnipodDashHistoryModule.kt

@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.dagger
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.di
 
 import android.content.Context
 import dagger.Module

omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/di/OmnipodDashModule.kt

@@ -1,10 +1,10 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.dagger
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.di
 
 import dagger.Binds
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
-import info.nightscout.androidaps.plugins.pump.omnipod.common.dagger.ActivityScope
-import info.nightscout.androidaps.plugins.pump.omnipod.common.dagger.OmnipodWizardModule
+import info.nightscout.androidaps.plugins.pump.omnipod.common.di.ActivityScope
+import info.nightscout.androidaps.plugins.pump.omnipod.common.di.OmnipodWizardModule
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.OmnipodDashManager
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.OmnipodDashManagerImpl
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.OmnipodDashBleManager

omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/di/OmnipodDashWizardViewModelsModule.kt

@@ -1,11 +1,11 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.dagger
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.di
 
 import androidx.lifecycle.ViewModel
 import dagger.Binds
 import dagger.Module
 import dagger.multibindings.IntoMap
-import info.nightscout.androidaps.plugins.pump.omnipod.common.dagger.OmnipodPluginQualifier
-import info.nightscout.androidaps.plugins.pump.omnipod.common.dagger.ViewModelKey
+import info.nightscout.androidaps.plugins.pump.omnipod.common.di.OmnipodPluginQualifier
+import info.nightscout.androidaps.plugins.pump.omnipod.common.di.ViewModelKey
 import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.action.InitializePodViewModel
 import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.action.InsertCannulaViewModel
 import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.info.AttachPodViewModel

omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/di/OmnipodErosHistoryModule.kt

@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.eros.dagger
+package info.nightscout.androidaps.plugins.pump.omnipod.eros.di
 
 import android.content.Context
 import dagger.Module

omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/di/OmnipodErosModule.kt

@@ -1,10 +1,10 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.eros.dagger
+package info.nightscout.androidaps.plugins.pump.omnipod.eros.di
 
 import dagger.Module
 import dagger.Provides
 import dagger.android.ContributesAndroidInjector
-import info.nightscout.androidaps.plugins.pump.omnipod.common.dagger.ActivityScope
-import info.nightscout.androidaps.plugins.pump.omnipod.common.dagger.OmnipodWizardModule
+import info.nightscout.androidaps.plugins.pump.omnipod.common.di.ActivityScope
+import info.nightscout.androidaps.plugins.pump.omnipod.common.di.OmnipodWizardModule
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.data.RLHistoryItemOmnipod
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.ErosPodStateManager
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsErosPodStateManager

omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/di/OmnipodErosWizardViewModelsModule.kt

@@ -1,11 +1,11 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.eros.dagger
+package info.nightscout.androidaps.plugins.pump.omnipod.eros.di
 
 import androidx.lifecycle.ViewModel
 import dagger.Binds
 import dagger.Module
 import dagger.multibindings.IntoMap
-import info.nightscout.androidaps.plugins.pump.omnipod.common.dagger.OmnipodPluginQualifier
-import info.nightscout.androidaps.plugins.pump.omnipod.common.dagger.ViewModelKey
+import info.nightscout.androidaps.plugins.pump.omnipod.common.di.OmnipodPluginQualifier
+import info.nightscout.androidaps.plugins.pump.omnipod.common.di.ViewModelKey
 import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.action.InitializePodViewModel
 import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.action.InsertCannulaViewModel
 import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.info.AttachPodViewModel

omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/OmnipodErosOverviewFragment.kt

@@ -1,7 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.eros.ui
 
 import android.content.Intent
-import android.graphics.Color
 import android.os.Bundle
 import android.os.Handler
 import android.os.HandlerThread
@@ -15,6 +14,7 @@ import info.nightscout.androidaps.activities.ErrorHelperActivity
 import info.nightscout.androidaps.events.EventPreferenceChange
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.CommandQueue
+import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
@@ -48,10 +48,9 @@ import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.protection.ProtectionCheck
-import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
-import info.nightscout.shared.sharedPreferences.SP
 import info.nightscout.androidaps.utils.ui.UIRunnable
+import info.nightscout.shared.sharedPreferences.SP
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import org.apache.commons.lang3.StringUtils
@@ -59,7 +58,6 @@ import org.joda.time.DateTime
 import org.joda.time.Duration
 import java.util.*
 import javax.inject.Inject
-import kotlin.collections.ArrayList
 
 class OmnipodErosOverviewFragment : DaggerFragment() {
     companion object {
@@ -96,17 +94,17 @@ class OmnipodErosOverviewFragment : DaggerFragment() {
         }
     }
 
-    var _binding: OmnipodErosOverviewBinding? = null
-    var _rileyLinkStatusBinding: OmnipodErosOverviewRileyLinkStatusBinding? = null
-    var _podInfoBinding: OmnipodCommonOverviewPodInfoBinding? = null
-    var _buttonBinding: OmnipodCommonOverviewButtonsBinding? = null
+    private var _binding: OmnipodErosOverviewBinding? = null
+    private var _rileyLinkStatusBinding: OmnipodErosOverviewRileyLinkStatusBinding? = null
+    private var _podInfoBinding: OmnipodCommonOverviewPodInfoBinding? = null
+    private var _buttonBinding: OmnipodCommonOverviewButtonsBinding? = null
 
     // These properties are only valid between onCreateView and
     // onDestroyView.
-    val binding get() = _binding!!
-    val rileyLinkStatusBinding get() = _rileyLinkStatusBinding!!
-    val podInfoBinding get() = _podInfoBinding!!
-    val buttonBinding get() = _buttonBinding!!
+    private val binding get() = _binding!!
+    private val rileyLinkStatusBinding get() = _rileyLinkStatusBinding!!
+    private val podInfoBinding get() = _podInfoBinding!!
+    private val buttonBinding get() = _buttonBinding!!
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View =
         OmnipodErosOverviewBinding.inflate(inflater, container, false).also {
@@ -256,9 +254,9 @@ class OmnipodErosOverviewFragment : DaggerFragment() {
 
         val errors = ArrayList<String>()
         if (omnipodErosPumpPlugin.rileyLinkService != null) {
-            val rileyLinkErrorDescription = omnipodErosPumpPlugin.rileyLinkService.errorDescription
+            val rileyLinkErrorDescription = omnipodErosPumpPlugin.rileyLinkService?.errorDescription
             if (StringUtils.isNotEmpty(rileyLinkErrorDescription)) {
-                errors.add(rileyLinkErrorDescription)
+                errors.add(rileyLinkErrorDescription!!)
             }
         }
 

openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/OpenHumansAPI.kt

@@ -2,10 +2,10 @@ package info.nightscout.androidaps.plugin.general.openhumans
 
 import android.annotation.SuppressLint
 import android.util.Base64
-import info.nightscout.androidaps.plugin.general.openhumans.dagger.BaseUrl
-import info.nightscout.androidaps.plugin.general.openhumans.dagger.ClientId
-import info.nightscout.androidaps.plugin.general.openhumans.dagger.ClientSecret
-import info.nightscout.androidaps.plugin.general.openhumans.dagger.RedirectUrl
+import info.nightscout.androidaps.plugin.general.openhumans.di.BaseUrl
+import info.nightscout.androidaps.plugin.general.openhumans.di.ClientId
+import info.nightscout.androidaps.plugin.general.openhumans.di.ClientSecret
+import info.nightscout.androidaps.plugin.general.openhumans.di.RedirectUrl
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.suspendCancellableCoroutine
 import okhttp3.*

openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/di/Helpers.kt

@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugin.general.openhumans.dagger
+package info.nightscout.androidaps.plugin.general.openhumans.di
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider

openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/di/OpenHumansModule.kt

@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugin.general.openhumans.dagger
+package info.nightscout.androidaps.plugin.general.openhumans.di
 
 import androidx.lifecycle.ViewModel
 import dagger.Binds

openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/ui/OHLoginActivity.kt

@@ -17,8 +17,8 @@ import com.google.android.material.appbar.MaterialToolbar
 import com.google.android.material.button.MaterialButton
 import dagger.android.support.DaggerAppCompatActivity
 import info.nightscout.androidaps.plugin.general.openhumans.R
-import info.nightscout.androidaps.plugin.general.openhumans.dagger.AuthUrl
-import info.nightscout.androidaps.plugin.general.openhumans.dagger.ViewModelFactory
+import info.nightscout.androidaps.plugin.general.openhumans.di.AuthUrl
+import info.nightscout.androidaps.plugin.general.openhumans.di.ViewModelFactory
 import javax.inject.Inject
 
 class OHLoginActivity : DaggerAppCompatActivity() {