Merge lp:~d.filoni/telegram-app/bug1564823 into lp:telegram-app

[Devid Antonio Filoni]

This MR fixes bug #1564823 : AsemanTools::stringLinks doesn't recognize all TLDs so a message is not shown if it contains a link with an unknown TLD (for example: .de). As parseText() is already used to replace plain links with HTML code, this branch recognize if a message has links searching for HTML code in parsed text message.
Tested on mako ;)

[Jin (jindallo)]

Hello @Devid,

Code looks good,
I will approve after verification done,
please wait for my feedback.

[Jin (jindallo)]

Verified pass locally,
I approve.

review: Approve

=== modified file 'telegram/app/qml/components/MessagesListItem.qml'
--- telegram/app/qml/components/MessagesListItem.qml	2016-09-28 18:34:44 +0000
+++ telegram/app/qml/components/MessagesListItem.qml	2016-11-01 21:19:24 +0000
@@ -36,14 +36,14 @@
 
     property Message message
     property string messageText: message.message
+    property string messageHtmlText: parseText(message.message)
     property User user: telegramObject.user(message.fromId)
     property User fwdUser: telegramObject.user(message.fwdFromId)
 
     property bool sent: message.sent
     property bool uploading: message.upload.fileId !== 0
 
-    property variant messageLinks: Tools.stringLinks(message.message)
-    property bool hasLink: messageLinks.length !== 0
+    property bool hasLink: htmlHasLinks(messageHtmlText)
     property bool allowLoadLinks: telegram.userData.isLoadLink(user.id)
 
     property alias maximumMediaHeight: message_media.maximumMediaHeight
@@ -63,6 +63,26 @@
     signal messageFocusRequest(int msgId);
     signal previewRequest(int type, string path)
 
+    // Taken from messaging-app
+    function parseText(text) {
+        var phoneExp = /(\+?([0-9]+[ ]?)?\(?([0-9]+)\)?[-. ]?([0-9]+)[-. ]?([0-9]+)[-. ]?([0-9]+))/img;
+        // remove html tags
+        text = text.replace(/</g,'&lt;').replace(/>/g,'<tt>&gt;</tt>');
+        // replace line breaks
+        text = text.replace(/(\n)+/g, '<br />');
+        // check for links
+        var htmlText = BaLinkify.linkify(text);
+        if (htmlText !== text) {
+            return htmlText;
+        }
+        // linkify phone numbers if no web links were found
+        return text.replace(phoneExp, '<a href="tel:///$1">$1</a>');
+    }
+
+    function htmlHasLinks(html) {
+        return html.indexOf('<a href="') !== -1;
+    }
+
 //    Connections {
 //        target: telegram.userData
 //        onLoadLinkChanged: {
@@ -248,21 +268,6 @@
 
                     Label {
                         id: message_text
-                        // Taken from messaging-app
-                        function parseText(text) {
-                            var phoneExp = /(\+?([0-9]+[ ]?)?\(?([0-9]+)\)?[-. ]?([0-9]+)[-. ]?([0-9]+)[-. ]?([0-9]+))/img;
-                            // remove html tags
-                            text = text.replace(/</g,'&lt;').replace(/>/g,'<tt>&gt;</tt>');
-                            // replace line breaks
-                            text = text.replace(/(\n)+/g, '<br />');
-                            // check for links
-                            var htmlText = BaLinkify.linkify(text);
-                            if (htmlText !== text) {
-                                return htmlText;
-                            }
-                            // linkify phone numbers if no web links were found
-                            return text.replace(phoneExp, '<a href="tel:///$1">$1</a>');
-                        }
 
                         anchors {
                             top: parent.top
@@ -276,7 +281,7 @@
                         horizontalAlignment: Text.AlignLeft
                         wrapMode: Text.WrapAtWordBoundaryOrAnywhere
                         textFormat: Text.RichText
-                        text: messageText // emojis.textToEmojiText(messageText)
+                        text: message_item.messageHtmlText // emojis.textToEmojiText(message_item.messageHtmlText)
 
                         onLinkActivated: {
                             if (link.slice(0,6) == "tag://") {
@@ -287,9 +292,6 @@
                         }
 
                         property real htmlWidth: Cutegram.htmlWidth(text)
-                        property string messageText: {
-                            return message_text.parseText(message.message)
-                        }
                     }
 
                     MessageStatus {