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

diff --git a/src/org/average/whereami/Oracle.java b/src/org/average/whereami/Oracle.java
index fc35c4f..7ba16a5 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;
@@ -14,28 +14,34 @@ import com.google.api.client.json.jackson.JacksonFactory;
 import android.content.res.Resources;
 import android.util.Log;
 
-public class Oracle {
+abstract 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 PersistentStore store;
 
-	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);
+		this.store = store;
 
-		AccessTokenResponse token = store.read();
+		httpTransport = AndroidHttp.newCompatibleTransport();
+		jsonFactory = new JacksonFactory();
+}
+
+	public GoogleAccessProtectedResource accessProtectedResource() {
+		AccessTokenResponse token = store.readTokens();
 		Log.v(TAG, "tokens - access: \"" + token.accessToken +
 			"\", refresh: \"" + token.refreshToken +
 			"\", client_id: \"" + ClientCredentials.CLIENT_ID +
 			"\", client_secret: \"" +
 					ClientCredentials.CLIENT_SECRET +
 			"\"");
-		accessProtectedResource = new GoogleAccessProtectedResource(
+		return new GoogleAccessProtectedResource(
 			token.accessToken, httpTransport, jsonFactory,
 			ClientCredentials.CLIENT_ID,
 			ClientCredentials.CLIENT_SECRET,
@@ -52,7 +58,5 @@ public class Oracle {
 			};
 	}
 
-	public String getResult() {
-		return "<need to be overriden>";
-	}
+	abstract public String getResult();
 }