filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ElementWeb does not pass confId as a URL parameter anymore (and so does Element Android)

Browse Source
This commit is contained in:
Benoit Marty 2021-02-05 13:50:13 +01:00
parent 6ecd63bf5d
commit dbe14ce0bb
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewModel.kt
View File

@ -64,14 +64,12 @@ class JitsiCallViewModel @AssistedInject constructor(
.subscribe { .subscribe {
val jitsiWidget = it.firstOrNull() val jitsiWidget = it.firstOrNull()
if (jitsiWidget != null) { if (jitsiWidget != null) {
val uri = Uri.parse(jitsiWidget.computedUrl)
val confId = uri.getQueryParameter("confId")
val ppt = jitsiWidget.computedUrl?.let { url -> JitsiWidgetProperties(url, stringProvider) } val ppt = jitsiWidget.computedUrl?.let { url -> JitsiWidgetProperties(url, stringProvider) }
setState { setState {
copy( copy(
widget = Success(jitsiWidget), widget = Success(jitsiWidget),
jitsiUrl = "https://${ppt?.domain}", jitsiUrl = "https://${ppt?.domain}",
confId = confId ?: "", confId = ppt?.confId ?: "",
subject = roomName ?: "" subject = roomName ?: ""
) )
} }

1
vector/src/main/java/im/vector/app/features/call/conference/JitsiWidgetProperties.kt
View File

@ -22,6 +22,7 @@ import im.vector.app.core.resources.StringProvider
class JitsiWidgetProperties(private val uriString: String, val stringProvider: StringProvider) { class JitsiWidgetProperties(private val uriString: String, val stringProvider: StringProvider) {
val domain: String by lazy { configs["conferenceDomain"] ?: stringProvider.getString(R.string.preferred_jitsi_domain) } val domain: String by lazy { configs["conferenceDomain"] ?: stringProvider.getString(R.string.preferred_jitsi_domain) }
val confId: String? by lazy { configs["conferenceId"] }
val displayName: String? by lazy { configs["displayName"] } val displayName: String? by lazy { configs["displayName"] }
val avatarUrl: String? by lazy { configs["avatarUrl"] } val avatarUrl: String? by lazy { configs["avatarUrl"] }