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;
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 =
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 (IOException e) {
- e.printStackTrace();
- return e.getMessage();
+ Log.e(TAG, "IOException: " + e);
+ return new Utterance(false, e.getMessage());
}
}
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) {