Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/97547
Change subject: Ensure that we have a title before using it.
......................................................................
Ensure that we have a title before using it.
Change-Id: Ibd28ed71736fdc75e9341312dc222d2fc0b1b24c
---
M wikipedia/src/main/java/org/wikimedia/wikipedia/PageViewFragment.java
1 file changed, 7 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/47/97547/1
diff --git
a/wikipedia/src/main/java/org/wikimedia/wikipedia/PageViewFragment.java
b/wikipedia/src/main/java/org/wikimedia/wikipedia/PageViewFragment.java
index 3810346..6cddb5a 100644
--- a/wikipedia/src/main/java/org/wikimedia/wikipedia/PageViewFragment.java
+++ b/wikipedia/src/main/java/org/wikimedia/wikipedia/PageViewFragment.java
@@ -115,14 +115,6 @@
webView = (WebView) parentView.findViewById(R.id.pageWebView);
loadProgress = (ProgressBar)
parentView.findViewById(R.id.pageLoadProgress);
- // Enable Pinch-Zoom
- webView.getSettings().setBuiltInZoomControls(true);
- webView.getSettings().setDisplayZoomControls(false);
-
- bridge = new CommunicationBridge(webView,
"file:///android_asset/index.html");
- linkHandler = new LinkHandler(getActivity(), bridge, title.getSite());
- api =
((WikipediaApp)getActivity().getApplicationContext()).getAPIForSite(title.getSite());
-
if (savedInstanceState != null &&
savedInstanceState.containsKey(KEY_TITLE)) {
title = savedInstanceState.getParcelable(KEY_TITLE);
if (savedInstanceState.containsKey(KEY_PAGE)) {
@@ -135,6 +127,13 @@
throw new RuntimeException("No PageTitle passed in to constructor
or in instanceState");
}
+ // Enable Pinch-Zoom
+ webView.getSettings().setBuiltInZoomControls(true);
+ webView.getSettings().setDisplayZoomControls(false);
+
+ bridge = new CommunicationBridge(webView,
"file:///android_asset/index.html");
+ linkHandler = new LinkHandler(getActivity(), bridge, title.getSite());
+ api =
((WikipediaApp)getActivity().getApplicationContext()).getAPIForSite(title.getSite());
switch (state) {
case STATE_NO_FETCH:
--
To view, visit https://gerrit.wikimedia.org/r/97547
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibd28ed71736fdc75e9341312dc222d2fc0b1b24c
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
