dialer-app

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

  1. rtm-remove_multiple_entries
  2. Merge into rtm-14.09
Proposed by Gustavo Pichorim Boiko
Status: Merged
Approved by: Bill Filler
Approved revision: 249
Merged at revision: 249
Proposed branch: lp:~boiko/dialer-app/rtm-remove_multiple_entries
Merge into: lp:dialer-app/rtm-14.09
Diff against target: 71 lines (+13/-12)
2 files modified
src/qml/HistoryPage/HistoryDetailsPage.qml (+3/-5)
src/qml/HistoryPage/HistoryPage.qml (+10/-7)
To merge this branch: bzr merge lp:~boiko/dialer-app/rtm-remove_multiple_entries
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team Pending
Review via email: mp+245943@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/qml/HistoryPage/HistoryDetailsPage.qml'
2--- src/qml/HistoryPage/HistoryDetailsPage.qml 2014-12-16 01:39:49 +0000
3+++ src/qml/HistoryPage/HistoryDetailsPage.qml 2015-01-09 12:05:45 +0000
4@@ -1,5 +1,5 @@
5 /*
6- * Copyright 2014 Canonical Ltd.
7+ * Copyright 2014-2015 Canonical Ltd.
8 *
9 * This file is part of dialer-app.
10 *
11@@ -73,9 +73,7 @@
12 iconName: "delete"
13 text: i18n.tr("Delete")
14 onTriggered: {
15- for (var i in events) {
16- eventModel.removeEvent(events[i].accountId, events[i].threadId, events[i].eventId, events[i].type);
17- }
18+ eventModel.removeEvents(events);
19 pageStack.pop();
20 }
21 }
22@@ -244,7 +242,7 @@
23 text: i18n.tr("Delete")
24 onTriggered: {
25 // remove from the history service
26- eventModel.removeEvent(modelData.accountId, modelData.threadId, modelData.eventId, modelData.type)
27+ eventModel.removeEvents([modelData]);
28
29 // as this page only displays an array of events, we need to update manually
30 // the list of displayed events
31
32=== modified file 'src/qml/HistoryPage/HistoryPage.qml'
33--- src/qml/HistoryPage/HistoryPage.qml 2014-12-08 12:47:23 +0000
34+++ src/qml/HistoryPage/HistoryPage.qml 2015-01-09 12:05:45 +0000
35@@ -1,5 +1,5 @@
36 /*
37- * Copyright 2012-2013 Canonical Ltd.
38+ * Copyright 2012-2015 Canonical Ltd.
39 *
40 * This file is part of dialer-app.
41 *
42@@ -191,9 +191,15 @@
43 listModel: historyEventModel
44
45 onSelectionDone: {
46+ var events = [];
47 for (var i=0; i < items.count; i++) {
48- var event = items.get(i).model
49- historyEventModel.removeEvent(event.accountId, event.threadId, event.eventId, event.type)
50+ var eventGroup = items.get(i).model.events
51+ for (var j in eventGroup) {
52+ events.push(eventGroup[j]);
53+ }
54+ }
55+ if (events.length > 0) {
56+ historyEventModel.removeEvents(events)
57 }
58 }
59 onIsInSelectionModeChanged: {
60@@ -308,10 +314,7 @@
61 iconName: "delete"
62 text: i18n.tr("Delete")
63 onTriggered: {
64- var events = model.events;
65- for (var i in events) {
66- historyEventModel.removeEvent(events[i].accountId, events[i].threadId, events[i].eventId, events[i].type)
67- }
68+ historyEventModel.removeEvents(model.events)
69 }
70 }
71 property bool knownNumber: participants[0] != "x-ofono-private" && participants[0] != "x-ofono-unknown"

Subscribers

People subscribed via source and target branches