From dae035aa763c8044d435442187f016eddf813da4 Mon Sep 17 00:00:00 2001 From: ganfra Date: Thu, 26 Aug 2021 17:14:25 +0200 Subject: [PATCH] Fix Jitsi-hosted jitsi conferences not loading (#2846) --- changelog.d/2846.bugfix | 1 + .../features/call/conference/JitsiWidgetPropertiesFactory.kt | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 changelog.d/2846.bugfix diff --git a/changelog.d/2846.bugfix b/changelog.d/2846.bugfix new file mode 100644 index 0000000000..1669ea1cf9 --- /dev/null +++ b/changelog.d/2846.bugfix @@ -0,0 +1 @@ +Jitsi-hosted jitsi conferences not loading \ No newline at end of file diff --git a/vector/src/main/java/im/vector/app/features/call/conference/JitsiWidgetPropertiesFactory.kt b/vector/src/main/java/im/vector/app/features/call/conference/JitsiWidgetPropertiesFactory.kt index 8014e01fb2..cf4896a3e1 100644 --- a/vector/src/main/java/im/vector/app/features/call/conference/JitsiWidgetPropertiesFactory.kt +++ b/vector/src/main/java/im/vector/app/features/call/conference/JitsiWidgetPropertiesFactory.kt @@ -27,8 +27,7 @@ class JitsiWidgetPropertiesFactory @Inject constructor( private val stringProvider: StringProvider ) { fun create(url: String): JitsiWidgetProperties { - val configString = tryOrNull { Uri.parse(url) }?.fragment - + val configString = tryOrNull { Uri.parse(url) }?.encodedQuery val configs = configString?.split("&") ?.map { it.split("=") } ?.filter { it.size == 2 } @@ -38,7 +37,7 @@ class JitsiWidgetPropertiesFactory @Inject constructor( return JitsiWidgetProperties( domain = configs["conferenceDomain"] ?: stringProvider.getString(R.string.preferred_jitsi_domain), - confId = configs["conferenceId"], + confId = configs["conferenceId"] ?: configs["confId"], displayName = configs["displayName"], avatarUrl = configs["avatarUrl"] )