Merge pull request #465 from trilene/call-devices

Add Duplex call devices

2 files changed, 12 insertions, 6 deletions

diff --git a/resources/qml/MessageView.qml b/resources/qml/MessageView.qml

index 29115b00..dafca0f6 100644
--- a/resources/qml/MessageView.qml
+++ b/resources/qml/MessageView.qml
@@ -102,6 +102,7 @@ ListView {
 
                 Avatar {
                     id: messageUserAvatar
+
                     width: avatarSize
                     height: avatarSize
                     url: modelData ? chat.model.avatarUrl(modelData.userId).replace("mxc://", "image://MxcImage/") : ""
@@ -112,8 +113,8 @@ ListView {
 
                 Connections {
                     target: chat.model
-                    onRoomAvatarUrlChanged: { 
-                      messageUserAvatar.url = modelData ? chat.model.avatarUrl(modelData.userId).replace("mxc://", "image://MxcImage/") : ""
+                    onRoomAvatarUrlChanged: {
+                        messageUserAvatar.url = modelData ? chat.model.avatarUrl(modelData.userId).replace("mxc://", "image://MxcImage/") : "";
                     }
                 }
 
diff --git a/resources/qml/UserProfile.qml b/resources/qml/UserProfile.qml

index 37ae6de8..4797a38e 100644
--- a/resources/qml/UserProfile.qml
+++ b/resources/qml/UserProfile.qml
@@ -49,6 +49,7 @@ ApplicationWindow {
 
         Text {
             id: errorText
+
             text: "Error Text"
             color: "red"
             visible: opacity > 0
@@ -58,24 +59,28 @@ ApplicationWindow {
 
         SequentialAnimation {
             id: hideErrorAnimation
+
             running: false
+
             PauseAnimation {
                 duration: 4000
             }
+
             NumberAnimation {
                 target: errorText
                 property: 'opacity'
                 to: 0
                 duration: 1000
             }
+
         }
 
-        Connections{
+        Connections {
             target: profile
             onDisplayError: {
-                errorText.text = errorMessage
-                errorText.opacity = 1
-                hideErrorAnimation.restart()
+                errorText.text = errorMessage;
+                errorText.opacity = 1;
+                hideErrorAnimation.restart();
             }
         }