Skip to content

Commit 4d58f61

Browse files
authored
Merge pull request #75 from forem/rt4914/back-navigation-bug-fix
Fixed back navigation bug
2 parents e11eadb + 0d22da4 commit 4d58f61

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

foremwebview/src/main/java/com/forem/webview/WebViewFragment.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,6 @@ class WebViewFragment : Fragment(), FileChooserListener {
147147
BuildConfig.PASSPORT_AGENT_EXTENSION
148148
}
149149

150-
webView!!.loadUrl(baseUrl)
151-
152150
// WebView Settings
153151
webViewSettings(webView!!)
154152
webView!!.settings.userAgentString = "$defaultUserAgent $extensionUserAgent"
@@ -187,6 +185,8 @@ class WebViewFragment : Fragment(), FileChooserListener {
187185

188186
// WebView Chrome Client
189187
webView!!.webChromeClient = ForemWebChromeClient(fileChooserListener = this)
188+
189+
webView!!.loadUrl(baseUrl)
190190
}
191191

192192
@SuppressLint("SetJavaScriptEnabled")
@@ -316,9 +316,9 @@ class WebViewFragment : Fragment(), FileChooserListener {
316316
} else {
317317
destroyOauthWebView()
318318
}
319-
} else if (oauthWebView == null && webView!!.canGoBack()) {
319+
} else if (oauthWebView == null && webView!=null && webView!!.canGoBack()) {
320320
// Case where oauthWebView is fully inactive.
321-
webView!!.goBack()
321+
webView?.goBack()
322322
} else {
323323
if (canExitApp) {
324324
handleHomePageReached()

0 commit comments

Comments
 (0)