From f3c7913f16ad38b13c3bde152a68ac7a882cf613 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Calvi=C3=B1o=20S=C3=A1nchez?= Date: Wed, 28 Aug 2024 08:20:00 +0200 Subject: [PATCH] Get signaling settings by room when starting a call MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is necessary to get the specific federation properties for the room. Signed-off-by: Daniel Calviño Sánchez --- .../main/java/com/nextcloud/talk/activities/CallActivity.kt | 2 +- app/src/main/java/com/nextcloud/talk/utils/ApiUtils.kt | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt index 21696470a..4ce448f33 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt @@ -1453,7 +1453,7 @@ class CallActivity : CallBaseActivity() { private fun fetchSignalingSettings() { Log.d(TAG, "fetchSignalingSettings") val apiVersion = ApiUtils.getSignalingApiVersion(conversationUser, intArrayOf(ApiUtils.API_V3, 2, 1)) - ncApi!!.getSignalingSettings(credentials, ApiUtils.getUrlForSignalingSettings(apiVersion, baseUrl)) + ncApi!!.getSignalingSettings(credentials, ApiUtils.getUrlForSignalingSettings(apiVersion, baseUrl, roomToken!!)) .subscribeOn(Schedulers.io()) .retry(API_RETRIES) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.kt b/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.kt index c0168c413..fb4e6a770 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.kt +++ b/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.kt @@ -283,6 +283,10 @@ object ApiUtils { return getUrlForSignaling(version, baseUrl) + "/settings" } + fun getUrlForSignalingSettings(version: Int, baseUrl: String?, token: String): String { + return getUrlForSignaling(version, baseUrl) + "/settings?token=" + token + } + fun getUrlForSignaling(version: Int, baseUrl: String?, token: String): String { return getUrlForSignaling(version, baseUrl) + "/" + token }