Merge lp:~boiko/dialer-app/cached_contact_info into lp:dialer-app

[Gustavo Pichorim Boiko]

Adapt dialer to the latest changes in history-service and telephony-service.

Adapt dialer to the latest changes in history-service and telephony-service.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:469
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/600/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-vivid-i386-ci/113
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4655
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3756
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4652
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4652/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24231

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

review: Needs Fixing (continuous-integration)

[Tiago Salem Herrmann (tiagosh)]

Looks good.
thanks.

review: Approve

=== modified file 'src/qml/HistoryPage/HistoryDelegate.qml'
--- src/qml/HistoryPage/HistoryDelegate.qml	2015-05-21 18:52:21 +0000
+++ src/qml/HistoryPage/HistoryDelegate.qml	2015-10-15 13:58:09 +0000
@@ -146,7 +146,7 @@
         width: height
         fallbackAvatarUrl: (participant.avatar  && participant.avatar !== "") ? participant.avatar : "image://theme/stock_contact"
         fallbackDisplayName: (participant.alias && participant.alias !== "") ? participant.alias : phoneNumber
-        showAvatarPicture: (fallbackAvatarUrl != "image://theme/stock_contact") || (initials.length === 0)
+        showAvatarPicture: (fallbackAvatarUrl != "image://theme/stock_contact") || (initials.length === 0) || !interactive
     }
 
     Label {

=== modified file 'src/qml/HistoryPage/HistoryPage.qml'
--- src/qml/HistoryPage/HistoryPage.qml	2015-06-18 20:01:14 +0000
+++ src/qml/HistoryPage/HistoryPage.qml	2015-10-15 13:58:09 +0000
@@ -105,7 +105,7 @@
         visible: false
         property variant model: Item {
             property string senderId: "dummy"
-            property variant participants: [ {phoneNumber:"dummy"} ]
+            property variant participants: [ {identifier:"dummy"} ]
         }
     }
 
@@ -317,7 +317,7 @@
                         historyEventModel.removeEvents(model.events)
                     }
                 }
-                property bool knownNumber: participants[0] != "x-ofono-private" && participants[0] != "x-ofono-unknown"
+                property bool knownNumber: participants[0].identifier != "x-ofono-private" && participants[0].identifier != "x-ofono-unknown"
                 rightSideActions: [
                     Action {
                         iconName: "info"