X-Git-Url: http://www.average.org/gitweb/?p=WhereAmI.git;a=blobdiff_plain;f=src%2Forg%2Faverage%2Fwhereami%2FPhoneLog.java;h=b8f29d6eca99043325c657216794efbf8ea01335;hp=fb319a46a494441188226dfdfac600783c454487;hb=7bb8241a9ad8edc2045e12d24679a0a72626f728;hpb=9cc761c03fc2da437a596df5c6cbec3cd01fcf2a

diff --git a/src/org/average/whereami/PhoneLog.java b/src/org/average/whereami/PhoneLog.java
index fb319a4..b8f29d6 100644
--- a/src/org/average/whereami/PhoneLog.java
+++ b/src/org/average/whereami/PhoneLog.java
@@ -25,8 +25,6 @@ public final class PhoneLog extends Oracle {
 
 	final String TAG = getClass().getName();
 
-	private Calendar calendar;
-
 	private PersistentStore store;
 	private String calendar_name;
 	private String peer_name;
@@ -37,10 +35,12 @@ public final class PhoneLog extends Oracle {
 	private String in_call;
 	private String out_call;
 	private String duration;
+	private String lessthan;
 	private String minutes1;
 	private String minutes2to4;
 	private String minutes5up;
 	private SayWhen sayWhen;
+	private Calendar calendar;
 
 	public PhoneLog(final Resources res, final PersistentStore store) {
 		super(res, store);
@@ -51,6 +51,7 @@ public final class PhoneLog extends Oracle {
 		in_call = res.getString(R.string.in_call);
 		out_call = res.getString(R.string.out_call);
 		duration = res.getString(R.string.duration);
+		lessthan = res.getString(R.string.lessthan);
 		minutes1 = res.getString(R.string.minutes1);
 		minutes2to4 = res.getString(R.string.minutes2to4);
 		minutes5up = res.getString(R.string.minutes5up);
@@ -58,9 +59,9 @@ public final class PhoneLog extends Oracle {
 		calendar_name = store.get("calendar_name");
 		peer_name = store.get("peer_name");
 		calendar_id = store.get("calendar_id");
-
 		calendar = Calendar.builder(httpTransport, jsonFactory)
-			.setHttpRequestInitializer(accessProtectedResource)
+			.setHttpRequestInitializer(
+					newMyAccessProtectedResource())
 			.setApplicationName("WhereAmI/1.0").build();
 	}
 
@@ -152,13 +153,13 @@ public final class PhoneLog extends Oracle {
 				Log.v(TAG, "event " + evStart +
 					" - " + evStop +
 					" : \"" + evSummary + "\"");
-				if ((evSummary.startsWith("Called ") ||
-				     evSummary.startsWith("Call from ")) &&
+				if ((evSummary.startsWith("Call To ") ||
+				     evSummary.startsWith("Call From ")) &&
 				    evStart > latestStartTime) {
 						latestStartTime = evStart;
 						latestStopTime = evStop;
 						latestWasOutgoing = evSummary
-							.startsWith("Called ");
+							.startsWith("Call To ");
 						wasFound = true;
 				}
 			}
@@ -186,11 +187,17 @@ public final class PhoneLog extends Oracle {
 		stime.set(latestStartTime);
 		Long dur = (latestStopTime - latestStartTime) / 60000L;
 		Log.v(TAG, "Chosen event: start " + stime +
-			" for " + dur + " sec");
+			" for " + dur + " min");
 		String minutes;
-		if (dur == 1) {
+		String howlong = dur.toString();
+		if (dur == 0) {
+			howlong = lessthan;
+			minutes = minutes2to4;
+		} else if ((dur / 10) == 1) {
+			minutes = minutes5up;
+		} else if ((dur % 10) == 1) {
 			minutes = minutes1;
-		} else if (dur < 5) {
+		} else if ((dur % 10) < 5) {
 			minutes = minutes2to4;
 		} else {
 			minutes = minutes5up;
@@ -198,6 +205,6 @@ public final class PhoneLog extends Oracle {
 		return last_call +
 			" " + (latestWasOutgoing?out_call:in_call) +
 			" " + sayWhen.say(latestStartTime) +
-			" " + duration + " " + dur + " " + minutes;
+			" " + duration + " " + howlong + " " + minutes;
 	}
 }