1 files changed, 11 insertions, 33 deletions
diff --git a/app/src/main/java/com/camilstaps/taize/DailyReading.java b/app/src/main/java/com/camilstaps/taize/DailyReading.java
index 71c38ac..fa5115e 100644
--- a/app/src/main/java/com/camilstaps/taize/DailyReading.java
+++ b/app/src/main/java/com/camilstaps/taize/DailyReading.java
@@ -8,53 +8,27 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import com.camilstaps.common.Date;
+import com.camilstaps.common.DatedString;
 
 /**
  * Created by camilstaps on 7-4-15.
  */
-public class DailyReading {
+public class DailyReading extends DatedString {
 
-    private final Date date;
-    private final String text;
-
-    public DailyReading(Date date, String text) {
-        this.date = date;
-        this.text = text;
-    }
-
-    public String getText() {
-        return text;
-    }
-
-    public Date getDate() {
-        return date;
+    public DailyReading(Date date, String string) {
+        super(date, string);
     }
 
     public String getTextWithoutReference() {
         Matcher bible_ref_m = referenceMatcher();
 
         if (bible_ref_m.find()) {
-            return text.substring(0, bible_ref_m.start() - 1);
+            return string.substring(0, bible_ref_m.start() - 1);
         } else {
-            return text;
+            return string;
         }
     }
 
-    @Override
-    public String toString() {
-        JSONObject json = new JSONObject();
-        try {
-            json.put("date", date.toString());
-            json.put("text", text);
-        } catch (JSONException e) {}
-        return json.toString();
-    }
-
-    public static DailyReading fromString(String s) throws JSONException, ParseException {
-        JSONObject json = new JSONObject(s);
-        return new DailyReading(new Date(json.getString("date")), json.getString("text"));
-    }
-
     public BibleText getBibleReference() {
         final Matcher bible_ref_m = referenceMatcher();
 
@@ -67,6 +41,10 @@ public class DailyReading {
 
     private Matcher referenceMatcher() {
         Pattern bible_ref = Pattern.compile("\\((\\d? ?[a-zA-Z]+) (\\d{1,2})(?::|,)(\\d+)-?(\\d+?)\\)");
-        return bible_ref.matcher(text);
+        return bible_ref.matcher(string);
+    }
+
+    public static DailyReading fromString(String s) throws JSONException, ParseException {
+        return (DailyReading) DatedString.fromString(s, DailyReading.class);
     }
 }