From 55a27edd911f6836d0b4b4c43d5df6cef3c2668b Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Wed, 23 Jan 2013 16:49:53 -0800 Subject: [PATCH] Fixed rrule parsing issues --- api/src/com/todoroo/astrid/data/Task.java | 2 +- .../plugin-src/com/todoroo/astrid/repeats/RepeatControlSet.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/src/com/todoroo/astrid/data/Task.java b/api/src/com/todoroo/astrid/data/Task.java index 5849de7de..234a63296 100644 --- a/api/src/com/todoroo/astrid/data/Task.java +++ b/api/src/com/todoroo/astrid/data/Task.java @@ -510,7 +510,7 @@ public final class Task extends RemoteModel { } public String sanitizedRecurrence() { - return getValue(Task.RECURRENCE).replaceAll(";?FROM=[^;]*", ""); //$NON-NLS-1$//$NON-NLS-2$ + return getValue(Task.RECURRENCE).replaceAll("BYDAY=;","").replaceAll(";?FROM=[^;]*", ""); //$NON-NLS-1$//$NON-NLS-2$ } /** diff --git a/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatControlSet.java b/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatControlSet.java index 526455278..eb6ee9b79 100644 --- a/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatControlSet.java +++ b/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatControlSet.java @@ -371,7 +371,7 @@ public class RepeatControlSet extends PopupControlSet { result = result + ";FROM=COMPLETION"; //$NON-NLS-1$ } - if (!result.equals(task.getValue(Task.RECURRENCE))) + if (!result.equals(task.getValue(Task.RECURRENCE).replaceAll("BYDAY=;", ""))) //$NON-NLS-1$//$NON-NLS-2$ task.putTransitory(TaskService.TRANS_REPEAT_CHANGED, true); task.setValue(Task.RECURRENCE, result); task.setValue(Task.REPEAT_UNTIL, repeatUntilValue);