Revert "Prepare Omnipod for upstream merge"

This reverts commit 7c82dbdf93.

.github/workflows/gradle-ci-workflow.yaml

@@ -0,0 +1,33 @@
+name: Gradle CI
+
+on:
+  - push
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Create NDK path
+        run: sudo mkdir -p /usr/local/lib/android/sdk/ndk && sudo chmod 777 /usr/local/lib/android/sdk/ndk
+      - name: Cache NDKs
+        id: cache-ndk
+        uses: actions/cache@v2
+        with:
+          path: /usr/local/lib/android/sdk/ndk
+          key: ${{ runner.os }}-ndk-21.0.6113669-21.1.6352462
+      - name: Install NDK 21.0.6113669
+        run: echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.0.6113669" --sdk_root=${ANDROID_SDK_ROOT}
+      - name: Install NDK 21.1.6352462
+        run: echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.1.6352462" --sdk_root=${ANDROID_SDK_ROOT}
+      - uses: eskatos/gradle-command-action@v1
+        with:
+          arguments: assembleFullDebug
+          wrapper-cache-enabled: true
+          dependencies-cache-enabled: true
+          configuration-cache-enabled: true

app/build.gradle

@@ -126,7 +126,7 @@ android {
         targetSdkVersion 28
         multiDexEnabled true
         versionCode 1500
-        version "2.7.0-rc5"
+        version "2.7-omnipod-0.4.1-SNAPSHOT"
         buildConfigField "String", "VERSION", '"' + version + '"'
         buildConfigField "String", "BUILDVERSION", '"' + generateGitBuild() + '-' + generateDate() + '"'
         buildConfigField "String", "REMOTE", '"' + generateGitRemote() + '"'
@@ -245,6 +245,7 @@ dependencies {
     implementation project(':danar')
     implementation project(':rileylink')
     implementation project(':medtronic')
+    implementation project(':omnipod')
 
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'com.google.android.gms:play-services-wearable:17.0.0'

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

@@ -28,6 +28,7 @@ import javax.inject.Singleton
         WizardModule::class,
         RileyLinkModule::class,
         MedtronicModule::class,
+        OmnipodModule::class,
         APSModule::class,
         PreferencesModule::class,
         OverviewModule::class,

app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt

@@ -34,6 +34,7 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyL
 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.ui.OmnipodFragment
 import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpFragment
 import info.nightscout.androidaps.plugins.source.BGSourceFragment
 import info.nightscout.androidaps.plugins.treatments.TreatmentsFragment
@@ -65,6 +66,7 @@ abstract class FragmentsModule {
     @ContributesAndroidInjector abstract fun contributesLoopFragment(): LoopFragment
     @ContributesAndroidInjector abstract fun contributesMaintenanceFragment(): MaintenanceFragment
     @ContributesAndroidInjector abstract fun contributesMedtronicFragment(): MedtronicFragment
+    @ContributesAndroidInjector abstract fun contributesOmnipodFragment(): OmnipodFragment
     @ContributesAndroidInjector abstract fun contributesNSProfileFragment(): NSProfileFragment
     @ContributesAndroidInjector abstract fun contributesNSClientFragment(): NSClientFragment
     @ContributesAndroidInjector abstract fun contributesSmsCommunicatorFragment(): SmsCommunicatorFragment

app/src/main/java/info/nightscout/androidaps/dependencyInjection/OmnipodModule.kt

@@ -0,0 +1,48 @@
+package info.nightscout.androidaps.dependencyInjection
+
+import dagger.Module
+import dagger.Provides
+import dagger.android.ContributesAndroidInjector
+import info.nightscout.androidaps.plugins.pump.omnipod.OmnipodPumpPlugin
+import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.PodStateManager
+import info.nightscout.androidaps.plugins.pump.omnipod.manager.AapsOmnipodManager
+import info.nightscout.androidaps.plugins.pump.omnipod.manager.AapsPodStateManager
+import info.nightscout.androidaps.plugins.pump.omnipod.rileylink.manager.OmnipodRileyLinkCommunicationManager
+import info.nightscout.androidaps.plugins.pump.omnipod.ui.PodHistoryActivity
+import info.nightscout.androidaps.plugins.pump.omnipod.ui.PodManagementActivity
+import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.initpod.InitActionFragment
+import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.initpod.InitPodTask
+import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.pages.InitPodRefreshAction
+import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.pages.PodInfoFragment
+import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.removepod.RemoveActionFragment
+
+@Module
+@Suppress("unused")
+abstract class OmnipodModule {
+
+    // Activities
+    @ContributesAndroidInjector
+    abstract fun contributesPodManagementActivity(): PodManagementActivity
+    @ContributesAndroidInjector abstract fun contributesPodHistoryActivity(): PodHistoryActivity
+
+    // Fragments
+    @ContributesAndroidInjector abstract fun initActionFragment(): InitActionFragment
+    @ContributesAndroidInjector abstract fun removeActionFragment(): RemoveActionFragment
+    @ContributesAndroidInjector abstract fun podInfoFragment(): PodInfoFragment
+
+    // Service
+    @ContributesAndroidInjector
+    abstract fun omnipodCommunicationManagerProvider(): OmnipodRileyLinkCommunicationManager
+    @ContributesAndroidInjector abstract fun aapsOmnipodManagerProvider(): AapsOmnipodManager
+
+    // Data
+    @ContributesAndroidInjector abstract fun initPodRefreshAction(): InitPodRefreshAction
+    @ContributesAndroidInjector abstract fun podStateManager(): PodStateManager
+    @ContributesAndroidInjector abstract fun initPodTask(): InitPodTask
+    @ContributesAndroidInjector abstract fun omnipodPumpPlugin(): OmnipodPumpPlugin
+
+    companion object {
+        @Provides
+        fun podStateManagerProvider(aapsPodStateManager: AapsPodStateManager): PodStateManager = aapsPodStateManager
+    }
+}

app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt

@@ -40,6 +40,7 @@ import info.nightscout.androidaps.plugins.pump.combo.ComboPlugin
 import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin
 import info.nightscout.androidaps.plugins.pump.mdi.MDIPlugin
 import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin
+import info.nightscout.androidaps.plugins.pump.omnipod.OmnipodPumpPlugin
 import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityAAPSPlugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref1Plugin
@@ -147,6 +148,12 @@ abstract class PluginsModule {
     @IntKey(150)
     abstract fun bindMedtronicPumpPlugin(plugin: MedtronicPumpPlugin): PluginBase
 
+    @Binds
+    @PumpDriver
+    @IntoMap
+    @IntKey(155)
+    abstract fun bindOmnipodPumpPlugin(plugin: OmnipodPumpPlugin): PluginBase
+
     @Binds
     @NotNSClient
     @IntoMap

app/src/main/java/info/nightscout/androidaps/dependencyInjection/ServicesModule.kt

@@ -10,6 +10,7 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.Riley
 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.rileylink.service.RileyLinkOmnipodService
 import info.nightscout.androidaps.services.AlarmSoundService
 import info.nightscout.androidaps.services.DataService
 import info.nightscout.androidaps.services.LocationService
@@ -29,4 +30,5 @@ abstract class ServicesModule {
     @ContributesAndroidInjector abstract fun contributesInsightConnectionService(): InsightConnectionService
     @ContributesAndroidInjector abstract fun contributesRileyLinkService(): RileyLinkService
     @ContributesAndroidInjector abstract fun contributesRileyLinkMedtronicService(): RileyLinkMedtronicService
+    @ContributesAndroidInjector abstract fun contributesRileyLinkOmnipodService(): RileyLinkOmnipodService
 }