make accessProtectedResource a method

[WhereAmI.git] / src / org / average / whereami / Oracle.java

diff --git a/src/org/average/whereami/Oracle.java b/src/org/average/whereami/Oracle.java
index 28effd937f81521374ccc0e3302e97f5104fd781..7ba16a5ec2dfde72e118e4b339783a6979895760 100644 (file)
--- a/src/org/average/whereami/Oracle.java
+++ b/src/org/average/whereami/Oracle.java
@@ -14,30 +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;
        public JsonFactory jsonFactory;
+       public PersistentStore store;
 
-       public GoogleAccessProtectedResource accessProtectedResource;
 
        public String authErrorMessage;
 
        public Oracle(final Resources res, final PersistentStore store) {
                authErrorMessage = res.getString(R.string.autherror);
+               this.store = store;
 
                httpTransport = AndroidHttp.newCompatibleTransport();
                jsonFactory = new JacksonFactory();
-               AccessTokenResponse token = store.read();
+}
+
+       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,
@@ -54,7 +58,5 @@ public class Oracle {
                        };
        }
 
-       public String getResult() {
-               return "<need to be overriden>";
-       }
+       abstract public String getResult();
 }