SayWhen a separate class

[WhereAmI.git] / src / org / average / whereami / PhoneLog.java

diff --git a/src/org/average/whereami/PhoneLog.java b/src/org/average/whereami/PhoneLog.java
index 708b88ef3d072d4f6213a3af82f3b481167d7986..fb319a46a494441188226dfdfac600783c454487 100644 (file)
--- a/src/org/average/whereami/PhoneLog.java
+++ b/src/org/average/whereami/PhoneLog.java
@@ -1,6 +1,7 @@
 package org.average.whereami;
 
 import org.average.whereami.PersistentStore;
+import org.average.whereami.SayWhen;
 
 import java.io.IOException;
 
@@ -39,6 +40,7 @@ public final class PhoneLog extends Oracle {
        private String minutes1;
        private String minutes2to4;
        private String minutes5up;
+       private SayWhen sayWhen;
 
        public PhoneLog(final Resources res, final PersistentStore store) {
                super(res, store);
@@ -52,6 +54,7 @@ public final class PhoneLog extends Oracle {
                minutes1 = res.getString(R.string.minutes1);
                minutes2to4 = res.getString(R.string.minutes2to4);
                minutes5up = res.getString(R.string.minutes5up);
+               sayWhen = new SayWhen(res);
                calendar_name = store.get("calendar_name");
                peer_name = store.get("peer_name");
                calendar_id = store.get("calendar_id");
@@ -192,9 +195,9 @@ public final class PhoneLog extends Oracle {
                } else {
                        minutes = minutes5up;
                }
-               return last_call + " " +
-                       (latestWasOutgoing?out_call:in_call) +
-                       " " + duration + " " + dur + " " + minutes +
-                       " " + stime.format("%H:%M");
+               return last_call +
+                       " " + (latestWasOutgoing?out_call:in_call) +
+                       " " + sayWhen.say(latestStartTime) +
+                       " " + duration + " " + dur + " " + minutes;
        }
 }