X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Ffragments%2FWebViewTabFragment.kt;h=4811221a171a0cce782527d947db2e20ecdc38c7;hb=dc36dea65a4eb37496fb1ecbbd9f8e1906f50216;hp=154ea2dd20849b76d730407fad3ac5929ae8bc2f;hpb=5186b668274b09e37b371c0a134e53255c98ad98;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/WebViewTabFragment.kt b/app/src/main/java/com/stoutner/privacybrowser/fragments/WebViewTabFragment.kt
index 154ea2dd..4811221a 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/fragments/WebViewTabFragment.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/WebViewTabFragment.kt
@@ -48,7 +48,7 @@ class WebViewTabFragment : Fragment() {
     // The public interface is used to send information back to the parent activity.
     interface NewTabListener {
         @SuppressLint("ClickableViewAccessibility")
-        fun initializeWebView(nestedScrollWebView: NestedScrollWebView, pageNumber: Int, progressBar: ProgressBar, url: String, restoringState: Boolean)
+        fun initializeWebView(nestedScrollWebView: NestedScrollWebView, pageNumber: Int, progressBar: ProgressBar, urlString: String, restoringState: Boolean)
     }
 
     // Declare the class variables.
@@ -105,8 +105,8 @@ class WebViewTabFragment : Fragment() {
     }
 
     override fun onCreateView(layoutInflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        // Check to see if the fragment is being restarted.
-        return if (savedInstanceState == null) {  // The fragment is not being restarted.  Load and configure a new fragment.
+        // Check to see if the fragment is being restarted without the app being killed.
+        return if (savedInstanceState == null) {  // The fragment is not being restarted.  It is either new or is being restored after the app was killed.
             // Check to see if a new page is being created.
             if (requireArguments().getBoolean(CREATE_NEW_PAGE)) {  // A new page is being created.
                 // Get the variables from the arguments
@@ -129,9 +129,9 @@ class WebViewTabFragment : Fragment() {
 
                 // Return the new page view.
                 newPageView
-            } else {  // A page is being restored.
+            } else {  // A page is being restored after the app was killed.
                 // Get the saved states from the arguments.
-                val savedState = requireArguments().getBundle(SAVED_STATE)
+                val savedState = requireArguments().getBundle(SAVED_STATE)!!
                 val savedNestedScrollWebViewState = requireArguments().getBundle(SAVED_NESTED_SCROLL_WEBVIEW_STATE)!!
 
                 // Inflate the tab's WebView.  Setting false at the end of inflater.inflate does not attach the inflated layout as a child of container.
@@ -149,7 +149,7 @@ class WebViewTabFragment : Fragment() {
                 nestedScrollWebView.restoreNestedScrollWebViewState(savedNestedScrollWebViewState)
 
                 // Restore the WebView state.
-                nestedScrollWebView.restoreState(savedState!!)
+                nestedScrollWebView.restoreState(savedState)
 
                 // Initialize the WebView.
                 newTabListener.initializeWebView(nestedScrollWebView, 0, progressBar, "", true)