enable HTTP logging

[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 00de54578c712e35b2674c8811022a38afcfc579..b8f29d6eca99043325c657216794efbf8ea01335 100644 (file)
--- 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;
@@ -42,6 +40,7 @@ public final class PhoneLog extends Oracle {
        private String minutes2to4;
        private String minutes5up;
        private SayWhen sayWhen;
+       private Calendar calendar;
 
        public PhoneLog(final Resources res, final PersistentStore store) {
                super(res, store);
@@ -60,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();
        }
 
@@ -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;
                                }
                        }