X-Git-Url: http://www.average.org/gitweb/?p=WhereAmI.git;a=blobdiff_plain;f=src%2Forg%2Faverage%2Fwhereami%2FOracle.java;h=ed3f93f5017af32841b45c53ae66c7d2679ae5eb;hp=fc35c4feb98344450ee8a78561c140be2a7b98f2;hb=934cdd85cd8722dfab9e34f67d9a7a74e00e9876;hpb=fc90003666d07349f68ef0382b1e318a3ff2a3d3

diff --git a/src/org/average/whereami/Oracle.java b/src/org/average/whereami/Oracle.java
index fc35c4f..ed3f93f 100644
--- a/src/org/average/whereami/Oracle.java
+++ b/src/org/average/whereami/Oracle.java
@@ -1,6 +1,6 @@
 package org.average.whereami;
 
-import org.average.whereami.CredentialStore;
+import org.average.whereami.PersistentStore;
 
 import com.google.api.client.extensions.android2.AndroidHttp;
 import com.google.api.client.auth.oauth2.draft10.AccessTokenResponse;
@@ -18,17 +18,19 @@ public class Oracle {
 
 	final String TAG = getClass().getName();
 
-	public HttpTransport httpTransport = AndroidHttp.newCompatibleTransport();
-	public JsonFactory jsonFactory = new JacksonFactory();
+	public HttpTransport httpTransport;
+	public JsonFactory jsonFactory;
 
 	public GoogleAccessProtectedResource accessProtectedResource;
 
 	public String authErrorMessage;
 
-	public Oracle(final Resources res, final CredentialStore store) {
+	public Oracle(final Resources res, final PersistentStore store) {
 		authErrorMessage = res.getString(R.string.autherror);
 
-		AccessTokenResponse token = store.read();
+		httpTransport = AndroidHttp.newCompatibleTransport();
+		jsonFactory = new JacksonFactory();
+		AccessTokenResponse token = store.readTokens();
 		Log.v(TAG, "tokens - access: \"" + token.accessToken +
 			"\", refresh: \"" + token.refreshToken +
 			"\", client_id: \"" + ClientCredentials.CLIENT_ID +