move everything that can be mvoed to initialization

[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 6e13f2f4422248e5899c41f56259652d4fc2df57..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,13 +59,14 @@ 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(
+                                       newMyAccessProtectedResource())
+                       .setApplicationName("WhereAmI/1.0").build();
        }
 
        @Override
        public final String getResult() {
-               calendar = Calendar.builder(httpTransport, jsonFactory)
-                       .setHttpRequestInitializer(accessProtectedResource())
-                       .setApplicationName("WhereAmI/1.0").build();
                try {
                        Log.v(TAG, "entering getResult");
                        if (calendar_id == null || calendar_id == "") {