Working tabs & meditations

1 files changed, 8 insertions, 5 deletions

diff --git a/app/src/main/java/com/camilstaps/taize/DailyReading.java b/app/src/main/java/com/camilstaps/taize/DailyReading.java
index fa5115e..151f7e3 100644
--- a/app/src/main/java/com/camilstaps/taize/DailyReading.java
+++ b/app/src/main/java/com/camilstaps/taize/DailyReading.java
@@ -1,7 +1,6 @@
 package com.camilstaps.taize;
 
 import org.json.JSONException;
-import org.json.JSONObject;
 
 import java.text.ParseException;
 import java.util.regex.Matcher;
@@ -36,15 +35,19 @@ public class DailyReading extends DatedString {
             return null;
         }
 
-        return new BibleText(bible_ref_m.group(1), Integer.parseInt(bible_ref_m.group(2)), Integer.parseInt(bible_ref_m.group(3)), Integer.parseInt(bible_ref_m.group(2)), Integer.parseInt(bible_ref_m.group(4)));
+        if (bible_ref_m.group(3) == null) {
+            return new BibleText(bible_ref_m.group(1), Integer.parseInt(bible_ref_m.group(2)));
+        } else {
+            return new BibleText(bible_ref_m.group(1), Integer.parseInt(bible_ref_m.group(2)), Integer.parseInt(bible_ref_m.group(3)), Integer.parseInt(bible_ref_m.group(2)), Integer.parseInt(bible_ref_m.group(4)));
+        }
     }
 
     private Matcher referenceMatcher() {
-        Pattern bible_ref = Pattern.compile("\\((\\d? ?[a-zA-Z]+) (\\d{1,2})(?::|,)(\\d+)-?(\\d+?)\\)");
+        Pattern bible_ref = Pattern.compile("\\((\\d? ?[a-zA-Z]+) (\\d{1,2})(?::|,)?(\\d+)?-?(\\d+?)?\\)");
         return bible_ref.matcher(string);
     }
 
-    public static DailyReading fromString(String s) throws JSONException, ParseException {
-        return (DailyReading) DatedString.fromString(s, DailyReading.class);
+    public static DailyMeditation fromString(String s) throws JSONException, ParseException {
+        return (DailyMeditation) DatedString.fromString(s, DailyMeditation.class);
     }
 }