Merge branch 'custom' into 'master'

Don't override recurrence rules when they are complex

See merge request mer-core/nemo-qml-plugin-calendar!57

src/calendarutils.cpp

@@ -47,6 +47,7 @@
 #include <QFile>
 #include <QUrl>
 #include <QString>
+#include <QBitArray>
 #include <QByteArray>
 #include <QtDebug>
 
@@ -63,9 +64,9 @@ CalendarEvent::Recur CalendarUtils::convertRecurrence(const KCalCore::Event::Ptr
 
     if (rt == KCalCore::Recurrence::rDaily && freq == 1) {
         return CalendarEvent::RecurDaily;
-    } else if (rt == KCalCore::Recurrence::rWeekly && freq == 1) {
+    } else if (rt == KCalCore::Recurrence::rWeekly && freq == 1 && event->recurrence()->days().count(true) == 0) {
         return CalendarEvent::RecurWeekly;
-    } else if (rt == KCalCore::Recurrence::rWeekly && freq == 2) {
+    } else if (rt == KCalCore::Recurrence::rWeekly && freq == 2 && event->recurrence()->days().count(true) == 0) {
         return CalendarEvent::RecurBiweekly;
     } else if (rt == KCalCore::Recurrence::rMonthlyDay && freq == 1) {
         return CalendarEvent::RecurMonthly;

src/calendarworker.cpp

@@ -342,11 +342,6 @@ bool CalendarWorker::setRecurrence(KCalCore::Event::Ptr &event, CalendarEvent::R
 
     CalendarEvent::Recur oldRecur = CalendarUtils::convertRecurrence(event);
 
-    if (recur == CalendarEvent::RecurCustom) {
-        qWarning() << "Cannot assign RecurCustom, will assing RecurOnce";
-        recur = CalendarEvent::RecurOnce;
-    }
-
     if (recur == CalendarEvent::RecurOnce)
         event->recurrence()->clear();
 
@@ -370,6 +365,7 @@ bool CalendarWorker::setRecurrence(KCalCore::Event::Ptr &event, CalendarEvent::R
             event->recurrence()->setYearly(1);
             break;
         case CalendarEvent::RecurCustom:
+            // Unable to handle the recurrence rules, keep the existing ones.
             break;
         }
         return true;