From 625e3a0a0ad2318f891abb532daa76e383a0ed33 Mon Sep 17 00:00:00 2001
From: Artiom Kenibasov <artiom@gmail.com>
Date: Sat, 21 Nov 2020 21:46:32 +0100
Subject: [PATCH] Code arranged as per PR suggestions

---
 .../omnipod/definition/PodHistoryEntryType.java  |  1 -
 .../action/ConfigureBeepAction.java              |  6 +++---
 .../omnipod/driver/manager/OmnipodManager.java   |  5 ++++-
 .../pump/omnipod/manager/AapsOmnipodManager.java |  4 ++--
 .../queue/command/OmnipodCustomCommandType.java  |  2 +-
 .../pump/omnipod/ui/OmnipodOverviewFragment.kt   |  4 +++-
 omnipod/src/main/res/layout/omnipod_overview.xml |  3 +--
 omnipod/src/main/res/values/strings.xml          | 16 ++++++++--------
 8 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/definition/PodHistoryEntryType.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/definition/PodHistoryEntryType.java
index 366e675b20..47b2fd7693 100644
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/definition/PodHistoryEntryType.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/definition/PodHistoryEntryType.java
@@ -42,7 +42,6 @@ public enum PodHistoryEntryType {
 
     UNKNOWN_ENTRY_TYPE(99, R.string.omnipod_cmd_unknown_entry);
 
-
     private int code;
     private static final Map<Integer, PodHistoryEntryType> instanceMap;
 
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/ConfigureBeepAction.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/ConfigureBeepAction.java
index f75c2b652c..09088fb8f2 100644
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/ConfigureBeepAction.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/ConfigureBeepAction.java
@@ -20,7 +20,7 @@ public class ConfigureBeepAction implements OmnipodAction<StatusResponse> {
 
     public ConfigureBeepAction(PodStateManager podState, BeepConfigType beepType, boolean basalCompletionBeep, Duration basalIntervalBeep, boolean tempBasalCompletionBeep, Duration tempBasalIntervalBeep, boolean bolusCompletionBeep, Duration bolusIntervalBeep) {
         if (podState == null || beepType == null) {
-            throw new IllegalArgumentException("Pod state manager cannot be null");
+            throw new IllegalArgumentException("Required parameter(s) missing");
         }
 
         this.beepType = beepType;
@@ -41,8 +41,8 @@ public class ConfigureBeepAction implements OmnipodAction<StatusResponse> {
     @Override
     public StatusResponse execute(OmnipodRileyLinkCommunicationManager communicationService) {
         return communicationService.sendCommand(
-                StatusResponse.class, podStateManager
-                , new BeepConfigCommand(beepType, basalCompletionBeep, basalIntervalBeep,
+                StatusResponse.class, podStateManager,
+                new BeepConfigCommand(beepType, basalCompletionBeep, basalIntervalBeep,
                         tempBasalCompletionBeep, tempBasalIntervalBeep,
                         bolusCompletionBeep, bolusIntervalBeep));
     }
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/manager/OmnipodManager.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/manager/OmnipodManager.java
index d4cf973d15..67e34cc038 100644
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/manager/OmnipodManager.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/manager/OmnipodManager.java
@@ -435,7 +435,10 @@ public class OmnipodManager {
         if (!podStateManager.isPodInitialized()) {
             throw new IllegalPodProgressException(PodProgressStatus.REMINDER_INITIALIZED, null);
         }
-        communicationService.executeAction(new ConfigureBeepAction(podStateManager, beepType, false, Duration.ZERO, false, Duration.ZERO, false, Duration.ZERO));
+        communicationService.executeAction(new ConfigureBeepAction(
+                podStateManager, beepType, basalCompletionBeep,
+                basalIntervalBeep, tempBasalCompletionBeep, tempBasalIntervalBeep,
+                bolusCompletionBeep, bolusIntervalBeep));
     }
 
     public synchronized void playTestBeep(BeepConfigType beepType) {
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/manager/AapsOmnipodManager.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/manager/AapsOmnipodManager.java
index 65474891e3..f7211fef05 100644
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/manager/AapsOmnipodManager.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/manager/AapsOmnipodManager.java
@@ -251,7 +251,6 @@ public class AapsOmnipodManager {
     }
 
 
-
     public PumpEnactResult getPodStatus() {
         StatusResponse statusResponse;
 
@@ -634,7 +633,8 @@ public class AapsOmnipodManager {
     }
 
     public boolean isTestBeepButtonEnabled() {
-        return testBeepButtonEnabled; }
+        return testBeepButtonEnabled;
+    }
 
     public boolean isRileylinkStatsButtonEnabled() {
         return rileylinkStatsButtonEnabled;
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/OmnipodCustomCommandType.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/OmnipodCustomCommandType.java
index ab7cb38b39..f5c787be26 100644
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/OmnipodCustomCommandType.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/OmnipodCustomCommandType.java
@@ -9,7 +9,7 @@ public enum OmnipodCustomCommandType {
     DEACTIVATE_POD("DEACTIVATE POD"),
     HANDLE_TIME_CHANGE("HANDLE TIME CHANGE"),
     UPDATE_ALERT_CONFIGURATION("UPDATE ALERT CONFIGURATION"),
-    PLAY_TEST_BEEP("EMIT BEEP")
+    PLAY_TEST_BEEP("PLAY TEST BEEP")
     ;
 
     private final String description;
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/OmnipodOverviewFragment.kt b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/OmnipodOverviewFragment.kt
index bb9123033a..cf90924d01 100644
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/OmnipodOverviewFragment.kt
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/OmnipodOverviewFragment.kt
@@ -533,7 +533,9 @@ class OmnipodOverviewFragment : DaggerFragment() {
     private fun updateTestBeepButton() {
         if (omnipodManager.isTestBeepButtonEnabled) {
             omnipod_overview_button_test_beep.visibility = View.VISIBLE
-            omnipod_overview_button_test_beep.isEnabled = podStateManager.isPodActivationCompleted && rileyLinkServiceData.rileyLinkServiceState.isReady && isQueueEmpty()
+            omnipod_overview_button_test_beep.isEnabled = podStateManager.isPodInitialized &&
+                podStateManager.activationProgress.isAtLeast(ActivationProgress.PAIRING_COMPLETED) &&
+                rileyLinkServiceData.rileyLinkServiceState.isReady && isQueueEmpty()
         } else {
             omnipod_overview_button_test_beep.visibility = View.GONE
         }
diff --git a/omnipod/src/main/res/layout/omnipod_overview.xml b/omnipod/src/main/res/layout/omnipod_overview.xml
index d637d248f6..4584e63618 100644
--- a/omnipod/src/main/res/layout/omnipod_overview.xml
+++ b/omnipod/src/main/res/layout/omnipod_overview.xml
@@ -825,8 +825,7 @@
                     android:drawableTop="@drawable/ic_play_test_beep"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
-                    android:text="@string/omnipod_overview_button_test_beep"
-                     />
+                    android:text="@string/omnipod_overview_button_test_beep" />
 
                 <Button
                     android:id="@+id/omnipod_overview_button_pulse_log"
diff --git a/omnipod/src/main/res/values/strings.xml b/omnipod/src/main/res/values/strings.xml
index f3c7a6b9df..b770540f35 100644
--- a/omnipod/src/main/res/values/strings.xml
+++ b/omnipod/src/main/res/values/strings.xml
@@ -10,6 +10,8 @@
     <string name="key_omnipod_tbr_beeps_enabled" translatable="false">AAPS.Omnipod.tbr_beeps_enabled</string>
     <string name="key_omnipod_suspend_delivery_button_enabled" translatable="false">AAPS.Omnipod.suspend_delivery_button_enabled</string>
     <string name="key_omnipod_pulse_log_button_enabled" translatable="false">AAPS.Omnipod.pulse_log_button_enabled</string>
+    <string name="key_omnipod_test_beep_button_enabled">AAPS.Omnipod.test_beep_button_enabled</string>
+    <string name="key_omnipod_rileylink_stats_button_enabled">AAPS.Omnipod.rileylink_stats_button_enabled</string>
     <string name="key_omnipod_time_change_event_enabled" translatable="false">AAPS.Omnipod.time_change_enabled</string>
     <string name="key_omnipod_expiration_reminder_enabled" translatable="false">AAPS.Omnipod.expiration_reminder_enabled</string>
     <string name="key_omnipod_expiration_reminder_hours_before_shutdown" translatable="false">AAPS.Omnipod.expiration_reminder_hours_before_shutdown</string>
@@ -41,6 +43,8 @@
     <string name="omnipod_config_tbr_beeps_enabled">TBR beeps enabled</string>
     <string name="omnipod_config_suspend_delivery_button_enabled">Suspend Delivery button enabled</string>
     <string name="omnipod_config_pulse_log_button_enabled">Pulse Log button enabled</string>
+    <string name="omnipod_config_test_beep_button_enabled">Test beep button enabled</string>
+    <string name="omnipod_config_rileylink_stats_button_enabled">RileyLink Stats button enabled</string>
     <string name="omnipod_config_time_change_enabled">DST/Time zone detection enabled</string>
     <string name="omnipod_config_expiration_reminder_enabled">Expiration reminder enabled</string>
     <string name="omnipod_config_expiration_reminder_hours_before_shutdown">Hours before shutdown</string>
@@ -135,6 +139,7 @@
     <string name="omnipod_error_pod_fault_activation_time_exceeded">The Pod\'s activation time has been exceeded. This Pod can no longer be activated.</string>
     <string name="omnipod_error_failed_to_verify_activation_progress">Failed to verify activation progress. Please retry.</string>
     <string name="omnipod_error_pod_suspended">Pod suspended</string>
+    <string name="omnipod_error_failed_to_play_test_beep">Failed to play test beep</string>
 
     <!-- Omnipod - Confirmation -->
     <string name="omnipod_confirmation">Confirmation</string>
@@ -167,6 +172,8 @@
     <string name="omnipod_cmd_read_pulse_log">Read pulse log</string>
     <string name="omnipod_cmd_set_fake_suspended_tbr">Set fake temporary basal because the Pod is suspended</string>
     <string name="omnipod_cmd_cancel_fake_suspended_tbr">Cancel fake temporary basal that was created because the Pod was suspended</string>
+    <string name="omnipod_cmd_beep_config">Beep config</string>
+    <string name="omnipod_cmd_play_test_beep">Play test beep</string>
 
     <!-- Omnipod - Pod Management -->
     <string name="omnipod_pod_management_title">Pod management</string>
@@ -221,6 +228,7 @@
     <string name="omnipod_overview_button_resume_delivery">Resume delivery</string>
     <string name="omnipod_overview_button_pod_management">Pod mgmt</string>
     <string name="omnipod_overview_button_acknowledge_active_alerts">Ack alerts</string>
+    <string name="omnipod_overview_button_test_beep">Test beep</string>
     <string name="omnipod_overview_pod_status">Pod status</string>
     <string name="omnipod_overview_total_delivered">Total delivered</string>
     <string name="omnipod_overview_total_delivered_value">%1$.2f U</string>
@@ -255,14 +263,6 @@
     <string name="omnipod_less_than_a_minute_ago">Less than a minute ago</string>
     <string name="omnipod_composite_time">%1$s and %2$s</string>
     <string name="omnipod_time_ago">%1$s ago</string>
-    <string name="omnipod_cmd_beep_config">Beep config</string>
-    <string name="omnipod_cmd_play_test_beep">Play test beep</string>
-    <string name="key_omnipod_test_beep_button_enabled">AAPS.Omnipod.test_beep_button_enabled</string>
-    <string name="omnipod_config_test_beep_button_enabled">Test beep button enabled</string>
-    <string name="omnipod_overview_button_test_beep">Test beep</string>
-    <string name="omnipod_config_rileylink_stats_button_enabled">RileyLink Stats button enabled</string>
-    <string name="key_omnipod_rileylink_stats_button_enabled">AAPS.Omnipod.rileylink_stats_button_enabled</string>
-    <string name="omnipod_error_failed_to_play_test_beep">Failed to play test beep</string>
     <plurals name="omnipod_minutes">
         <item quantity="one">%1$d minute</item>
         <item quantity="other">%1$d minutes</item>