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

[Gustavo Pichorim Boiko]

Acknowledge pending messages before removing the threads.

Acknowledge pending messages before removing the threads.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:429
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/639/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4012
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/152
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3275
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4009
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4009/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23051

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

review: Needs Fixing (continuous-integration)

[Tiago Salem Herrmann (tiagosh)]

review: Needs Fixing

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

430. By Gustavo Pichorim Boiko on 2015-09-24

Fix retrieving the participants whose messages should be acknowledge

431. By Gustavo Pichorim Boiko on 2015-09-24

Also cover the case when multi-selecting the threads and removing them.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:430
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/648/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4349
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/161
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3545
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4346
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4346/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23648

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:431
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/649/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4355/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/162
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3551/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4352
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4352/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23655

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:431
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/650/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4381
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/163
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3567
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4378
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4378/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23709

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

review: Needs Fixing (continuous-integration)

=== modified file 'src/qml/MainPage.qml'
--- src/qml/MainPage.qml	2015-04-30 22:47:38 +0000
+++ src/qml/MainPage.qml	2015-09-24 20:32:11 +0000
@@ -235,7 +235,7 @@
             }
 
             if (threadsToRemove.length > 0) {
-                threadModel.removeThreads(threadsToRemove);
+                mainView.removeThreads(threadsToRemove);
             }
         }
     }

=== modified file 'src/qml/ThreadDelegate.qml'
--- src/qml/ThreadDelegate.qml	2015-04-08 22:00:19 +0000
+++ src/qml/ThreadDelegate.qml	2015-09-24 20:32:11 +0000
@@ -95,7 +95,7 @@
         iconName: "delete"
         text: i18n.tr("Delete")
         onTriggered: {
-            threadModel.removeThreads(model.threads);
+            mainView.removeThreads(model.threads)
         }
     }
 

=== modified file 'src/qml/messaging-app.qml'
--- src/qml/messaging-app.qml	2015-07-15 23:32:27 +0000
+++ src/qml/messaging-app.qml	2015-09-24 20:32:11 +0000
@@ -83,6 +83,20 @@
         }
     }
 
+    function removeThreads(threads) {
+        // extract the participant IDs from one of the threads
+        var thread = threads[0];
+        var participants = thread.participants;
+
+        // and acknowledge all messages for the threads to be removed
+        for (var i in threads) {
+            chatManager.acknowledgeAllMessages(participants, threads[i].accountId)
+        }
+
+        // at last remove the threads
+        threadModel.removeThreads(threads);
+    }
+
     Connections {
         target: telepathyHelper
         // restore default bindings if any system settings changed