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

diff --git a/src/org/average/whereami/PhoneLog.java b/src/org/average/whereami/PhoneLog.java
index 2e2b30b..cf904c6 100644
--- a/src/org/average/whereami/PhoneLog.java
+++ b/src/org/average/whereami/PhoneLog.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;
 
@@ -66,32 +68,37 @@ public final class PhoneLog extends Oracle {
 	}
 
 	@Override
-	public final String getResult() {
+	public final Utterance getResult() {
 		try {
 			Log.v(TAG, "entering getResult");
 			if (calendar_id == null || calendar_id == "") {
 				calendar_id = scanCalendars(calendar_name);
 			}
 			if (calendar_id == null || calendar_id == "") {
-				return nocalendar + " \"" +
-					calendar_name + "\"";
+				return new Utterance(true,
+					nocalendar + " \"" +
+					calendar_name + "\"");
 			} else {
 				base.store.put("calendar_id", calendar_id);
-				return scanEvents(calendar_id, peer_name);
+				return new Utterance(true,
+					scanEvents(calendar_id, peer_name));
 			}
 		} 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());
 		}
 	}