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 1de3879b7db2b24b53d768f13a5bf74b09441312..c1385074dd0540c3f6c18a0dc70d76e6c3becb9e 100644 (file)
--- a/src/org/average/whereami/Oracle.java
+++ b/src/org/average/whereami/Oracle.java
@@ -1,81 +1,15 @@
 package org.average.whereami;
 
-import org.average.whereami.PersistentStore;
-
-import java.io.IOException;
-
-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();
-       }
-
-       private class MyAccessProtectedResource
-               extends GoogleAccessProtectedResource {
-
-       // Why on earth contructors are not inherited?!?!
-               public MyAccessProtectedResource(
-                               String accessToken,
-                               HttpTransport transport,
-                               JsonFactory jsonFactory,
-                               String clientId,
-                               String clientSecret,
-                               String refreshToken) {
-                       super(accessToken, transport, jsonFactory,
-                               clientId, clientSecret, refreshToken);
-               }
-
-               @Override
-               public void onAccessToken(String accessToken) {
-                       Log.v(TAG, "Update access token to \""
-                               + accessToken + "\"");
-                       store.updateAccessToken( accessToken);
-               }
-
-               @Override
-               protected boolean executeRefreshToken() throws IOException {
-                       Log.v(TAG, "executeRefreshToken was called");
-                       return super.executeRefreshToken();
-               }
-       }
+       public APIBase base;
 
-       public MyAccessProtectedResource 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 MyAccessProtectedResource(
-                       token.accessToken, httpTransport, jsonFactory,
-                       ClientCredentials.CLIENT_ID,
-                       ClientCredentials.CLIENT_SECRET,
-                       token.refreshToken);
+       public Oracle(APIBase apibase) {
+               this.base = apibase;
        }
 
-       abstract public String getResult();
+       abstract public Utterance getResult();
 }