X-Git-Url: http://www.average.org/gitweb/?p=WhereAmI.git;a=blobdiff_plain;f=src%2Forg%2Faverage%2Fwhereami%2FLastLocation.java;h=99911c37afa8398714483de88b1dc4393287bc0c;hp=ba6722854bb7c1635ccebc956ee58ec00147a36d;hb=99db21a723e47ecd70fa490795379ab2344469dd;hpb=36b6777a469a0ab1a15016b2d34b9e2aa10a3c0a

diff --git a/src/org/average/whereami/LastLocation.java b/src/org/average/whereami/LastLocation.java
index ba67228..99911c3 100644
--- a/src/org/average/whereami/LastLocation.java
+++ b/src/org/average/whereami/LastLocation.java
@@ -1,5 +1,6 @@
 package org.average.whereami;
 
+import org.average.whereami.APIBase;
 import org.average.whereami.PersistentStore;
 import org.average.whereami.SayWhen;
 
@@ -30,18 +31,19 @@ public final class LastLocation extends Oracle {
 	private SayWhen sayWhen;
 	private Latitude latitude;
 
-	public LastLocation(final Resources res, final PersistentStore store) {
-		super(res, store);
-		loc_names = res.getStringArray(R.array.loc_names);
-		loc_lats = res.getStringArray(R.array.loc_lats);
-		loc_lons = res.getStringArray(R.array.loc_lons);
-		loc_dists = res.getStringArray(R.array.loc_dists);
-		myname = res.getString(R.string.myname);
-		registered = res.getString(R.string.registered);
-		sayWhen = new SayWhen(res);
-		latitude = Latitude.builder(httpTransport, jsonFactory)
+	public LastLocation(APIBase base) {
+		super(base);
+		loc_names = base.res.getStringArray(R.array.loc_names);
+		loc_lats = base.res.getStringArray(R.array.loc_lats);
+		loc_lons = base.res.getStringArray(R.array.loc_lons);
+		loc_dists = base.res.getStringArray(R.array.loc_dists);
+		myname = base.res.getString(R.string.myname);
+		registered = base.res.getString(R.string.registered);
+		sayWhen = new SayWhen(base.res);
+		latitude = Latitude.builder(base.httpTransport,
+							base.jsonFactory)
 			.setHttpRequestInitializer(
-					newMyAccessProtectedResource())
+						base.accessProtectedResource)
 			.setApplicationName("WhereAmI/1.0").build();
 	}
 
@@ -63,7 +65,7 @@ public final class LastLocation extends Oracle {
 		} catch (GoogleJsonResponseException e) {
 			Log.e(TAG, "GoogleJsonResponseException: " + e);
 			if (e.getResponse().getStatusCode() == 401) {
-				return authErrorMessage;
+				return base.authErrorMessage;
 			} else {
 				return e.getMessage();
 			}