X-Git-Url: http://www.average.org/gitweb/?p=WhereAmI.git;a=blobdiff_plain;f=src%2Forg%2Faverage%2Fwhereami%2FPhoneLog.java;fp=src%2Forg%2Faverage%2Fwhereami%2FPhoneLog.java;h=2665c340449914d3de40ae4352b12a562d2253d2;hp=3bb34d25effe10a1f194e0b0fce055adc7812265;hb=3a239c1eebf08ee80a1a05f0dc06fd54e52bf28d;hpb=037cb8fe34228adc45247498dff852a1af8d304f

diff --git a/src/org/average/whereami/PhoneLog.java b/src/org/average/whereami/PhoneLog.java
index 3bb34d2..2665c34 100644
--- a/src/org/average/whereami/PhoneLog.java
+++ b/src/org/average/whereami/PhoneLog.java
@@ -29,10 +29,12 @@ public final class PhoneLog extends Oracle {
 	private String calendar_name;
 	private String peer_name;
 	private String calendar_id;
+	private String nocalendar;
 
 	public PhoneLog(final Resources res, final PersistentStore store) {
 		super(res, store);
 		this.store = store;
+		nocalendar = res.getString(R.string.nocalendar);
 		calendar_name = store.get("calendar_name");
 		peer_name = store.get("peer_name");
 		calendar_id = store.get("calendar_id");
@@ -50,7 +52,12 @@ public final class PhoneLog extends Oracle {
 				calendar_id = scanCalendars(calendar_name);
 				store.put("calendar_id", calendar_id);
 			}
-			return scanEvents(calendar_id, peer_name);
+			if (calendar_id == null || calendar_id == "") {
+				return scanEvents(calendar_id, peer_name);
+			} else {
+				return nocalendar + " \"" +
+					calendar_name + "\"";
+			}
 		} catch (GoogleJsonResponseException e) {
 			Log.v(TAG, "GoogleJsonResponseException: " + e);
 			if (e.getResponse().getStatusCode() == 401) {