From 85e8e652f1ca2ee161c9af0dc2ade7eb5a2425bc Mon Sep 17 00:00:00 2001 From: ganfra Date: Wed, 8 Jul 2020 17:32:54 +0200 Subject: [PATCH] Fix IM terms of review path --- .../java/im/vector/riotx/features/widgets/WidgetViewModel.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vector/src/main/java/im/vector/riotx/features/widgets/WidgetViewModel.kt b/vector/src/main/java/im/vector/riotx/features/widgets/WidgetViewModel.kt index d516137bc5..89d597c4dc 100644 --- a/vector/src/main/java/im/vector/riotx/features/widgets/WidgetViewModel.kt +++ b/vector/src/main/java/im/vector/riotx/features/widgets/WidgetViewModel.kt @@ -16,6 +16,7 @@ package im.vector.riotx.features.widgets +import android.net.Uri import androidx.lifecycle.viewModelScope import com.airbnb.mvrx.ActivityViewModelContext import com.airbnb.mvrx.Fail @@ -236,7 +237,9 @@ class WidgetViewModel @AssistedInject constructor(@Assisted val initialState: Wi _viewEvents.post(WidgetViewEvents.OnURLFormatted(formattedUrl)) } catch (failure: Throwable) { if (failure is WidgetManagementFailure.TermsNotSignedException) { - _viewEvents.post(WidgetViewEvents.DisplayTerms(initialState.baseUrl, failure.token)) + // Terms for IM shouldn't have path appended + val displayTermsBaseUrl = Uri.parse(initialState.baseUrl).buildUpon().path("").toString() + _viewEvents.post(WidgetViewEvents.DisplayTerms(displayTermsBaseUrl, failure.token)) } setState { copy(formattedURL = Fail(failure)) } }