X-Git-Url: http://www.average.org/gitweb/?p=WhereAmI.git;a=blobdiff_plain;f=src%2Forg%2Faverage%2Fwhereami%2FPhoneLog.java;h=2e2b30b7f7c075dd85f932bcbb04ad31492c2c93;hp=b8f29d6eca99043325c657216794efbf8ea01335;hb=99db21a723e47ecd70fa490795379ab2344469dd;hpb=36b6777a469a0ab1a15016b2d34b9e2aa10a3c0a

diff --git a/src/org/average/whereami/PhoneLog.java b/src/org/average/whereami/PhoneLog.java
index b8f29d6..2e2b30b 100644
--- 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,7 +26,6 @@ public final class PhoneLog extends Oracle {
 
 	final String TAG = getClass().getName();
 
-	private PersistentStore store;
 	private String calendar_name;
 	private String peer_name;
 	private String calendar_id;
@@ -42,26 +42,26 @@ public final class PhoneLog extends Oracle {
 	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)
+	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(
-					newMyAccessProtectedResource())
+						base.accessProtectedResource)
 			.setApplicationName("WhereAmI/1.0").build();
 	}
 
@@ -76,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();
 			}