make configurable calendar selection

[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 fca10d6a2b006433bef1d89d580f22b17c90bf61..3bb34d25effe10a1f194e0b0fce055adc7812265 100644 (file)
--- 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,17 @@ 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;
 
-       public PhoneLog(final Resources res, final CredentialStore store) {
+       public PhoneLog(final Resources res, final PersistentStore store) {
                super(res, store);
+               this.store = store;
+               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,8 +46,9 @@ 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);
                        }
                        return scanEvents(calendar_id, peer_name);
                } catch (GoogleJsonResponseException e) {