X-Git-Url: http://www.average.org/gitweb/?p=WhereAmI.git;a=blobdiff_plain;f=src%2Forg%2Faverage%2Fwhereami%2FOracle.java;fp=src%2Forg%2Faverage%2Fwhereami%2FOracle.java;h=405e2ddd97157eb38fc7fd7b4befcacf4b4ea1a1;hp=1de3879b7db2b24b53d768f13a5bf74b09441312;hb=7bb8241a9ad8edc2045e12d24679a0a72626f728;hpb=015cb569bd35a081666ac4849c661cd525d9b1d5

diff --git a/src/org/average/whereami/Oracle.java b/src/org/average/whereami/Oracle.java
index 1de3879..405e2dd 100644
--- a/src/org/average/whereami/Oracle.java
+++ b/src/org/average/whereami/Oracle.java
@@ -20,23 +20,20 @@ abstract public class Oracle {
 
 	final String TAG = getClass().getName();
 
-	public HttpTransport httpTransport;
-	public JsonFactory jsonFactory;
-	public PersistentStore store;
-	public String authErrorMessage;
+	static public PersistentStore store;
+	static public HttpTransport httpTransport =
+			AndroidHttp.newCompatibleTransport();
+	static public JsonFactory jsonFactory = new JacksonFactory();
+	static 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,
@@ -62,13 +59,14 @@ abstract public class Oracle {
 		}
 	}
 
-	public MyAccessProtectedResource accessProtectedResource() {
+	public MyAccessProtectedResource
+				newMyAccessProtectedResource() {
 		AccessTokenResponse token = store.readTokens();
 		Log.v(TAG, "tokens - access: \"" + token.accessToken +
 			"\", refresh: \"" + token.refreshToken +
 			"\", client_id: \"" + ClientCredentials.CLIENT_ID +
 			"\", client_secret: \"" +
-					ClientCredentials.CLIENT_SECRET +
+				ClientCredentials.CLIENT_SECRET +
 			"\"");
 		return new MyAccessProtectedResource(
 			token.accessToken, httpTransport, jsonFactory,