Skip to content

Commit 93cd197

Browse files
authored
Fix custom sticker url loading (#8290)
1 parent ed121c0 commit 93cd197

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

changelog.d/8026.bugfix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Maunium sticker picker loads indefinitely on new update

vector/src/main/java/im/vector/app/features/widgets/WidgetFragment.kt

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ class WidgetFragment :
218218

219219
override fun invalidate() = withState(viewModel) { state ->
220220
Timber.v("Invalidate state: $state")
221-
when (state.formattedURL) {
221+
when (val formattedUrl = state.formattedURL) {
222222
Uninitialized,
223223
is Loading -> {
224224
setStateError(null)
@@ -227,6 +227,9 @@ class WidgetFragment :
227227
views.widgetProgressBar.isVisible = true
228228
}
229229
is Success -> {
230+
if (views.widgetWebView.url == null) {
231+
loadFormattedUrl(formattedUrl())
232+
}
230233
setStateError(null)
231234
when (state.webviewLoadedUrl) {
232235
Uninitialized -> {
@@ -253,7 +256,7 @@ class WidgetFragment :
253256
// we need to show Error
254257
views.widgetWebView.isInvisible = true
255258
views.widgetProgressBar.isVisible = false
256-
setStateError(state.formattedURL.error.message)
259+
setStateError(formattedUrl.error.message)
257260
}
258261
}
259262
}
@@ -323,8 +326,12 @@ class WidgetFragment :
323326
}
324327

325328
private fun loadFormattedUrl(event: WidgetViewEvents.OnURLFormatted) {
329+
loadFormattedUrl(event.formattedURL)
330+
}
331+
332+
private fun loadFormattedUrl(formattedUrl: String) {
326333
views.widgetWebView.clearHistory()
327-
views.widgetWebView.loadUrl(event.formattedURL)
334+
views.widgetWebView.loadUrl(formattedUrl)
328335
}
329336

330337
private fun setStateError(message: String?) {

0 commit comments

Comments
 (0)