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

[Devid Antonio Filoni]

This MR enables audio receiving support (so it partially fixes bug #1375179), all the code was already there, I don't know why it was disabled, it was already disabled in initial bzr commit so there is no history about that change. This commit also fixes the color palette (using Qt SystemPalette) which was not declared and the seekbar position which sometimes was not properly updated at track end.
Tested on mako, OTA-13.

[Andrea Bernabei (faenil)]

It was disabled because Ubuntu Touch was missing the Opus codec, which has only very recently been added to the OS.

See https://bugs.launchpad.net/ubuntu/+source/media-hub/+bug/1460464

In any case, thanks a lot for taking the time to add the feature back! This is a great addition now that all the pieces of the puzzle are available! :)

[Devid Antonio Filoni (d.filoni)]

Thank you! I was a bit scared about this change as the code was disabled but your comment reassured me ;)

[Jin (jindallo)]

The patch looks good,
I will approve after validation done.

Thanks for this contribution.

[Jin (jindallo)]

Hello @Devid,

Thanks for the patch,
but there is a defect we found in testing:
    a) Try to get an audio message from other client
    b) It shows "Photo/Sticker" on main view (AccountPage)

I think we could manage a way to make it sense,
so that will be more reasonable to our user :)

[Jin (jindallo)]

review: Needs Information

[Devid Antonio Filoni (d.filoni)]

Hi Jin,
I noticed that too, but I'm not sure about how to fix it as in DialogsListItem we only have a switch between the following actions:
    property real typeMessageActionChatCreate: 0xa6638b9a
    property real typeMessageActionChatAddUser: 0x5e3cfc4b
    property real typeMessageActionChatDeleteUser: 0xb2ae9b0c
    property real typeMessageActionChatJoinedByLink: 0xf89cf5e8
    property real typeMessageActionChatSentImage: 0xB6AEF7B0
    property real typeMessageActionChatChangeTitle: 0xB5A1CE5A

Photo/Sticker is printed when matching typeMessageActionChatSentImage so ATM in DialogsListItem code there is no way to recognize one type between images and audio files and I have no ideas about how to fix that :( Please point me to a direction so I can fix it ;)

[Jin (jindallo)]

Hello @Devid,

Thanks for the information,
actually the typeMessageActionChatSentImage is mapping to messageActionEmpty on our library,
well, that's not good since we only support image showing before,
but now we have sticker and your audio!

So let's have a look on this way:
    a) add a boolean isStick by telegram.documentIsSticker() function to check if it is a sticker
    b) add a boolean isAudioMessage by file_handler.targetType to check if it is a image
then we have a way to do that as you want! Take a try,
any problems you can post here and I will help you to get it done :)

[lp:~d.filoni/telegram-app/audio_receiving]

233. By Devid Antonio Filoni on 2016-10-04

Show voice message info in DialogsListItem component

[Devid Antonio Filoni (d.filoni)]

@Jin: many thanks! I committed the change

[Jin (jindallo)]

Hello @Devid,

The code looks good,
I will verify it for you,
thanks!

[Jin (jindallo)]

Hello @Devid,

Verified pass,
but we still have a suggestion on the showing string/text,
our app. is referring the design of Android so:
    res = i18n.tr("<font color=\"DarkBlue\">Photo</font>")
    res = i18n.tr("<font color=\"DarkBlue\">Sticker</font>")
    res = i18n.tr("<font color=\"DarkBlue\">Voice message</font>")
are good enough. Would you kindly give this a patch then we will merge that for you.

Again, thanks for the contribution!

[Devid Antonio Filoni (d.filoni)]

Hi @Jin,
I'm sorry for this, I don't have an Android/iOS device and I used the web
app/existing code as reference.
No problem, I'll commit this once I'm back at home ;)
Thank you!

On Wed, Oct 5, 2016 at 8:42 AM, Jin <email address hidden> wrote:

> Hello @Devid,
>
> Verified pass,
> but we still have a suggestion on the showing string/text,
> our app. is referring the design of Android so:
> res = i18n.tr("<font color=\"DarkBlue\">Photo</font>")
> res = i18n.tr("<font color=\"DarkBlue\">Sticker</font>")
> res = i18n.tr("<font color=\"DarkBlue\">Voice message</font>")
> are good enough. Would you kindly give this a patch then we will merge
> that for you.
>
> Again, thanks for the contribution!
>
> --
> https://code.launchpad.net/~d.filoni/telegram-app/audio_
> receiving/+merge/307072
> You are the owner of lp:~d.filoni/telegram-app/audio_receiving.
>

[lp:~d.filoni/telegram-app/audio_receiving]

234. By Devid Antonio Filoni on 2016-10-05

Fix DialogsListItem labels according to design spec

[Jin (jindallo)]

Code is good and verified pass,
I approve.

review: Approve

=== modified file 'telegram/app/qml/AccountMessageMedia.qml'
--- telegram/app/qml/AccountMessageMedia.qml	2016-09-05 10:26:19 +0000
+++ telegram/app/qml/AccountMessageMedia.qml	2016-10-05 20:43:58 +0000
@@ -32,17 +32,15 @@
     property variant mediaPlayer
     property bool isAudioMessage: file_handler.targetType == FileHandler.TypeTargetMediaAudio
     onIsAudioMessageChanged: {
-        /*
         if(isAudioMessage) {
             if(mediaPlayer)
                 mediaPlayer.destroy()
-            //mediaPlayer = media_player_component.createObject(msg_media)
+            mediaPlayer = media_player_component.createObject(msg_media)
         } else {
             if(mediaPlayer)
                 mediaPlayer.destroy()
             mediaPlayer = 0
         }
-        */
     }
 
     signal mediaClicked(int type, string path);
@@ -269,7 +267,7 @@
                     return Qt.resolvedUrl("qrc:/qml/files/attachment_download.png");
                 }
             }
-            visible: !downloading && !msg_media.isAudioMessage
+            visible: !downloading
         }
 
         Label {
@@ -323,7 +321,7 @@
             right: parent.right
             rightMargin: units.dp(4)
         }
-        visible: msg_media.showStatus && file_handler.targetType != FileHandler.TypeTargetMediaAudio
+        visible: msg_media.showStatus
 
         message: msg_media.message
         hasMedia: msg_media.hasMedia

=== modified file 'telegram/app/qml/MediaPlayerItem.qml'
--- telegram/app/qml/MediaPlayerItem.qml	2015-09-22 09:57:07 +0000
+++ telegram/app/qml/MediaPlayerItem.qml	2016-10-05 20:43:58 +0000
@@ -10,6 +10,10 @@
 
     property alias filePath: player.source
 
+    SystemPalette {
+        id: masterPalette
+    }
+
     DropShadow {
         anchors.fill: play_btn_scene
         radius: 4.0
@@ -101,7 +105,7 @@
 
         Rectangle {
             anchors.left: parent.left
-            anchors.right: seeker.horizontalCenter
+            anchors.right: (player.status == MediaPlayer.EndOfMedia) ? parent.right : seeker.horizontalCenter
             height: parent.height
             radius: parent.radius
             color: masterPalette.highlight

=== modified file 'telegram/app/qml/components/DialogsListItem.qml'
--- telegram/app/qml/components/DialogsListItem.qml	2016-06-16 11:19:41 +0000
+++ telegram/app/qml/components/DialogsListItem.qml	2016-10-05 20:43:58 +0000
@@ -33,6 +33,8 @@
     property bool showMessage: true
     property Message message: telegram.message(dialog.topMessage)
     property variant messageDate: CalendarConv.fromTime_t(message.date)
+    property bool isAudioMessage: file_handler.targetType == FileHandler.TypeTargetMediaAudio
+    property alias isSticker: file_handler.isSticker
 
     property bool online: isChat ? false : (user.status.classType == image.typeUserStatusOnline)
 
@@ -51,6 +53,12 @@
     signal currentIndexChanged(int index);
     signal currentDialogChanged(Dialog dialog);
 
+    FileHandler {
+        id: file_handler
+        telegram: telegramObject
+        target: message
+    }
+
     leadingActions: ListItemActions {
         actions: [
             Action {
@@ -220,7 +228,12 @@
 
                         case typeMessageActionChatSentImage:
                             if (fromUserName != "") {
-                                res = i18n.tr("<font color=\"DarkBlue\">Photo/Sticker</font>")
+                                if (isAudioMessage)
+                                    res = i18n.tr("<font color=\"DarkBlue\">Voice message</font>")
+                                else if (isSticker)
+                                    res = i18n.tr("<font color=\"DarkBlue\">Sticker</font>")
+                                else
+                                    res = i18n.tr("<font color=\"DarkBlue\">Photo</font>")
                             }
                             break
 

=== modified file 'telegram/app/qml/components/MessagesListItem.qml'
--- telegram/app/qml/components/MessagesListItem.qml	2016-07-22 06:27:59 +0000
+++ telegram/app/qml/components/MessagesListItem.qml	2016-10-05 20:43:58 +0000
@@ -244,7 +244,7 @@
                     // Math.max(message_status.x + message_status.width - message_text_frame.x)//, column.maxWidthNoMsg)
                     height: childrenRect.height
                     anchors.left: parent.left
-                    visible: !hasMedia || message_media.isAudioMessage
+                    visible: !hasMedia
 
                     Label {
                         id: message_text
@@ -288,11 +288,7 @@
 
                         property real htmlWidth: Cutegram.htmlWidth(text)
                         property string messageText: {
-                            if (message_media.isAudioMessage) {
-                                return i18n.tr("Audio attachment not supported yet ;(")
-                            } else {
-                                return message_text.parseText(message.message)
-                            }
+                            return message_text.parseText(message.message)
                         }
                     }