X-Git-Url: http://www.average.org/gitweb/?p=WhereAmI.git;a=blobdiff_plain;f=src%2Forg%2Faverage%2Fwhereami%2FPhoneLog.java;h=2665c340449914d3de40ae4352b12a562d2253d2;hp=fca10d6a2b006433bef1d89d580f22b17c90bf61;hb=3a239c1eebf08ee80a1a05f0dc06fd54e52bf28d;hpb=fc90003666d07349f68ef0382b1e318a3ff2a3d3

diff --git a/src/org/average/whereami/PhoneLog.java b/src/org/average/whereami/PhoneLog.java
index fca10d6..2665c34 100644
--- a/src/org/average/whereami/PhoneLog.java
+++ b/src/org/average/whereami/PhoneLog.java
@@ -1,6 +1,6 @@
 package org.average.whereami;
 
-import org.average.whereami.CredentialStore;
+import org.average.whereami.PersistentStore;
 
 import java.io.IOException;
 
@@ -25,12 +25,19 @@ public final class PhoneLog extends Oracle {
 
 	private Calendar calendar;
 
-	private String calendar_name = "Call Log";
-	private String calendar_id = null;
-	private String peer_name = "Alla Cherkashina";
+	private PersistentStore store;
+	private String calendar_name;
+	private String peer_name;
+	private String calendar_id;
+	private String nocalendar;
 
-	public PhoneLog(final Resources res, final CredentialStore store) {
+	public PhoneLog(final Resources res, final PersistentStore store) {
 		super(res, store);
+		this.store = store;
+		nocalendar = res.getString(R.string.nocalendar);
+		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)
@@ -41,10 +48,16 @@ public final class PhoneLog extends Oracle {
 	public final String getResult() {
 		try {
 			Log.v(TAG, "entering getResult");
-			if (calendar_id == null) {
+			if (calendar_id == null || calendar_id == "") {
 				calendar_id = scanCalendars(calendar_name);
+				store.put("calendar_id", calendar_id);
+			}
+			if (calendar_id == null || calendar_id == "") {
+				return scanEvents(calendar_id, peer_name);
+			} else {
+				return nocalendar + " \"" +
+					calendar_name + "\"";
 			}
-			return scanEvents(calendar_id, peer_name);
 		} catch (GoogleJsonResponseException e) {
 			Log.v(TAG, "GoogleJsonResponseException: " + e);
 			if (e.getResponse().getStatusCode() == 401) {