X-Git-Url: http://www.average.org/gitweb/?p=WhereAmI.git;a=blobdiff_plain;f=src%2Forg%2Faverage%2Fwhereami%2FLastLocation.java;h=5899bf5b24d1e6f09adb4ea84752d1d1315881ba;hp=f911b6bd3e6412dc72281d3b74141204ae6b21fa;hb=HEAD;hpb=fc90003666d07349f68ef0382b1e318a3ff2a3d3

diff --git a/src/org/average/whereami/LastLocation.java b/src/org/average/whereami/LastLocation.java
index f911b6b..5899bf5 100644
--- a/src/org/average/whereami/LastLocation.java
+++ b/src/org/average/whereami/LastLocation.java
@@ -1,9 +1,15 @@
 package org.average.whereami;
 
-import org.average.whereami.CredentialStore;
+import org.average.whereami.APIBase;
+import org.average.whereami.Oracle;
+import org.average.whereami.Utterance;
+import org.average.whereami.PersistentStore;
+import org.average.whereami.SayWhen;
 
 import java.lang.Math;
 import java.io.IOException;
+import java.net.UnknownHostException;
+import org.apache.http.conn.HttpHostConnectException;
 
 import com.google.api.client.googleapis.json.GoogleJsonResponseException;
 import com.google.api.client.http.HttpResponseException;
@@ -20,41 +26,33 @@ public final class LastLocation extends Oracle {
 
 	final String TAG = getClass().getName();
 
-	private Latitude latitude;
-
 	private String[] loc_names;
 	private String[] loc_lats;
 	private String[] loc_lons;
 	private String[] loc_dists;
 	private String myname;
-	private String timestamp;
-	private String longago;
-	private String lessthanhour;
-	private String onehour;
-	private String hours2to4;
-	private String hours5up;
-
-	public LastLocation(final Resources res, final CredentialStore 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);
-		timestamp = res.getString(R.string.timestamp);
-		longago = res.getString(R.string.longago);
-		lessthanhour = res.getString(R.string.lessthanhour);
-		onehour = res.getString(R.string.onehour);
-		hours2to4 = res.getString(R.string.hours2to4);
-		hours5up = res.getString(R.string.hours5up);
+	private String registered;
+	private SayWhen sayWhen;
+	private Latitude latitude;
 
-		latitude = Latitude.builder(httpTransport, jsonFactory)
-			.setHttpRequestInitializer(accessProtectedResource)
+	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(
+						base.accessProtectedResource)
 			.setApplicationName("WhereAmI/1.0").build();
 	}
 
 	@Override
-	public final String getResult() {
+	public final Utterance getResult() {
 		try {
 			Log.v(TAG, "entering getResult");
 			Latitude.CurrentLocation.Get request =
@@ -67,20 +65,33 @@ public final class LastLocation extends Oracle {
 					cloc.getLongitude().toString());
 			Long tsm = Long.parseLong(
 					cloc.getTimestampMs().toString());
-			return locationMessage(lat, lon, tsm);
+			return new Utterance(true,
+					locationMessage(lat, lon, tsm));
 		} catch (GoogleJsonResponseException e) {
-			Log.v(TAG, "GoogleJsonResponseException: " + e);
+			Log.e(TAG, "GoogleJsonResponseException: " + e);
 			if (e.getResponse().getStatusCode() == 401) {
-				return authErrorMessage;
+				return new Utterance(false,
+					base.authErrorMessage + "\n" +
+					e.getMessage());
 			} else {
-				return e.getMessage();
+				return new Utterance(false, e.getMessage());
 			}
                 } catch (HttpResponseException e) {
-			Log.v(TAG, "HttpResponseException: " + e);
-			return e.getMessage();
+			Log.e(TAG, "HttpResponseException: " + e);
+			return new Utterance(false, e.getMessage());
+		} catch (UnknownHostException e) {
+			Log.e(TAG, "UnknownHostException: " + e);
+			return new Utterance(false,
+					base.connectErrorMessage + "\n" +
+					e.getMessage());
+		} catch (HttpHostConnectException e) {
+			Log.e(TAG, "HttpHostConnectException: " + e);
+			return new Utterance(false,
+					base.connectErrorMessage + "\n" +
+					e.getMessage());
 		} catch (IOException e) {
-			e.printStackTrace();
-			return e.getMessage();
+			Log.e(TAG, "IOException: " + e);
+			return new Utterance(false, e.getMessage());
                 }
 	}
 
@@ -94,27 +105,16 @@ public final class LastLocation extends Oracle {
 					Double.parseDouble(loc_lats[i]),
 					Double.parseDouble(loc_lons[i]));
 			Log.v(TAG, "Dist from " + loc_names[i] +
-				" is " + dist);
-			if ((loc_dists[i] == "0") ||
+				" is " + dist +
+				", threshold " + loc_dists[i]);
+			if ((loc_dists[i].equals("0")) ||
 			    (dist < Double.parseDouble(loc_dists[i]))) {
 				locmsg = loc_names[i];
 				break;
 			}
 		}
-		Long ago = (System.currentTimeMillis() - tsm) / 3600000;
-		if (ago < 1) {
-			agomsg = lessthanhour;
-		} else if (ago < 2) {
-			agomsg = onehour;
-		} else if (ago < 5) {
-			agomsg = "" + ago + " " + hours2to4;
-		} else if (ago < 24) {
-			agomsg = "" + ago + " " + hours5up;
-		} else {
-			agomsg = longago;
-		}
-		return myname + " " + locmsg + ", " + timestamp +
-			" " + agomsg;
+		return myname + " " + locmsg + ", " + registered +
+			" " + sayWhen.say(tsm);
 	}
 
 	private Double toRad(Double deg) {