X-Git-Url: http://www.average.org/gitweb/?p=WhereAmI.git;a=blobdiff_plain;f=src%2Forg%2Faverage%2Fwhereami%2FOracle.java;h=7ba16a5ec2dfde72e118e4b339783a6979895760;hp=ab4431c8957f36ed53073576475332b43e7422c6;hb=e7ecf60a526f2f410d586895429e208370517bc9;hpb=60cf5624803270a4d6b3b084a3a62b1a09f12936 diff --git a/src/org/average/whereami/Oracle.java b/src/org/average/whereami/Oracle.java index ab4431c..7ba16a5 100644 --- a/src/org/average/whereami/Oracle.java +++ b/src/org/average/whereami/Oracle.java @@ -20,16 +20,20 @@ abstract public class Oracle { 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(); +} + + public GoogleAccessProtectedResource accessProtectedResource() { AccessTokenResponse token = store.readTokens(); Log.v(TAG, "tokens - access: \"" + token.accessToken + "\", refresh: \"" + token.refreshToken + @@ -37,7 +41,7 @@ abstract public class Oracle { "\", client_secret: \"" + ClientCredentials.CLIENT_SECRET + "\""); - accessProtectedResource = new GoogleAccessProtectedResource( + return new GoogleAccessProtectedResource( token.accessToken, httpTransport, jsonFactory, ClientCredentials.CLIENT_ID, ClientCredentials.CLIENT_SECRET,