make threads share one instance of GoogleAccessProtectedResource

[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..2e2b30b7f7c075dd85f932bcbb04ad31492c2c93 100644 (file)
--- a/src/org/average/whereami/PhoneLog.java
+++ b/src/org/average/whereami/PhoneLog.java
@@ -1,5 +1,6 @@
 package org.average.whereami;
 
+import org.average.whereami.APIBase;
 import org.average.whereami.PersistentStore;
 import org.average.whereami.SayWhen;
 
@@ -25,9 +26,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;
        private String calendar_id;
@@ -42,27 +40,28 @@ 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);
-               this.store = store;
-               nocalendar = res.getString(R.string.nocalendar);
-               noevents = res.getString(R.string.noevents);
-               last_call = res.getString(R.string.last_call);
-               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);
-               sayWhen = new SayWhen(res);
-               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)
+       public PhoneLog(APIBase base) {
+               super(base);
+               nocalendar = base.res.getString(R.string.nocalendar);
+               noevents = base.res.getString(R.string.noevents);
+               last_call = base.res.getString(R.string.last_call);
+               in_call = base.res.getString(R.string.in_call);
+               out_call = base.res.getString(R.string.out_call);
+               duration = base.res.getString(R.string.duration);
+               lessthan = base.res.getString(R.string.lessthan);
+               minutes1 = base.res.getString(R.string.minutes1);
+               minutes2to4 = base.res.getString(R.string.minutes2to4);
+               minutes5up = base.res.getString(R.string.minutes5up);
+               sayWhen = new SayWhen(base.res);
+               calendar_name = base.store.get("calendar_name");
+               peer_name = base.store.get("peer_name");
+               calendar_id = base.store.get("calendar_id");
+               calendar = Calendar.builder(base.httpTransport,
+                                                       base.jsonFactory)
+                       .setHttpRequestInitializer(
+                                               base.accessProtectedResource)
                        .setApplicationName("WhereAmI/1.0").build();
        }
 
@@ -77,13 +76,13 @@ public final class PhoneLog extends Oracle {
                                return nocalendar + " \"" +
                                        calendar_name + "\"";
                        } else {
-                               store.put("calendar_id", calendar_id);
+                               base.store.put("calendar_id", calendar_id);
                                return scanEvents(calendar_id, peer_name);
                        }
                } catch (GoogleJsonResponseException e) {
                        Log.e(TAG, "GoogleJsonResponseException: " + e);
                        if (e.getResponse().getStatusCode() == 401) {
-                               return authErrorMessage;
+                               return base.authErrorMessage;
                        } else {
                                return e.getMessage();
                        }
@@ -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;
                                }
                        }