[Merge] lp:~pat-mcgowan/messaging-app/fix-1278790 into lp:messaging-app

[Tiago Salem Herrmann]

Review: Needs Fixing

Thanks for the patch.
I left some comments.

You can check if the conversation is mms with the following code in ComposeBar.qml:

// more than one participant and mms group chat enabled or only one participant and any attachment
property var isMms = ((messages.participants.length > 1 && telepathyHelper.mmsGroupChat) || (messages.participants.length == 1 && attachments.count > 0))


Diff comments:

> === modified file 'src/qml/ComposeBar.qml'
> --- src/qml/ComposeBar.qml	2016-06-29 20:43:16 +0000
> +++ src/qml/ComposeBar.qml	2016-08-03 19:27:11 +0000
> @@ -301,7 +318,8 @@
>          style: Theme.createStyleComponent("TextAreaStyle.qml", textEntry)
>          anchors {
>              topMargin: units.gu(1)
> -            top: parent.top
> + //           top: parent.top

please remove this line.

> +            top: charCount.bottom
>              left: anchorPoint.right
>              leftMargin: units.gu(2)
>              right: sendButton.left
> 
> === modified file 'src/qml/messaging-app.qml'
> --- src/qml/messaging-app.qml	2016-07-21 19:47:04 +0000
> +++ src/qml/messaging-app.qml	2016-08-03 19:27:11 +0000
> @@ -19,6 +19,7 @@
>  import QtQuick 2.2
>  import QtQuick.Window 2.2
>  import Qt.labs.settings 1.0
> +import GSettings 1.0

I think this is not needed. You are using Settings from qt.labs package.
GSettings was removed from that app because it does not work for confined apps.

>  import Ubuntu.Components 1.3
>  import Ubuntu.Components.Popups 1.3
>  import Ubuntu.Telephony 0.1


-- 
https://code.launchpad.net/~pat-mcgowan/messaging-app/fix-1278790/+merge/301952
Your team Ubuntu Phablet Team is subscribed to branch lp:messaging-app.