Merge lp:~tiagosh/telephony-service/fix-1433068 into lp:telephony-service

[Tiago Salem Herrmann]

Check if targetContact() returns a valid pointer before using it.

--Checklist--
Are there any related MPs required for this MP to build/function as expected? Please list.
No

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

Check if targetContact() returns a valid pointer before using it.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1041
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/382/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-amd64-ci/50
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-armhf-ci/50
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-armhf-ci/50/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-i386-ci/50

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telephony-service-ci/382/rebuild

review: Approve (continuous-integration)

[lp:~tiagosh/telephony-service/fix-1433068]

1042. By Tiago Salem Herrmann on 2015-04-14

merge trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1042
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/412/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-amd64-ci/80
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-armhf-ci/80/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-i386-ci/80/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telephony-service-ci/412/rebuild

review: Needs Fixing (continuous-integration)

[lp:~tiagosh/telephony-service/fix-1433068]

1043. By Tiago Salem Herrmann on 2015-06-09

merge trunk

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1043
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/464/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-amd64-ci/136
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-armhf-ci/132
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-armhf-ci/132/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-i386-ci/132

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telephony-service-ci/464/rebuild

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Looks good and works as expected!

review: Approve

Unmerged revisions

=== modified file 'libtelephonyservice/callentry.cpp'
--- libtelephonyservice/callentry.cpp	2015-04-28 20:44:57 +0000
+++ libtelephonyservice/callentry.cpp	2015-06-09 21:59:57 +0000
@@ -295,7 +295,7 @@
 
 QString CallEntry::phoneNumber() const
 {
-    if (mChannel->isConference() || !mChannel->actualFeatures().contains(Tp::CallChannel::FeatureCore)) {
+    if (mChannel->isConference() || !mChannel->actualFeatures().contains(Tp::CallChannel::FeatureCore) || mChannel->targetContact().isNull()) {
         return "";
     }
     return mChannel->targetContact()->id();