Merge lp:~boiko/messaging-app/remove_multiple_entries into lp:messaging-app

[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.

== Checklist ==
Are there any related MPs required for this MP to build/function as expected? Please list.
Yes: https://code.launchpad.net/~boiko/history-service/remove_multiple_entries/+merge/245607

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/<package-name>) on device or emulator?
Yes

If you changed the UI, was the change specified/approved by design?
N/A

If you changed UI labels, did you update the pot file?
N/A

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?
N/A

[lp:~boiko/messaging-app/remove_multiple_entries]

283. By Gustavo Pichorim Boiko on 2015-01-05

Update copyright headers.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:283
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/499/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/655
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/363
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/12
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/563
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/653
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/653/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16814
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/298
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/369
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/369/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/499/rebuild

review: Needs Fixing (continuous-integration)

[Tiago Salem Herrmann (tiagosh)]

Looks good.

--Checklist--
Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
Yes

Did CI run pass? If not, please explain why.
Yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes

review: Approve

=== modified file 'src/qml/MMSDelegate.qml'
--- src/qml/MMSDelegate.qml	2014-09-30 19:19:34 +0000
+++ src/qml/MMSDelegate.qml	2015-01-05 20:35:30 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012, 2013, 2014 Canonical Ltd.
+ * Copyright 2012-2015 Canonical Ltd.
  *
  * This file is part of messaging-app.
  *
@@ -40,10 +40,7 @@
 
     function deleteMessage()
     {
-        eventModel.removeEvent(messageData.accountId,
-                               messageData.threadId,
-                               messageData.eventId,
-                               messageData.type)
+        eventModel.removeEvents([messageData.properties]);
     }
 
     function resendMessage()
@@ -65,10 +62,7 @@
             attachment.push(item.filePath)
             newAttachments.push(attachment)
         }
-        eventModel.removeEvent(messageData.accountId,
-                               messageData.threadId,
-                               messageData.eventId,
-                               messageData.type)
+        eventModel.removeEvents([messageData.properties]);
         // FIXME: export this information for MessageDelegate
         chatManager.sendMMS(participants, textMessage, newAttachments, messages.account.accountId)
     }

=== modified file 'src/qml/MainPage.qml'
--- src/qml/MainPage.qml	2014-12-04 13:26:48 +0000
+++ src/qml/MainPage.qml	2015-01-05 20:35:30 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012, 2013, 2014 Canonical Ltd.
+ * Copyright 2012-2015 Canonical Ltd.
  *
  * This file is part of messaging-app.
  *
@@ -216,12 +216,17 @@
             }
         }
         onSelectionDone: {
+            var threadsToRemove = [];
             for (var i=0; i < items.count; i++) {
                 var threads = items.get(i).model.threads
                 for (var j in threads) {
-                    threadModel.removeThread(threads[j].accountId, threads[j].threadId, threads[j].type)
+                    threadsToRemove.push(threads[j]);
                 }
             }
+
+            if (threadsToRemove.length > 0) {
+                threadModel.removeThreads(threadsToRemove);
+            }
         }
     }
 

=== modified file 'src/qml/MessagesListView.qml'
--- src/qml/MessagesListView.qml	2014-10-07 16:57:03 +0000
+++ src/qml/MessagesListView.qml	2015-01-05 20:35:30 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012, 2013, 2014 Canonical Ltd.
+ * Copyright 2012-2015 Canonical Ltd.
  *
  * This file is part of messaging-app.
  *
@@ -122,12 +122,16 @@
 
     onSelectionDone: {
         var removeDividers = (items.count == eventModel.count)
+        var events = [];
         for (var i=0; i < items.count; i++) {
             var event = items.get(i).model
             if (!removeDividers && event.textMessageType == HistoryThreadModel.MessageTypeInformation) {
                 continue;
             }
-            eventModel.removeEvent(event.accountId, event.threadId, event.eventId, event.type)
+            events.push(event.properties);
+        }
+        if (events.length > 0) {
+            eventModel.removeEvents(events);
         }
     }
 

=== modified file 'src/qml/SMSDelegate.qml'
--- src/qml/SMSDelegate.qml	2014-09-30 19:19:34 +0000
+++ src/qml/SMSDelegate.qml	2015-01-05 20:35:30 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012, 2013, 2014 Canonical Ltd.
+ * Copyright 2012-2015 Canonical Ltd.
  *
  * This file is part of messaging-app.
  *
@@ -26,10 +26,7 @@
 
     function deleteMessage()
     {
-        eventModel.removeEvent(root.messageData.accountId,
-                               root.messageData.threadId,
-                               root.messageData.eventId,
-                               root.messageData.type)
+        eventModel.removeEvents([root.messageData.properties]);
     }
 
     function resendMessage()
@@ -38,10 +35,7 @@
             return
         }
 
-        eventModel.removeEvent(root.messageData.accountId,
-                               root.messageData.threadId,
-                               root.messageData.eventId,
-                               root.messageData.type)
+        eventModel.removeEvents([root.messageData.properties]);
         // FIXME: export this information for MessageDelegate
         chatManager.sendMessage(messages.participants, textMessage, messages.account.accountId)
     }

=== modified file 'src/qml/ThreadDelegate.qml'
--- src/qml/ThreadDelegate.qml	2014-10-21 16:17:17 +0000
+++ src/qml/ThreadDelegate.qml	2015-01-05 20:35:30 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2013 Canonical Ltd.
+ * Copyright 2012-2015 Canonical Ltd.
  *
  * This file is part of messaging-app.
  *
@@ -104,9 +104,7 @@
         iconName: "delete"
         text: i18n.tr("Delete")
         onTriggered: {
-            for (var i in threads) {
-                threadModel.removeThread(threads[i].accountId, threads[i].threadId, threads[i].type)
-            }
+            threadModel.removeThreads(model.threads);
         }
     }