@@ -218,7 +218,7 @@ class WidgetFragment :
218
218
219
219
override fun invalidate () = withState(viewModel) { state ->
220
220
Timber .v(" Invalidate state: $state " )
221
- when (state.formattedURL) {
221
+ when (val formattedUrl = state.formattedURL) {
222
222
Uninitialized ,
223
223
is Loading -> {
224
224
setStateError(null )
@@ -227,6 +227,9 @@ class WidgetFragment :
227
227
views.widgetProgressBar.isVisible = true
228
228
}
229
229
is Success -> {
230
+ if (views.widgetWebView.url == null ) {
231
+ loadFormattedUrl(formattedUrl())
232
+ }
230
233
setStateError(null )
231
234
when (state.webviewLoadedUrl) {
232
235
Uninitialized -> {
@@ -253,7 +256,7 @@ class WidgetFragment :
253
256
// we need to show Error
254
257
views.widgetWebView.isInvisible = true
255
258
views.widgetProgressBar.isVisible = false
256
- setStateError(state.formattedURL .error.message)
259
+ setStateError(formattedUrl .error.message)
257
260
}
258
261
}
259
262
}
@@ -323,8 +326,12 @@ class WidgetFragment :
323
326
}
324
327
325
328
private fun loadFormattedUrl (event : WidgetViewEvents .OnURLFormatted ) {
329
+ loadFormattedUrl(event.formattedURL)
330
+ }
331
+
332
+ private fun loadFormattedUrl (formattedUrl : String ) {
326
333
views.widgetWebView.clearHistory()
327
- views.widgetWebView.loadUrl(event.formattedURL )
334
+ views.widgetWebView.loadUrl(formattedUrl )
328
335
}
329
336
330
337
private fun setStateError (message : String? ) {
0 commit comments