Stay alive unless closed from menu

[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 7ba16a5ec2dfde72e118e4b339783a6979895760..c1385074dd0540c3f6c18a0dc70d76e6c3becb9e 100644 (file)
--- a/src/org/average/whereami/Oracle.java
+++ b/src/org/average/whereami/Oracle.java
@@ -1,62 +1,15 @@
 package org.average.whereami;
 
-import org.average.whereami.PersistentStore;
-
-import com.google.api.client.extensions.android2.AndroidHttp;
-import com.google.api.client.auth.oauth2.draft10.AccessTokenResponse;
-import com.google.api.client.googleapis.auth.oauth2.draft10.GoogleAccessProtectedResource;
-import com.google.api.client.http.HttpResponseException;
-import com.google.api.client.http.HttpTransport;
-import com.google.api.client.http.javanet.NetHttpTransport;
-import com.google.api.client.json.JsonFactory;
-import com.google.api.client.json.jackson.JacksonFactory;
-
-import android.content.res.Resources;
-import android.util.Log;
+import org.average.whereami.APIBase;
+import org.average.whereami.Utterance;
 
 abstract public class Oracle {
 
-       final String TAG = getClass().getName();
-
-       public HttpTransport httpTransport;
-       public JsonFactory jsonFactory;
-       public PersistentStore store;
-
-
-       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 APIBase base;
 
-       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 +
-                       "\"");
-               return new GoogleAccessProtectedResource(
-                       token.accessToken, httpTransport, jsonFactory,
-                       ClientCredentials.CLIENT_ID,
-                       ClientCredentials.CLIENT_SECRET,
-                       token.refreshToken)
-                       {
-                               @Override
-                               public void onAccessToken(
-                                               String accessToken) {
-                                       Log.v(TAG, "Update access token to \""
-                                               + accessToken + "\"");
-                                       store.updateAccessToken(
-                                               accessToken);
-                               }
-                       };
+       public Oracle(APIBase apibase) {
+               this.base = apibase;
        }
 
-       abstract public String getResult();
+       abstract public Utterance getResult();
 }