X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fadapters%2FWebViewPagerAdapter.java;h=52e7234536a22a244cc232b9788112d79c9f7d29;hp=7c6aaf351cbac051bb3a36bc9c4883a8dd41a113;hb=aba828cabddd0a277271c90816b50292bb64baf1;hpb=fe788514a50a591f9722ededc13e608ceb268bb8 diff --git a/app/src/main/java/com/stoutner/privacybrowser/adapters/WebViewPagerAdapter.java b/app/src/main/java/com/stoutner/privacybrowser/adapters/WebViewPagerAdapter.java index 7c6aaf35..52e72345 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/adapters/WebViewPagerAdapter.java +++ b/app/src/main/java/com/stoutner/privacybrowser/adapters/WebViewPagerAdapter.java @@ -1,42 +1,48 @@ /* - * Copyright © 2019 Soren Stoutner . + * Copyright © 2019-2022 Soren Stoutner . * - * This file is part of Privacy Browser . + * This file is part of Privacy Browser Android . * - * Privacy Browser is free software: you can redistribute it and/or modify + * Privacy Browser Android is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Privacy Browser is distributed in the hope that it will be useful, + * Privacy Browser Android is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Privacy Browser. If not, see . + * along with Privacy Browser Android. If not, see . */ package com.stoutner.privacybrowser.adapters; +import android.os.Bundle; +import android.os.Handler; +import android.widget.FrameLayout; + import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentPagerAdapter; import androidx.viewpager.widget.ViewPager; +import com.stoutner.privacybrowser.R; import com.stoutner.privacybrowser.fragments.WebViewTabFragment; +import com.stoutner.privacybrowser.views.NestedScrollWebView; import java.util.LinkedList; public class WebViewPagerAdapter extends FragmentPagerAdapter { // The WebView fragments list contains all the WebViews. - private LinkedList webViewFragmentsList = new LinkedList<>(); + private final LinkedList webViewFragmentsList = new LinkedList<>(); // Define the constructor. - public WebViewPagerAdapter(FragmentManager fragmentManager){ + public WebViewPagerAdapter(FragmentManager fragmentManager) { // Run the default commands. - super(fragmentManager); + super(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT); } @Override @@ -59,6 +65,7 @@ public class WebViewPagerAdapter extends FragmentPagerAdapter { } @Override + @NonNull public Fragment getItem(int pageNumber) { // Get the fragment for a particular page. Page numbers are 0 indexed. return webViewFragmentsList.get(pageNumber); @@ -89,32 +96,93 @@ public class WebViewPagerAdapter extends FragmentPagerAdapter { i++; } + // Set the position to be the last tab if it is not found. + // Sometimes there is a race condition in populating the webView fragments list when resuming Privacy Browser and displaying an SSL certificate error while loading a new intent. + // In that case, the last tab should be the one it is looking for. + if (position == -1) { + position = webViewFragmentsList.size() - 1; + } + // Return the position. return position; } - public void addPage(int pageNumber, ViewPager webViewPager) { + public void addPage(int pageNumber, ViewPager webViewPager, String url, boolean moveToNewPage) { // Add a new page. - webViewFragmentsList.add(WebViewTabFragment.createPage(pageNumber)); + webViewFragmentsList.add(WebViewTabFragment.createPage(pageNumber, url)); // Update the view pager. notifyDataSetChanged(); - // Move to the new page if it isn't the first one. - if (pageNumber > 0) { - webViewPager.setCurrentItem(pageNumber); + // Move to the new page if indicated. + if (moveToNewPage) { + moveToNewPage(pageNumber, webViewPager); } } - public void deletePage(int pageNumber) { + public void restorePage(Bundle savedState, Bundle savedNestedScrollWebViewState) { + // Restore the page. + webViewFragmentsList.add(WebViewTabFragment.restorePage(savedState, savedNestedScrollWebViewState)); + + // Update the view pager. + notifyDataSetChanged(); + } + + public boolean deletePage(int pageNumber, ViewPager webViewPager) { + // Get the WebView tab fragment. + WebViewTabFragment webViewTabFragment = webViewFragmentsList.get(pageNumber); + + // Get the WebView frame layout. + FrameLayout webViewFrameLayout = (FrameLayout) webViewTabFragment.getView(); + + // Remove the warning below that the WebView frame layout might be null. + assert webViewFrameLayout != null; + + // Get a handle for the nested scroll WebView. + NestedScrollWebView nestedScrollWebView = webViewFrameLayout.findViewById(R.id.nestedscroll_webview); + + // Pause the current WebView. + nestedScrollWebView.onPause(); + + // Remove all the views from the frame layout. + webViewFrameLayout.removeAllViews(); + + // Destroy the current WebView. + nestedScrollWebView.destroy(); + // Delete the page. webViewFragmentsList.remove(pageNumber); // Update the view pager. notifyDataSetChanged(); + + // Return true if the selected page number did not change after the delete (because the newly selected tab has has same number as the previously deleted tab). + // This will cause the calling method to reset the current WebView to the new contents of this page number. + return (webViewPager.getCurrentItem() == pageNumber); } public WebViewTabFragment getPageFragment(int pageNumber) { + // Return the page fragment. return webViewFragmentsList.get(pageNumber); } + + private void moveToNewPage(int pageNumber, ViewPager webViewPager) { + // Check to see if the new page has been populated. + if (webViewPager.getChildCount() >= pageNumber) { // The new page is ready. + // Move to the new page. + webViewPager.setCurrentItem(pageNumber); + } else { // The new page is not yet ready. + // Create a handler. + Handler moveToNewPageHandler = new Handler(); + + // Create a runnable. + Runnable moveToNewPageRunnable = () -> { + // Move to the new page. + webViewPager.setCurrentItem(pageNumber); + }; + + // Try again to move to the new page after 50 milliseconds. + moveToNewPageHandler.postDelayed(moveToNewPageRunnable, 50); + } + } } \ No newline at end of file