Merge lp:~tiagosh/dialer-app/fix-1410500 into lp:dialer-app

[Tiago Salem Herrmann]

Change HistoryDetailsPage to display the exact phone number that was used on each call and populate the Dialpad accordingly.

Change HistoryDetailsPage to display the exact phone number that was used on each call and populate the Dialpad accordingly.

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

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/dialer-app) on device or emulator?
Yes

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

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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:337
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/504/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-vivid-i386-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/888
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/418
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/778
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/886
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/886/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17249
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/341
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/473
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/473/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[lp:~tiagosh/dialer-app/fix-1410500]

338. By Tiago Salem Herrmann on 2015-01-27

merge trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:338
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/506/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-vivid-i386-ci/16
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1031/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/478
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/912/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1029
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1029/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17524
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/386
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/584
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/584/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[lp:~tiagosh/dialer-app/fix-1410500]

339. By Tiago Salem Herrmann on 2015-01-28

add autopilot test

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:339
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/508/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-vivid-i386-ci/18
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1060/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/496
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/938/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1058
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1058/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17576
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/399
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/602
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/602/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

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.
No, but not related to the changes

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

Code looks good and works as expected!

review: Approve

=== modified file 'src/qml/HistoryPage/HistoryDelegate.qml'
--- src/qml/HistoryPage/HistoryDelegate.qml	2014-10-21 14:19:11 +0000
+++ src/qml/HistoryPage/HistoryDelegate.qml	2015-01-28 21:11:55 +0000
@@ -51,7 +51,7 @@
         }
 
         // clicking an item only populates the dialpad view, it doesn't call directly
-        mainView.populateDialpad(participant.phoneNumber, mainView.account ? mainView.account.accountId : "");
+        mainView.populateDialpad(model.remoteParticipant, mainView.account ? mainView.account.accountId : "");
     }
 
     function selectCallType()  {

=== modified file 'src/qml/HistoryPage/HistoryDetailsPage.qml'
--- src/qml/HistoryPage/HistoryDetailsPage.qml	2015-01-08 21:23:40 +0000
+++ src/qml/HistoryPage/HistoryDetailsPage.qml	2015-01-28 21:11:55 +0000
@@ -256,14 +256,30 @@
                     left: parent.left
                     verticalCenter: parent.verticalCenter
                 }
+                verticalAlignment: Qt.AlignVCenter
+            }
+
+            Label {
+                id: remoteParticipantId
+                // FIXME: we need to check if the id is actually a phone number
+                text: PhoneUtils.PhoneUtils.format(modelData.remoteParticipant)
+                anchors {
+                    left: timeLabel.right
+                    leftMargin: units.gu(1)
+                    verticalCenter: parent.verticalCenter
+                }
                 color: UbuntuColors.lightAubergine
                 verticalAlignment: Qt.AlignVCenter
+                MouseArea {
+                    anchors.fill:parent
+                    onClicked: mainView.populateDialpad(modelData.remoteParticipant, mainView.account ? mainView.account.accountId : "");
+                }
             }
 
             Label {
                 id: simLabel
                 anchors {
-                    left: timeLabel.right
+                    left: remoteParticipantId.right
                     leftMargin: units.gu(1)
                     verticalCenter: timeLabel.verticalCenter
                 }

=== modified file 'tests/autopilot/dialer_app/tests/test_calls.py'
--- tests/autopilot/dialer_app/tests/test_calls.py	2014-09-30 00:49:13 +0000
+++ tests/autopilot/dialer_app/tests/test_calls.py	2015-01-28 21:11:55 +0000
@@ -170,3 +170,28 @@
         except MismatchError as e:
             print('Expected failure due to known Mir crash '
                   '(https://launchpad.net/bugs/1240400): %s' % e)
+
+    def test_last_called_number(self):
+        number = "1234567"
+        formattedNumber = "1 234-567"
+
+        number2 = "1231234567"
+        formattedNumber2 = "1 231-234-567"
+
+        self.main_view.dialer_page.call_number(number, formattedNumber)
+        time.sleep(1)
+        self.main_view.live_call_page.click_hangup_button()
+        self.main_view.dialer_page.active.wait_for(True)
+
+        self.main_view.dialer_page.call_number(number2, formattedNumber2)
+        time.sleep(1)
+        self.main_view.live_call_page.click_hangup_button()
+        self.main_view.dialer_page.active.wait_for(True)
+
+        self.main_view.dialer_page.reveal_bottom_edge_page()
+        self.assertThat(self.history_list.visible, Eventually(Equals(True)))
+        self.assertThat(self.history_list.count, Eventually(Equals(1)))
+        historyEntry = self.get_history_for_number(number)
+        self.main_view._click_button(historyEntry)
+        self.assertThat(
+            self.main_view.dialer_page.dialNumber, Eventually(Equals(formattedNumber2)))