/*
- * Copyright © 2019 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2019-2020 Soren Stoutner <soren@stoutner.com>.
*
* This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
*
}
@Override
+ @NonNull
public Fragment getItem(int pageNumber) {
// Get the fragment for a particular page. Page numbers are 0 indexed.
return webViewFragmentsList.get(pageNumber);
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, String url) {
+ public void addPage(int pageNumber, ViewPager webViewPager, String url, boolean moveToTab) {
// Add a new page.
webViewFragmentsList.add(WebViewTabFragment.createPage(pageNumber, url));
notifyDataSetChanged();
// Move to the new page if it isn't the first one.
- if (pageNumber > 0) {
+ if (pageNumber > 0 && moveToTab) {
webViewPager.setCurrentItem(pageNumber);
}
}