conference: show avatar for videoMuted peer

GitLab: #379
Change-Id: I885ad338d7a5c06fca7c765680e644c44f33228d

src/avatarimageprovider.h

@@ -65,7 +65,7 @@ public:
         } else if (idType == "contact") {
             return Utils::contactPhoto(lrcInstance_, idContent, requestedSize);
         } else if (idType == "fallback") {
-            return Utils::fallbackAvatar(QString(), idContent, requestedSize);
+            return Utils::fallbackAvatar(idContent, QString(), requestedSize);
         } else if (idType == "default") {
             return Utils::fallbackAvatar(QString(), QString(), requestedSize);
         } else if (idType == "base64") {

src/calladapter.cpp

@@ -339,6 +339,7 @@ CallAdapter::fillParticipantData(QMap<QString, QString> participant)
     data["videoMuted"] = participant["videoMuted"] == "true";
     data["audioLocalMuted"] = participant["audioLocalMuted"] == "true";
     data["audioModeratorMuted"] = participant["audioModeratorMuted"] == "true";
+    data["isContact"] = false;
 
     auto bestName = participant["uri"];
     auto& accInfo = lrcInstance_->accountModel().getAccountInfo(accountId_);
@@ -356,7 +357,7 @@ CallAdapter::fillParticipantData(QMap<QString, QString> participant)
                 participant["uri"]);
             if (participant["videoMuted"] == "true")
                 data["avatar"] = contact.profileInfo.avatar;
-
+            data["isContact"] = true;
         } catch (...) {
         }
     }

src/mainview/components/CallOverlay.qml

@@ -130,9 +130,9 @@ Rectangle {
                     participantOverlays[p].setMenu(participant.uri, participant.bestName,
                                                    participant.isLocal, participant.active, showMax)
                     if (participant.videoMuted)
-                        participantOverlays[p].setAvatar(participant.avatar)
+                        participantOverlays[p].setAvatar(true, participant.avatar, participant.uri, participant.isLocal, participant.isContact)
                     else
-                        participantOverlays[p].setAvatar("")
+                        participantOverlays[p].setAvatar(false)
                     currentUris.push(participantOverlays[p].uri)
                 } else {
                     // Participant is no longer in conference
@@ -173,9 +173,9 @@ Rectangle {
                     hover.setMenu(infos[infoVariant].uri, infos[infoVariant].bestName,
                                   infos[infoVariant].isLocal, infos[infoVariant].active, showMax)
                     if (infos[infoVariant].videoMuted)
-                        hover.setAvatar(infos[infoVariant].avatar)
+                        hover.setAvatar(true, infos[infoVariant].avatar, infos[infoVariant].uri, infos[infoVariant].isLocal, infos[infoVariant].isContact)
                     else
-                        hover.setAvatar("")
+                        hover.setAvatar(false)
                     participantOverlays.push(hover)
                 }
             }

src/mainview/components/ParticipantOverlay.qml

@@ -47,15 +47,26 @@ Rectangle {
     property bool participantIsModerator: false
     property bool participantIsMuted: false
     property bool participantIsModeratorMuted: false
-
     property bool participantMenuActive: false
 
-    // TODO: try to use AvatarImage as well
-    function setAvatar(avatar) {
-        if (avatar === "") {
-            contactImage.source = ""
+    function setAvatar(show, avatar, uri, local, isContact) {
+        if (!show)
+            contactImage.visible = false
+        else {
+            if (avatar) {
+                contactImage.mode = AvatarImage.Mode.FromBase64
+                contactImage.updateImage(avatar)
+            } else if (local) {
+                contactImage.mode = AvatarImage.Mode.FromAccount
+                contactImage.updateImage(AccountAdapter.currentAccountId)
+            } else if (isContact) {
+                contactImage.mode = AvatarImage.Mode.FromContactUri
+                contactImage.updateImage(uri)
             } else {
-            contactImage.source = JamiQmlUtils.base64StringTitle + avatar
+                contactImage.mode = AvatarImage.Mode.FromTemporaryName
+                contactImage.updateImage(uri)
+            }
+            contactImage.visible = true
         }
     }
 
@@ -173,24 +184,7 @@ Rectangle {
         }
     }
 
-    // Participant background, mousearea, hover and buttons for moderation
-    Rectangle {
-        id: participantRect
-
-        anchors.fill: parent
-        opacity: 0
-        color: "transparent"
-        z: 1
-
-        MouseArea {
-            id: mouseAreaHover
-
-            anchors.fill: parent
-            hoverEnabled: true
-            propagateComposedEvents: true
-            acceptedButtons: Qt.LeftButton
-
-            Image {
+    AvatarImage {
         id: contactImage
 
         anchors.centerIn: parent
@@ -198,8 +192,10 @@ Rectangle {
         width:  Math.min(parent.width / 2, parent.height / 2)
 
         fillMode: Image.PreserveAspectFit
-                source: ""
-                asynchronous: true
+        imageId: ""
+        visible: false
+        mode: AvatarImage.Mode.Default
+        showPresenceIndicator: false
 
         layer.enabled: true
         layer.effect: OpacityMask {
@@ -217,16 +213,31 @@ Rectangle {
         layer.smooth: true
     }
 
+    // Participant background, mousearea, hover and buttons for moderation
+    Rectangle {
+        id: participantRect
+
+        anchors.fill: parent
+        opacity: 0
+        color: "transparent"
+        z: 1
+
+        MouseArea {
+            id: mouseAreaHover
+
+            anchors.fill: parent
+            hoverEnabled: true
+            propagateComposedEvents: true
+            acceptedButtons: Qt.LeftButton
+
             ParticipantOverlayMenu {
                 id: overlayMenu
                 visible: participantRect.opacity !== 0
 
                 onMouseAreaExited: {
-                    if (contactImage.status === Image.Null) {
                     root.z = 1
                     participantRect.state = "exited"
                 }
-                }
                 onMouseChanged: {
                     participantRect.state = "entered"
                     fadeOutTimer.restart()
@@ -235,18 +246,14 @@ Rectangle {
             }
 
             onEntered: {
-                if (contactImage.status === Image.Null) {
                 root.z = 2
                 participantRect.state = "entered"
             }
-            }
 
             onExited: {
-                if (contactImage.status === Image.Null) {
                 root.z = 1
                 participantRect.state = "exited"
             }
-            }
 
             onMouseXChanged: {
                 // Hack: avoid listening mouseXChanged emitted when