X-Git-Url: http://www.average.org/gitweb/?p=WhereAmI.git;a=blobdiff_plain;f=src%2Forg%2Faverage%2Fwhereami%2FLastLocation.java;h=c5791160298ab42ece4bf5f4950b100561938a6c;hp=99911c37afa8398714483de88b1dc4393287bc0c;hb=6a4744c5765e743aa4057f5fcf5571e6ed8abafe;hpb=4ad132e7296c06ad96ce0dee9156eed8d83a3ea6

diff --git a/src/org/average/whereami/LastLocation.java b/src/org/average/whereami/LastLocation.java
index 99911c3..c579116 100644
--- a/src/org/average/whereami/LastLocation.java
+++ b/src/org/average/whereami/LastLocation.java
@@ -1,6 +1,8 @@
 package org.average.whereami;
 
 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;
 
@@ -48,7 +50,7 @@ public final class LastLocation extends Oracle {
 	}
 
 	@Override
-	public final String getResult() {
+	public final Utterance getResult() {
 		try {
 			Log.v(TAG, "entering getResult");
 			Latitude.CurrentLocation.Get request =
@@ -61,20 +63,23 @@ 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.e(TAG, "GoogleJsonResponseException: " + e);
 			if (e.getResponse().getStatusCode() == 401) {
-				return base.authErrorMessage;
+				return new Utterance(false,
+					base.authErrorMessage + "\n" +
+					e.getMessage());
 			} else {
-				return e.getMessage();
+				return new Utterance(false, e.getMessage());
 			}
                 } catch (HttpResponseException e) {
 			Log.e(TAG, "HttpResponseException: " + e);
-			return e.getMessage();
+			return new Utterance(false, e.getMessage());
 		} catch (IOException e) {
-			e.printStackTrace();
-			return e.getMessage();
+			Log.e(TAG, "IOException: " + e);
+			return new Utterance(false, e.getMessage());
                 }
 	}