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

[Gustavo Pichorim Boiko]

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.

=== modified file 'src/qml/HistoryPage/HistoryDelegate.qml'
--- src/qml/HistoryPage/HistoryDelegate.qml	2014-12-16 01:39:49 +0000
+++ src/qml/HistoryPage/HistoryDelegate.qml	2015-02-10 17:35:31 +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-13 12:08:06 +0000
+++ src/qml/HistoryPage/HistoryDetailsPage.qml	2015-02-10 17:35:31 +0000
@@ -261,14 +261,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-02-10 17:35:31 +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)))