Dbrant has uploaded a new change for review.
https://gerrit.wikimedia.org/r/172818
Change subject: Fix reloading of page after editing.
......................................................................
Fix reloading of page after editing.
Bug: 73314
Change-Id: Icfe16cec59f18d97e773ff3e08cdcea812ae9f5a
---
M wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
1 file changed, 6 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/18/172818/1
diff --git
a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
index 50a6fbc..70c00b6 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
@@ -103,7 +103,6 @@
private PageTitle title;
private PageTitle titleOriginal;
- private View contentsContainer;
private ViewGroup imagesContainer;
private LeadImagesHandler leadImagesHandler;
private ObservableWebView webView;
@@ -217,8 +216,8 @@
throw new RuntimeException(e);
}
- if (webView.getVisibility() == View.GONE) {
- ViewAnimations.fadeIn(webView);
+ if (webView.getVisibility() != View.VISIBLE) {
+ webView.setVisibility(View.VISIBLE);
}
getActivity().updateProgressBar(true, true, 0);
@@ -252,7 +251,6 @@
public View onCreateView(LayoutInflater inflater, ViewGroup container,
final Bundle savedInstanceState) {
View rootView = inflater.inflate(R.layout.fragment_page, container,
false);
- contentsContainer =
rootView.findViewById(R.id.page_contents_container);
webView = (ObservableWebView)
rootView.findViewById(R.id.page_web_view);
networkError = rootView.findViewById(R.id.page_error);
retryButton = rootView.findViewById(R.id.page_error_retry);
@@ -383,8 +381,6 @@
Log.d(TAG, "Using page from cache: " +
titleOriginal.getDisplayText());
page = PAGE_CACHE.get(titleOriginal);
title = page.getTitle();
- //make the webview immediately visible
- contentsContainer.setVisibility(View.VISIBLE);
state = STATE_COMPLETE_FETCH;
}
@@ -434,7 +430,9 @@
scrollY = 0;
// immediately hide the webview
- contentsContainer.setVisibility(View.GONE);
+ webView.setVisibility(View.GONE);
+ // and the lead image
+ leadImagesHandler.hide();
// and reload the page...
setState(STATE_NO_FETCH);
@@ -817,6 +815,7 @@
private void showNetworkError() {
// Check for the source of the error and have different things turn up
leadImagesHandler.hide();
+ webView.setVisibility(View.INVISIBLE);
ViewAnimations.fadeIn(networkError);
}
--
To view, visit https://gerrit.wikimedia.org/r/172818
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icfe16cec59f18d97e773ff3e08cdcea812ae9f5a
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <dbr...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
