Merge lp:~boiko/history-service/rtm-remove_multiple_entries into lp:history-service/rtm-14.09

[Gustavo Pichorim Boiko]

Make it possible to delete multiple entries from QML.

Make it possible to delete multiple entries from QML.

=== modified file 'Ubuntu/History/historyeventmodel.cpp'
--- Ubuntu/History/historyeventmodel.cpp	2014-09-24 20:10:24 +0000
+++ Ubuntu/History/historyeventmodel.cpp	2015-01-09 12:06:16 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2014 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * Authors:
  *  Gustavo Pichorim Boiko <[e-mail]>
@@ -190,10 +190,31 @@
     return mRoles;
 }
 
-bool HistoryEventModel::removeEvent(const QString &accountId, const QString &threadId, const QString &eventId, int eventType)
+bool HistoryEventModel::removeEvents(const QVariantList &eventsProperties)
 {
-    History::Event event = History::Manager::instance()->getSingleEvent((History::EventType)eventType, accountId, threadId, eventId);
-    return History::Manager::instance()->removeEvents(History::Events() << event);
+    History::Events events;
+    Q_FOREACH(const QVariant &entry, eventsProperties) {
+        QVariantMap eventProperties = entry.toMap();
+        History::Event event;
+        switch (eventProperties[History::FieldType].toInt()) {
+        case History::EventTypeText:
+            event = History::TextEvent::fromProperties(eventProperties);
+            break;
+        case History::EventTypeVoice:
+            event = History::VoiceEvent::fromProperties(eventProperties);
+            break;
+        }
+
+        if (!event.isNull()) {
+            events << event;
+        }
+    }
+
+    if (events.isEmpty()) {
+        return false;
+    }
+
+    return History::Manager::instance()->removeEvents(events);
 }
 
 bool HistoryEventModel::removeEventAttachment(const QString &accountId, const QString &threadId, const QString &eventId, int eventType, const QString &attachmentId)

=== modified file 'Ubuntu/History/historyeventmodel.h'
--- Ubuntu/History/historyeventmodel.h	2014-09-24 20:10:24 +0000
+++ Ubuntu/History/historyeventmodel.h	2015-01-09 12:06:16 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2014 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * Authors:
  *  Gustavo Pichorim Boiko <[e-mail]>
@@ -60,7 +60,7 @@
 
     virtual QHash<int, QByteArray> roleNames() const;
 
-    Q_INVOKABLE bool removeEvent(const QString &accountId, const QString &threadId, const QString &eventId, int eventType);
+    Q_INVOKABLE bool removeEvents(const QVariantList &eventsProperties);
     Q_INVOKABLE bool markEventAsRead(const QString &accountId, const QString &threadId, const QString &eventId, int eventType);
     Q_INVOKABLE bool removeEventAttachment(const QString &accountId, const QString &threadId, const QString &eventId, int eventType, const QString &attachmentId);
 

=== modified file 'Ubuntu/History/historythreadmodel.cpp'
--- Ubuntu/History/historythreadmodel.cpp	2014-09-09 22:56:16 +0000
+++ Ubuntu/History/historythreadmodel.cpp	2015-01-09 12:06:16 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2014 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * Authors:
  *  Gustavo Pichorim Boiko <[e-mail]>
@@ -213,10 +213,23 @@
     return mRoles;
 }
 
-bool HistoryThreadModel::removeThread(const QString &accountId, const QString &threadId, int eventType)
+bool HistoryThreadModel::removeThreads(const QVariantList &threadsProperties)
 {
-    History::Thread thread = History::Manager::instance()->getSingleThread((History::EventType)eventType, accountId, threadId);
-    return History::Manager::instance()->removeThreads(History::Threads() << thread);
+    History::Threads threads;
+    Q_FOREACH(const QVariant &entry, threadsProperties) {
+        QVariantMap threadProperties = entry.toMap();
+        History::Thread thread = History::Thread::fromProperties(threadProperties);
+
+        if (!thread.isNull()) {
+            threads << thread;
+        }
+    }
+
+    if (threads.isEmpty()) {
+        return false;
+    }
+
+    return History::Manager::instance()->removeThreads(threads);
 }
 
 void HistoryThreadModel::updateQuery()

=== modified file 'Ubuntu/History/historythreadmodel.h'
--- Ubuntu/History/historythreadmodel.h	2014-09-09 18:17:44 +0000
+++ Ubuntu/History/historythreadmodel.h	2015-01-09 12:06:16 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2014 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * Authors:
  *  Gustavo Pichorim Boiko <[e-mail]>
@@ -67,7 +67,7 @@
 
     virtual QHash<int, QByteArray> roleNames() const;
 
-    Q_INVOKABLE bool removeThread(const QString &accountId, const QString &threadId, int eventType);
+    Q_INVOKABLE bool removeThreads(const QVariantList &threadsProperties);
 
 protected Q_SLOTS:
     virtual void updateQuery();