Skip to content

WebViews: clear loading indicator on main-frame load errors #556

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jim-daf wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

WebViews: clear loading indicator on main-frame load errors #556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions ...ain/kotlin/ch/rmy/android/http_shortcuts/activities/documentation/DocumentationWebView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import android.graphics.Bitmap
import android.graphics.Color
import android.net.Uri
import android.view.ViewGroup.LayoutParams.MATCH_PARENT
import android.webkit.WebResourceError
import android.webkit.WebResourceRequest
import android.webkit.WebResourceResponse
import android.webkit.WebSettings
Expand Down Expand Up @@ -82,6 +83,13 @@ class DocumentationWebView(context: Context) : WebView(context) {
onPageTitle(pageTitle.trim('"').takeUnless { it.isEmpty() || it == "null" || it == "Documentation" })
}
}

override fun onReceivedError(view: WebView, request: WebResourceRequest, error: WebResourceError) {
super.onReceivedError(view, request, error)
if (request.isForMainFrame) {
hideLoading()
}
}
}

with(settings) {
Expand Down
8 changes: 8 additions & 0 deletions .../app/src/main/kotlin/ch/rmy/android/http_shortcuts/activities/response/ResponseWebView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package ch.rmy.android.http_shortcuts.activities.response
import android.content.Context
import android.net.Uri
import android.util.AttributeSet
import android.webkit.WebResourceError
import android.webkit.WebResourceRequest
import android.webkit.WebResourceResponse
import android.webkit.WebSettings
Expand Down Expand Up @@ -125,6 +126,13 @@ class ResponseWebView @JvmOverloads constructor(
override fun onPageFinished(view: WebView?, url: String?) {
onLoaded()
}

override fun onReceivedError(view: WebView, request: WebResourceRequest, error: WebResourceError) {
super.onReceivedError(view, request, error)
if (request.isForMainFrame) {
onLoaded()
}
}
}

with(settings) {
Expand Down
8 changes: 8 additions & 0 deletions ...ortcuts/app/src/main/kotlin/ch/rmy/android/http_shortcuts/components/SinglePageBrowser.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import android.content.Context
import android.graphics.Bitmap
import android.graphics.Color
import android.view.ViewGroup.LayoutParams.MATCH_PARENT
import android.webkit.WebResourceError
import android.webkit.WebResourceRequest
import android.webkit.WebView
import android.webkit.WebViewClient
Expand Down Expand Up @@ -125,6 +126,13 @@ private class SinglePageWebView(
context.openURL(request.url)
}
}

override fun onReceivedError(view: WebView, request: WebResourceRequest, error: WebResourceError) {
super.onReceivedError(view, request, error)
if (request.isForMainFrame) {
onLoaded()
}
}
}

with(settings) {
Expand Down