qml interop: refactor and remove utilsadapter from clientwrapper
- Separate utilsadapter into files and expose it to Qml so it can
be used without passing through clientwrapper.
Change-Id: I7c351d7191cd166521b6e0a685ea9d4a9731f165
Gitlab: #66
diff --git a/src/mainview/components/VideoCallPage.qml b/src/mainview/components/VideoCallPage.qml
index 5ec8c82..7d57e82 100644
--- a/src/mainview/components/VideoCallPage.qml
+++ b/src/mainview/components/VideoCallPage.qml
@@ -1,4 +1,3 @@
-
/*
* Copyright (C) 2020 by Savoir-faire Linux
* Author: Mingrui Zhang <mingrui.zhang@savoirfairelinux.com>
@@ -17,12 +16,14 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
+
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls.Universal 2.12
import QtGraphicalEffects 1.14
import net.jami.Models 1.0
+import net.jami.Adapters 1.0
import "../../commoncomponents"
@@ -44,9 +45,9 @@
function updateUI(accountId, convUid) {
videoCallOverlay.handleParticipantsInfo(CallAdapter.getConferencesInfos())
- bestName = ClientWrapper.utilsAdaptor.getBestName(accountId, convUid)
+ bestName = UtilsAdapter.getBestName(accountId, convUid)
- var id = ClientWrapper.utilsAdaptor.getBestId(accountId, convUid)
+ var id = UtilsAdapter.getBestId(accountId, convUid)
bestId = (bestName !== id) ? id : ""
}
@@ -78,7 +79,7 @@
function handleParticipantsInfo(infos) {
if (infos.length === 0) {
- bestName = ClientWrapper.utilsAdaptor.getBestName(accountId, convUid)
+ bestName = UtilsAdapter.getBestName(accountId, convUid)
} else {
bestName = ""
}