From c9aa8b8bba0f9a8e85d83b129cdf490a7817c2bb Mon Sep 17 00:00:00 2001
From: Bart Sopers <bart@sopers.nl>
Date: Fri, 13 Nov 2020 14:50:03 +0100
Subject: [PATCH] Small cleanup

---
 omnipod/build.gradle                             |  7 -------
 .../plugins/pump/omnipod/OmnipodPumpPlugin.java  | 16 ++--------------
 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/omnipod/build.gradle b/omnipod/build.gradle
index 50f97665c2..46f11bf653 100644
--- a/omnipod/build.gradle
+++ b/omnipod/build.gradle
@@ -18,13 +18,6 @@ android {
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
-
-        // OMNIPOD: for usage in Firebase event during testing phase
-        buildConfigField "String", "VERSION", '"2.7-omnipod-0.4.1-SNAPSHOT"'
-        // OMNIPOD: Keep track of what commit from the main repository we're on, these fields aren't actually used anywhere
-        buildConfigField "String", "DEV_VERSION", '"2.7.0-rc4"'
-        buildConfigField "String", "DEV_VERSION_COMMIT", '"7d5dc54656c961660451c4fa4c6ea66bd83a1c46"'
-        buildConfigField "String", "DEV_VERSION_COMMIT_DATE", '"21.8.2020"' // 21st of August
     }
 
     kotlinOptions {
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java
index c81a630f32..cfa371cebf 100644
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java
@@ -4,7 +4,6 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
-import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Looper;
@@ -77,7 +76,6 @@ import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.mess
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.ActivationProgress;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.AlertConfiguration;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.AlertSet;
-import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PodProgressStatus;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.PodStateManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.util.TimeUtil;
 import info.nightscout.androidaps.plugins.pump.omnipod.event.EventOmnipodActiveAlertsChanged;
@@ -275,13 +273,6 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
         // When PodStateManager is created, which causes an IllegalArgumentException for DateTimeZones not being recognized
         podStateManager.loadPodState();
 
-        // BS @ 2020-10-17 FIXME: for backwards compatibility; remove before release
-        if (podStateManager.isPodInitialized() &&
-                podStateManager.getActivationProgress() == ActivationProgress.NONE &&
-                podStateManager.getPodProgressStatus().isAtLeast(PodProgressStatus.ABOVE_FIFTY_UNITS)) {
-            podStateManager.setActivationProgress(ActivationProgress.COMPLETED);
-        }
-
         lastConnectionTimeMillis = sp.getLong(
                 RileyLinkConst.Prefs.LastGoodDeviceCommunicationTime, 0L);
 
@@ -907,7 +898,7 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
     @Override
     public boolean isUnreachableAlertTimeoutExceeded(long unreachableTimeoutMilliseconds) {
         // We have a separate notification for when no Pod is active, see doPodCheck()
-        if (podStateManager.isPodActivationCompleted() && podStateManager.getLastSuccessfulCommunication() != null) { // Null check for backwards compatibility
+        if (podStateManager.isPodActivationCompleted() && podStateManager.getLastSuccessfulCommunication() != null) {
             long currentTimeMillis = System.currentTimeMillis();
 
             if (podStateManager.getLastSuccessfulCommunication().getMillis() + unreachableTimeoutMilliseconds < currentTimeMillis) {
@@ -1002,10 +993,7 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
             aapsLogger.debug(LTag.PUMP, "Not retrieving Pod status on startup: no Pod running");
         }
 
-        Bundle params = new Bundle();
-        params.putString("version", BuildConfig.VERSION);
-
-        fabricPrivacy.logCustom("OmnipodPumpInit", params);
+        fabricPrivacy.logCustom("OmnipodPumpInit");
     }
 
     @NonNull private PumpEnactResult deliverBolus(final DetailedBolusInfo detailedBolusInfo) {