Benoit Marty
3 months ago
committed by
GitHub
17 changed files with 283 additions and 27 deletions
@ -0,0 +1 @@
@@ -0,0 +1 @@
|
||||
Make Element Call widget URL configurable |
||||
@ -0,0 +1,42 @@
@@ -0,0 +1,42 @@
|
||||
/* |
||||
* Copyright (c) 2024 New Vector Ltd |
||||
* |
||||
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
* you may not use this file except in compliance with the License. |
||||
* You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0 |
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software |
||||
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
* See the License for the specific language governing permissions and |
||||
* limitations under the License. |
||||
*/ |
||||
|
||||
package io.element.android.features.call.impl.ui |
||||
|
||||
import androidx.compose.ui.tooling.preview.PreviewParameterProvider |
||||
import io.element.android.libraries.architecture.AsyncData |
||||
|
||||
open class CallScreenStateProvider : PreviewParameterProvider<CallScreenState> { |
||||
override val values: Sequence<CallScreenState> |
||||
get() = sequenceOf( |
||||
aCallScreenState(), |
||||
aCallScreenState(urlState = AsyncData.Failure(Exception("An error occurred"))), |
||||
) |
||||
} |
||||
|
||||
private fun aCallScreenState( |
||||
urlState: AsyncData<String> = AsyncData.Success("https://call.element.io/some-actual-call?with=parameters"), |
||||
userAgent: String = "", |
||||
isInWidgetMode: Boolean = false, |
||||
eventSink: (CallScreenEvents) -> Unit = {}, |
||||
): CallScreenState { |
||||
return CallScreenState( |
||||
urlState = urlState, |
||||
userAgent = userAgent, |
||||
isInWidgetMode = isInWidgetMode, |
||||
eventSink = eventSink, |
||||
) |
||||
} |
||||
@ -0,0 +1,61 @@
@@ -0,0 +1,61 @@
|
||||
/* |
||||
* Copyright (c) 2024 New Vector Ltd |
||||
* |
||||
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
* you may not use this file except in compliance with the License. |
||||
* You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0 |
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software |
||||
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
* See the License for the specific language governing permissions and |
||||
* limitations under the License. |
||||
*/ |
||||
|
||||
package io.element.android.features.call.impl.utils |
||||
|
||||
import com.squareup.anvil.annotations.ContributesBinding |
||||
import io.element.android.features.call.impl.wellknown.CallWellknownAPI |
||||
import io.element.android.libraries.core.coroutine.CoroutineDispatchers |
||||
import io.element.android.libraries.di.AppScope |
||||
import io.element.android.libraries.di.SingleIn |
||||
import io.element.android.libraries.matrix.api.core.SessionId |
||||
import io.element.android.libraries.network.RetrofitFactory |
||||
import kotlinx.coroutines.withContext |
||||
import retrofit2.HttpException |
||||
import timber.log.Timber |
||||
import java.net.HttpURLConnection |
||||
import javax.inject.Inject |
||||
|
||||
interface ElementCallBaseUrlProvider { |
||||
suspend fun provides(sessionId: SessionId): String? |
||||
} |
||||
|
||||
@SingleIn(AppScope::class) |
||||
@ContributesBinding(AppScope::class) |
||||
class DefaultElementCallBaseUrlProvider @Inject constructor( |
||||
private val retrofitFactory: RetrofitFactory, |
||||
private val coroutineDispatchers: CoroutineDispatchers, |
||||
) : ElementCallBaseUrlProvider { |
||||
private val apiCache = mutableMapOf<SessionId, CallWellknownAPI>() |
||||
|
||||
override suspend fun provides(sessionId: SessionId): String? = withContext(coroutineDispatchers.io) { |
||||
val domain = sessionId.value.substringAfter(":") |
||||
val callWellknownAPI = apiCache.getOrPut(sessionId) { |
||||
retrofitFactory.create("https://$domain") |
||||
.create(CallWellknownAPI::class.java) |
||||
} |
||||
try { |
||||
callWellknownAPI.getCallWellKnown().widgetUrl |
||||
} catch (e: HttpException) { |
||||
// Ignore Http 404, but re-throws any other exceptions |
||||
if (e.code() != HttpURLConnection.HTTP_NOT_FOUND) { |
||||
throw e |
||||
} |
||||
Timber.w(e, "Failed to fetch wellknown data") |
||||
null |
||||
} |
||||
} |
||||
} |
||||
@ -0,0 +1,35 @@
@@ -0,0 +1,35 @@
|
||||
/* |
||||
* Copyright (c) 2024 New Vector Ltd |
||||
* |
||||
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
* you may not use this file except in compliance with the License. |
||||
* You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0 |
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software |
||||
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
* See the License for the specific language governing permissions and |
||||
* limitations under the License. |
||||
*/ |
||||
|
||||
package io.element.android.features.call.impl.wellknown |
||||
|
||||
import kotlinx.serialization.SerialName |
||||
import kotlinx.serialization.Serializable |
||||
|
||||
/** |
||||
* Example: |
||||
* <pre> |
||||
* { |
||||
* "widget_url": "https://call.server.com" |
||||
* } |
||||
* </pre> |
||||
* . |
||||
*/ |
||||
@Serializable |
||||
data class CallWellKnown( |
||||
@SerialName("widget_url") |
||||
val widgetUrl: String? = null, |
||||
) |
||||
@ -0,0 +1,24 @@
@@ -0,0 +1,24 @@
|
||||
/* |
||||
* Copyright (c) 2024 New Vector Ltd |
||||
* |
||||
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
* you may not use this file except in compliance with the License. |
||||
* You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0 |
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software |
||||
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
* See the License for the specific language governing permissions and |
||||
* limitations under the License. |
||||
*/ |
||||
|
||||
package io.element.android.features.call.impl.wellknown |
||||
|
||||
import retrofit2.http.GET |
||||
|
||||
internal interface CallWellknownAPI { |
||||
@GET(".well-known/element/call.json") |
||||
suspend fun getCallWellKnown(): CallWellKnown |
||||
} |
||||
@ -0,0 +1,29 @@
@@ -0,0 +1,29 @@
|
||||
/* |
||||
* Copyright (c) 2024 New Vector Ltd |
||||
* |
||||
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
* you may not use this file except in compliance with the License. |
||||
* You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0 |
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software |
||||
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
* See the License for the specific language governing permissions and |
||||
* limitations under the License. |
||||
*/ |
||||
|
||||
package io.element.android.features.call.utils |
||||
|
||||
import io.element.android.features.call.impl.utils.ElementCallBaseUrlProvider |
||||
import io.element.android.libraries.matrix.api.core.SessionId |
||||
import io.element.android.tests.testutils.lambda.lambdaError |
||||
|
||||
class FakeElementCallBaseUrlProvider( |
||||
private val providesLambda: (SessionId) -> String? = { lambdaError() } |
||||
) : ElementCallBaseUrlProvider { |
||||
override suspend fun provides(sessionId: SessionId): String? { |
||||
return providesLambda(sessionId) |
||||
} |
||||
} |
||||
@ -0,0 +1,3 @@
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1 |
||||
oid sha256:68d9ca60586aac84157c60f126b17b70ca9d52087da80f253b60f47de87d7ff6 |
||||
size 13750 |
||||
Loading…
Reference in new issue