Merge pull request #1293 from campbeb/fixCalFocus

Fix #1016 - Finish the activity if exiting on error

1 files changed, 3 insertions, 1 deletions

diff --git a/cgeo-calendar/src/cgeo/calendar/CalendarActivity.java b/cgeo-calendar/src/cgeo/calendar/CalendarActivity.java
index b339954..226b486 100644
--- a/cgeo-calendar/src/cgeo/calendar/CalendarActivity.java
+++ b/cgeo-calendar/src/cgeo/calendar/CalendarActivity.java
@@ -85,11 +85,11 @@ public final class CalendarActivity extends Activity {
         final String[] projection = new String[] { "_id", "displayName" };
         final Uri calendarProvider = Compatibility.getCalendarProviderURI();
 
-        // TODO: Handle missing provider
         final Cursor cursor = managedQuery(calendarProvider, projection, "selected=1", null, null);
 
         if (cursor == null || cursor.getCount() <= 0) {
             showToast(getResources().getString(R.string.event_fail));
+            finish();
             return;
         }
 
@@ -116,6 +116,8 @@ public final class CalendarActivity extends Activity {
         } while (cursor.moveToNext());
 
         if (calendars.isEmpty()) {
+            showToast(getResources().getString(R.string.event_fail));
+            finish();
             return;
         }