AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Fixed NPE on webview in bookmark catalog, changed order of initialization

Browse source
This commit is contained in:
Александр Зацепин 2020-02-18 12:55:56 +03:00 • committed by yoksnod
parent 707a497f1f
commit 40f303350c
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
android/src/com/mapswithme/maps/bookmarks/BookmarksCatalogFragment.java
View file

@ -158,6 +158,12 @@ public class BookmarksCatalogFragment extends BaseWebViewMwmFragment
{
setHasOptionsMenu(true);
View root = inflater.inflate(R.layout.fragment_bookmarks_catalog, container, false);
mWebView = root.findViewById(getWebViewResId());
mRetryBtn = root.findViewById(R.id.retry_btn);
mProgressView = root.findViewById(R.id.progress);
initWebView();
mFailedPurchaseController = PurchaseFactory.createFailedBookmarkPurchaseController(requireContext());
mFailedPurchaseController.initialize(requireActivity());
mPurchaseChecker = new FailedBookmarkPurchaseChecker();
@ -169,11 +175,6 @@ public class BookmarksCatalogFragment extends BaseWebViewMwmFragment
mProductDetailsLoadingCallback = new ProductDetailsLoadingCallback();
mProductDetailsLoadingManager.addCallback(mProductDetailsLoadingCallback);
View root = inflater.inflate(R.layout.fragment_bookmarks_catalog, container, false);
mWebView = root.findViewById(getWebViewResId());
mRetryBtn = root.findViewById(R.id.retry_btn);
mProgressView = root.findViewById(R.id.progress);
initWebView();
mRetryBtn.setOnClickListener(v -> onRetryClick());
mDelegate.onCreateView(savedInstanceState);
return root;