jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/387813 )
Change subject: Correctly "prefer offline content" from offline article packs.
......................................................................
Correctly "prefer offline content" from offline article packs.
The previous implementation of "prefer offline content" wasn't taking
offline packs into account, and was only dealing with HTTP-cached content.
Change-Id: I3ab66a357a71186b93e905d6c6a821eb4b340ae8
---
M app/src/main/java/org/wikipedia/page/PageFragmentLoadState.java
1 file changed, 12 insertions(+), 6 deletions(-)
Approvals:
jenkins-bot: Verified
Cooltey: Looks good to me, approved
diff --git a/app/src/main/java/org/wikipedia/page/PageFragmentLoadState.java
b/app/src/main/java/org/wikipedia/page/PageFragmentLoadState.java
index efdc299..350f2d7 100644
--- a/app/src/main/java/org/wikipedia/page/PageFragmentLoadState.java
+++ b/app/src/main/java/org/wikipedia/page/PageFragmentLoadState.java
@@ -40,6 +40,7 @@
import org.wikipedia.readinglist.ReadingList;
import org.wikipedia.readinglist.page.ReadingListPage;
import org.wikipedia.readinglist.page.database.ReadingListDaoProxy;
+import org.wikipedia.settings.Prefs;
import org.wikipedia.util.DateUtil;
import org.wikipedia.util.DeviceUtil;
import org.wikipedia.util.DimenUtil;
@@ -379,11 +380,16 @@
L10nUtil.setupDirectionality(model.getTitle().getWikiSite().languageCode(),
Locale.getDefault().getLanguage(),
bridge);
- pageLoadFromNetwork(new ErrorCallback() {
- @Override public void call(final Throwable networkError) {
- fragment.onPageLoadError(networkError);
- }
- });
+ if (Prefs.preferOfflineContent() &&
OfflineManager.instance().titleExists(model.getTitle().getDisplayText())) {
+ pageLoadFromCompilation();
+ } else {
+ pageLoadFromNetwork(new ErrorCallback() {
+ @Override
+ public void call(final Throwable networkError) {
+ fragment.onPageLoadError(networkError);
+ }
+ });
+ }
}
private void pageLoadFromNetwork(final ErrorCallback errorCallback) {
@@ -433,7 +439,7 @@
PageTitle newTitle = TextUtils.isEmpty(normalizedTitle) ?
model.getTitle()
: new PageTitle(normalizedTitle,
model.getTitle().getWikiSite());
- Page page = new Page(newTitle, new ArrayList<Section>(), new
PageProperties(newTitle));
+ Page page = new Page(newTitle, new ArrayList<>(), new
PageProperties(newTitle));
model.setPage(page);
editHandler.setPage(model.getPage());
--
To view, visit https://gerrit.wikimedia.org/r/387813
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3ab66a357a71186b93e905d6c6a821eb4b340ae8
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <dbr...@wikimedia.org>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
Gerrit-Reviewer: Cooltey <cf...@wikimedia.org>
Gerrit-Reviewer: Sharvaniharan <sha...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
