Merge lp:~tiagosh/messaging-app/fix-1192442 into lp:messaging-app

[Tiago Salem Herrmann]

Parse messages and add links when necessary.

Parse messages and add links when necessary.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:41
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/61/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4134
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1778
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-saucy-amd64-ci/61
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-saucy-armhf-ci/61
        deb: http://jenkins.qa.ubuntu.com/job/messaging-app-saucy-armhf-ci/61/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-saucy-i386-ci/61
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/435
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4261
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4261/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1780
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1780/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1483
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1495

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:43
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/62/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4135
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1779
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-saucy-amd64-ci/62
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-saucy-armhf-ci/62
        deb: http://jenkins.qa.ubuntu.com/job/messaging-app-saucy-armhf-ci/62/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-saucy-i386-ci/62
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/436
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4262
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4262/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1781
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1781/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1484
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1496

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

review: Approve (continuous-integration)

[Dennis O'Flaherty (doflah)]

Isn't the toString redundant? I think replace should be returning a string already.

Once this gets merged in, I had written some code to convert :), :(, <3 etc to their Unicode equivalents - would that be worth adding to the app inside parseText?

[Tiago Salem Herrmann (tiagosh)]

You are right, just removed to redundant toString()'s.

About the symbols, we need to get a feedback from designers first whether we should use unicode equivalents or images from provided by the theme

Thanks.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:44
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/63/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4183
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1851
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-saucy-amd64-ci/63
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-saucy-armhf-ci/63
        deb: http://jenkins.qa.ubuntu.com/job/messaging-app-saucy-armhf-ci/63/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-saucy-i386-ci/63
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/478
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/50
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/50/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1853
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1853/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1549
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1561

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

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Looks good and works as expected!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/messaging-app-autolanding/34/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4193/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1860
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-saucy-amd64-autolanding/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-saucy-armhf-autolanding/34
        deb: http://jenkins.qa.ubuntu.com/job/messaging-app-saucy-armhf-autolanding/34/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-saucy-i386-autolanding/34
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/489/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/61
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/61/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1862
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1862/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1556
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1568

review: Needs Fixing (continuous-integration)

[Francis Ginther (fginther)]

More severe than normal network issues in the lab today. re-approved.

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/qml/MessageDelegate.qml'
--- src/qml/MessageDelegate.qml	2013-08-12 17:51:12 +0000
+++ src/qml/MessageDelegate.qml	2013-09-30 13:23:18 +0000
@@ -115,7 +115,17 @@
                 fontSize: "medium"
                 color: textColor
                 opacity: incoming ? 1 : 0.9
-                text: textMessage
+                text: parseText(textMessage)
+                onLinkActivated:  Qt.openUrlExternally(link)
+                function parseText(text) {
+                    // remove html tags
+                    text = text.replace(/(<([^>]+)>)/ig,"");
+                    // replace line breaks
+                    text = text.replace(/(\n)+/g, '<br />');
+                    // check for links
+                    return text.replace(new RegExp("(\\s?)((http|https|ftp)://[^\\s<]+[^\\s<\.)])", "img"), '$1<a href="$2">$2</a>');
+                }
+
             }
         }
     }