X-Git-Url: http://www.average.org/gitweb/?p=WhereAmI.git;a=blobdiff_plain;f=src%2Forg%2Faverage%2Fwhereami%2FPhoneLog.java;h=6e13f2f4422248e5899c41f56259652d4fc2df57;hp=00de54578c712e35b2674c8811022a38afcfc579;hb=e7ecf60a526f2f410d586895429e208370517bc9;hpb=3de0348c8df17da7708961f002c4a964321284be diff --git a/src/org/average/whereami/PhoneLog.java b/src/org/average/whereami/PhoneLog.java index 00de545..6e13f2f 100644 --- a/src/org/average/whereami/PhoneLog.java +++ b/src/org/average/whereami/PhoneLog.java @@ -60,14 +60,13 @@ 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) - .setApplicationName("WhereAmI/1.0").build(); } @Override public final String getResult() { + calendar = Calendar.builder(httpTransport, jsonFactory) + .setHttpRequestInitializer(accessProtectedResource()) + .setApplicationName("WhereAmI/1.0").build(); try { Log.v(TAG, "entering getResult"); if (calendar_id == null || calendar_id == "") { @@ -154,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; } }