Merge lp:~boiko/dialer-app/rtm-remove_multiple_entries into lp:dialer-app/rtm-14.09

[Gustavo Pichorim Boiko]

Remove multiple entries all at once instead of using multiple calls.

Remove multiple entries all at once instead of using multiple calls.

=== modified file 'src/qml/HistoryPage/HistoryDetailsPage.qml'
--- src/qml/HistoryPage/HistoryDetailsPage.qml	2014-12-16 01:39:49 +0000
+++ src/qml/HistoryPage/HistoryDetailsPage.qml	2015-01-09 12:05:45 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014-2015 Canonical Ltd.
  *
  * This file is part of dialer-app.
  *
@@ -73,9 +73,7 @@
             iconName: "delete"
             text: i18n.tr("Delete")
             onTriggered: {
-                for (var i in events) {
-                    eventModel.removeEvent(events[i].accountId, events[i].threadId, events[i].eventId, events[i].type);
-                }
+                eventModel.removeEvents(events);
                 pageStack.pop();
             }
         }
@@ -244,7 +242,7 @@
                 text: i18n.tr("Delete")
                 onTriggered:  {
                     // remove from the history service
-                    eventModel.removeEvent(modelData.accountId, modelData.threadId, modelData.eventId, modelData.type)
+                    eventModel.removeEvents([modelData]);
 
                     // as this page only displays an array of events, we need to update manually
                     // the list of displayed events
 
=== modified file 'src/qml/HistoryPage/HistoryPage.qml'
--- src/qml/HistoryPage/HistoryPage.qml	2014-12-08 12:47:23 +0000
+++ src/qml/HistoryPage/HistoryPage.qml	2015-01-09 12:05:45 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2013 Canonical Ltd.
+ * Copyright 2012-2015 Canonical Ltd.
  *
  * This file is part of dialer-app.
  *
@@ -191,9 +191,15 @@
         listModel: historyEventModel
 
         onSelectionDone: {
+            var events = [];
             for (var i=0; i < items.count; i++) {
-                var event = items.get(i).model
-                historyEventModel.removeEvent(event.accountId, event.threadId, event.eventId, event.type)
+                var eventGroup = items.get(i).model.events
+                for (var j in eventGroup) {
+                    events.push(eventGroup[j]);
+                }
+            }
+            if (events.length > 0) {
+                historyEventModel.removeEvents(events)
             }
         }
         onIsInSelectionModeChanged: {
@@ -308,10 +314,7 @@
                     iconName: "delete"
                     text: i18n.tr("Delete")
                     onTriggered:  {
-                        var events = model.events;
-                        for (var i in events) {
-                            historyEventModel.removeEvent(events[i].accountId, events[i].threadId, events[i].eventId, events[i].type)
-                        }
+                        historyEventModel.removeEvents(model.events)
                     }
                 }
                 property bool knownNumber: participants[0] != "x-ofono-private" && participants[0] != "x-ofono-unknown"