Merge lp:~cellsoftware/telegram-app/1552201 into lp:telegram-app

[Ash]

Fixes 'read' status on secret chat.

[Jin (jindallo)]

Code looks good to me,
I will approve after get it verified locally.

[Jin (jindallo)]

Verified pass,
I approve.

review: Approve

=== modified file 'telegram/app/qml/AccountMessageList.qml'
--- telegram/app/qml/AccountMessageList.qml	2016-03-16 15:13:26 +0000
+++ telegram/app/qml/AccountMessageList.qml	2016-05-13 08:54:08 +0000
@@ -101,13 +101,20 @@
         property Document doc
     }
 
-    // Timer {
-    //     id: refresh_timer
-    //     repeat: true
-    //     interval: 10000
-    //     onTriggered: messages_model.refresh()
-    //     Component.onCompleted: start()
-    // }
+    //Timer refreshes MessagesModel to check if message(s) have been read or not
+    Timer {
+        id: refresh_timer
+        repeat: true
+        interval: 1500
+        onTriggered:{
+            messages_model.refresh()
+        }
+        Component.onCompleted:{
+            if (!isChat){
+                start()
+            }
+        }
+    }
 
     Image {
         anchors.fill: parent
@@ -338,7 +345,6 @@
             maximumFlickVelocity = maximumFlickVelocity * scaleFactor;
             flickDeceleration = flickDeceleration * scaleFactor;
         }
-
     }
 
     MouseArea {

=== modified file 'telegram/app/qml/components/MessagesListItem.qml'
--- telegram/app/qml/components/MessagesListItem.qml	2016-04-21 15:45:32 +0000
+++ telegram/app/qml/components/MessagesListItem.qml	2016-05-13 08:54:08 +0000
@@ -285,7 +285,7 @@
                             right: parent.right
                         }
 
-                        message: message_item.message
+                        message:  message_item.message;
                         hasMedia: message_item.hasMedia
 
                         property int deltaY: message_wrapper.timeFitsSide ? -units.dp(4) : height