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 fc35c4feb98344450ee8a78561c140be2a7b98f2..c1385074dd0540c3f6c18a0dc70d76e6c3becb9e 100644 (file)
--- a/src/org/average/whereami/Oracle.java
+++ b/src/org/average/whereami/Oracle.java
@@ -1,58 +1,15 @@
 package org.average.whereami;
 
-import org.average.whereami.CredentialStore;
+import org.average.whereami.APIBase;
+import org.average.whereami.Utterance;
 
-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;
+abstract public class Oracle {
 
-import android.content.res.Resources;
-import android.util.Log;
+       public APIBase base;
 
-public class Oracle {
-
-       final String TAG = getClass().getName();
-
-       public HttpTransport httpTransport = AndroidHttp.newCompatibleTransport();
-       public JsonFactory jsonFactory = new JacksonFactory();
-
-       public GoogleAccessProtectedResource accessProtectedResource;
-
-       public String authErrorMessage;
-
-       public Oracle(final Resources res, final CredentialStore store) {
-               authErrorMessage = res.getString(R.string.autherror);
-
-               AccessTokenResponse token = store.read();
-               Log.v(TAG, "tokens - access: \"" + token.accessToken +
-                       "\", refresh: \"" + token.refreshToken +
-                       "\", client_id: \"" + ClientCredentials.CLIENT_ID +
-                       "\", client_secret: \"" +
-                                       ClientCredentials.CLIENT_SECRET +
-                       "\"");
-               accessProtectedResource = 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;
        }
 
-       public String getResult() {
-               return "<need to be overriden>";
-       }
+       abstract public Utterance getResult();
 }