Merge pull request #3 from MilosKozak/empty-bolus-history-support

Empty bolus history support
MilosKozak · Jun 19, 2018 · eb2815f · eb2815f
2 parents 9fbc4b1 + a65693c
commit eb2815f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/app/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/menu/MenuFactory.java b/app/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/menu/MenuFactory.java
@@ -1370,8 +1370,13 @@ else if(p instanceof NumberPattern)
                         bolus.add(p);
                     else if(p instanceof CharacterPattern && ((CharacterPattern)p).getCharacter()=='U')
                         stage++;
-                    else
-                        return null;
+                    else {
+                        // virgin pump w/o any history yet
+                        m.setAttribute(MenuAttribute.CURRENT_RECORD, 0);
+                        m.setAttribute(MenuAttribute.TOTAL_RECORD, 0);
+                        m.setAttribute(MenuAttribute.BOLUS_TYPE, BolusType.NORMAL);
+                        return m;
+                    }
                     break;
                 case 2:
                     if(p instanceof NumberPattern)

diff --git a/app/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/menu/TitleResolver.java b/app/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/menu/TitleResolver.java
@@ -452,6 +452,9 @@ public static Title resolve(String title) {
         if(title.equalsIgnoreCase("ΔIаPKEIа п.B.P.")) //TBR 2
             return Title.TBR_DURATION;
 
+        // some pumps came preconfigured with a different quick info name
+        if (title.equalsIgnoreCase("accu chek spirit"))
+            return Title.QUICK_INFO;
 
         //FIXME add Translations
         return null;