Fix check for default calendar

pull/281/head
Alex Baker 9 years ago
parent 6acef7a37b
commit e55abf397e

@ -141,9 +141,7 @@ public class GCalControlSet extends TaskEditControlSetBase {
return; return;
} }
boolean gcalCreateEventEnabled = gcal.getDefaultCalendar() != null && if ((gcal.isDefaultCalendarSet() || calendarSelector.getSelectedItemPosition() != 0) &&
!gcal.getDefaultCalendar().equals("-1");
if ((gcalCreateEventEnabled || calendarSelector.getSelectedItemPosition() != 0) &&
calendarUri == null) { calendarUri == null) {
try{ try{

@ -75,14 +75,16 @@ public class GCalHelper {
createTaskEventIfEnabled(t, true); createTaskEventIfEnabled(t, true);
} }
public String getDefaultCalendar() { public boolean isDefaultCalendarSet() {
return getDefaultCalendar() != null && !getDefaultCalendar().equals("-1") && !getDefaultCalendar().equals("0");
}
private String getDefaultCalendar() {
return preferences.getStringValue(R.string.gcal_p_default); return preferences.getStringValue(R.string.gcal_p_default);
} }
private void createTaskEventIfEnabled(Task t, boolean deleteEventIfExists) { private void createTaskEventIfEnabled(Task t, boolean deleteEventIfExists) {
boolean gcalCreateEventEnabled = getDefaultCalendar() != null if (isDefaultCalendarSet()) {
&& !getDefaultCalendar().equals("-1"); //$NON-NLS-1$
if (gcalCreateEventEnabled) {
ContentResolver cr = context.getContentResolver(); ContentResolver cr = context.getContentResolver();
Uri calendarUri = createTaskEvent(t, cr, new ContentValues(), deleteEventIfExists); Uri calendarUri = createTaskEvent(t, cr, new ContentValues(), deleteEventIfExists);
if (calendarUri != null) { if (calendarUri != null) {

@ -40,9 +40,7 @@ public class TaskCreator {
} }
public void addToCalendar(Task task, String title) { public void addToCalendar(Task task, String title) {
boolean gcalCreateEventEnabled = gcalHelper.getDefaultCalendar() != null boolean gcalCreateEventEnabled = gcalHelper.isDefaultCalendarSet() && task.hasDueDate(); //$NON-NLS-1$
&& !gcalHelper.getDefaultCalendar().equals("-1") && task.hasDueDate(); //$NON-NLS-1$
if (!TextUtils.isEmpty(title) && gcalCreateEventEnabled && TextUtils.isEmpty(task.getCalendarURI())) { if (!TextUtils.isEmpty(title) && gcalCreateEventEnabled && TextUtils.isEmpty(task.getCalendarURI())) {
Uri calendarUri = gcalHelper.createTaskEvent(task, Uri calendarUri = gcalHelper.createTaskEvent(task,
context.getContentResolver(), new ContentValues()); context.getContentResolver(), new ContentValues());

@ -42,7 +42,7 @@
android:key="@string/p_default_reminders_mode_key" android:key="@string/p_default_reminders_mode_key"
android:title="@string/EPr_default_reminders_mode_title" /> android:title="@string/EPr_default_reminders_mode_title" />
<com.todoroo.astrid.ui.MultilineListPreference <com.todoroo.astrid.ui.MultilineListPreference
android:defaultValue="0" android:defaultValue="-1"
android:entries="@array/EPr_default_addtocalendar" android:entries="@array/EPr_default_addtocalendar"
android:entryValues="@array/EPr_default_addtocalendar_values" android:entryValues="@array/EPr_default_addtocalendar_values"
android:key="@string/gcal_p_default" android:key="@string/gcal_p_default"

Loading…
Cancel
Save