From 7f288263991e16b58d60c42d40c0bf504aafcdfd Mon Sep 17 00:00:00 2001 From: campbeb Date: Sun, 22 Jan 2012 14:13:29 +0900 Subject: Fix #1021 Make sure the add on exits when dialog is no longer displayed (either cancelled or calendar chosen). --- cgeo-calendar/src/cgeo/calendar/CalendarActivity.java | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'cgeo-calendar') diff --git a/cgeo-calendar/src/cgeo/calendar/CalendarActivity.java b/cgeo-calendar/src/cgeo/calendar/CalendarActivity.java index 530ecf0..191fc19 100644 --- a/cgeo-calendar/src/cgeo/calendar/CalendarActivity.java +++ b/cgeo-calendar/src/cgeo/calendar/CalendarActivity.java @@ -123,6 +123,13 @@ public final class CalendarActivity extends Activity { final Integer[] keys = calendars.keySet().toArray(new Integer[calendars.size()]); final Integer calendarId = keys[item]; addToCalendar(calendarId); + finish(); + } + }); + builder.setOnCancelListener(new DialogInterface.OnCancelListener() { + @Override + public void onCancel(DialogInterface dialog) { + finish(); } }); builder.create().show(); -- cgit v1.1 From 348eda6b3d5518bb0f4e070679ea73091e2a3867 Mon Sep 17 00:00:00 2001 From: campbeb Date: Sun, 22 Jan 2012 14:15:26 +0900 Subject: Remove finish() in onCreate --- cgeo-calendar/src/cgeo/calendar/CalendarActivity.java | 1 - 1 file changed, 1 deletion(-) (limited to 'cgeo-calendar') diff --git a/cgeo-calendar/src/cgeo/calendar/CalendarActivity.java b/cgeo-calendar/src/cgeo/calendar/CalendarActivity.java index 191fc19..300a630 100644 --- a/cgeo-calendar/src/cgeo/calendar/CalendarActivity.java +++ b/cgeo-calendar/src/cgeo/calendar/CalendarActivity.java @@ -57,7 +57,6 @@ public final class CalendarActivity extends Activity { finish(); return; } - finish(); } private String getParameter(final String paramKey) { -- cgit v1.1