jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: remove unused PageCache put callback code
......................................................................
Hygiene: remove unused PageCache put callback code
Chip away at PageCache by removing unused callback functionality. Also,
replace usages of Log with L, add a couple @NonNull / @Nullable
annotations, and make a method private.
Change-Id: I80ccb18d6a3a8aa9714ae9114e3704bd2c877452
---
M app/src/main/java/org/wikipedia/page/PageCache.java
M app/src/main/java/org/wikipedia/page/PageDataClient.java
M app/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java
3 files changed, 16 insertions(+), 47 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
jenkins-bot: Verified
diff --git a/app/src/main/java/org/wikipedia/page/PageCache.java
b/app/src/main/java/org/wikipedia/page/PageCache.java
index abc2d50..7d671ba 100644
--- a/app/src/main/java/org/wikipedia/page/PageCache.java
+++ b/app/src/main/java/org/wikipedia/page/PageCache.java
@@ -2,13 +2,14 @@
import android.content.Context;
import android.os.Environment;
+import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
-import android.util.Log;
import com.jakewharton.disklrucache.DiskLruCache;
import org.json.JSONObject;
import org.wikipedia.concurrency.SaneAsyncTask;
+import org.wikipedia.util.log.L;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
@@ -24,13 +25,12 @@
* Implements a cache of Page objects.
*/
public class PageCache {
- private static final String TAG = "PageCache";
private static final int DISK_CACHE_VERSION = 1;
private static final int DISK_CACHE_SIZE = 1024 * 1024 * 64; // 64MB
private static final String DISK_CACHE_SUBDIR = "wp_pagecache";
- private DiskLruCache mDiskLruCache;
- private final Object mDiskCacheLock = new Object();
+ @Nullable private DiskLruCache mDiskLruCache;
+ @NonNull private final Object mDiskCacheLock = new Object();
public PageCache(Context context) {
// Initialize disk cache on background thread
@@ -56,28 +56,12 @@
@Override
public void onCatch(Throwable caught) {
- Log.e(TAG, "Caught " + caught.getMessage(), caught);
- caught.printStackTrace();
+ L.e("Caught " + caught.getMessage(), caught);
}
}
- public interface CachePutListener {
- void onPutComplete();
- void onPutError(Throwable e);
- }
-
- public void put(PageTitle title, Page page, final CachePutListener
listener) {
- new AddPageToCacheTask(title, page) {
- @Override
- public void onFinish(Void v) {
- listener.onPutComplete();
- }
-
- @Override
- public void onCatch(Throwable caught) {
- listener.onPutError(caught);
- }
- }.execute();
+ public void put(PageTitle title, Page page) {
+ new AddPageToCacheTask(title, page).execute();
}
private class AddPageToCacheTask extends SaneAsyncTask<Void> {
@@ -97,7 +81,7 @@
}
DiskLruCache.Editor editor = null;
try {
- Log.d(TAG, "Writing to cache: " + title.getDisplayText());
+ L.d("Writing to cache: " + title.getDisplayText());
String key = title.getIdentifier();
editor = mDiskLruCache.edit(key);
if (editor == null) {
@@ -114,6 +98,10 @@
}
}
return null;
+ }
+
+ @Override public void onCatch(Throwable caught) {
+ L.e("Failed to add page to cache.", caught);
}
}
@@ -155,7 +143,7 @@
return null;
}
try {
- Log.d(TAG, "Reading from cache: " +
title.getDisplayText());
+ L.d("Reading from cache: " + title.getDisplayText());
InputStream inputStream = new
BufferedInputStream(snapshot.getInputStream(0));
String jsonStr = readFile(inputStream);
return new Page(new JSONObject(jsonStr));
@@ -168,7 +156,7 @@
// Creates a unique subdirectory of the designated app cache directory.
Tries to use external
// storage, but if not mounted, falls back on internal storage.
- public static File getDiskCacheDir(Context context, String uniqueName) {
+ private static File getDiskCacheDir(Context context, String uniqueName) {
// Check if media is mounted or storage is built-in, if so, try and
use external cache dir
// otherwise use internal cache dir.
final String cachePath;
diff --git a/app/src/main/java/org/wikipedia/page/PageDataClient.java
b/app/src/main/java/org/wikipedia/page/PageDataClient.java
index 53182e6..4e613ae 100644
--- a/app/src/main/java/org/wikipedia/page/PageDataClient.java
+++ b/app/src/main/java/org/wikipedia/page/PageDataClient.java
@@ -420,17 +420,7 @@
//add the page to cache!
if (cacheOnComplete) {
- app.getPageCache().put(model.getTitleOriginal(),
model.getPage(),
- new PageCache.CachePutListener() {
- @Override
- public void onPutComplete() {
- }
-
- @Override
- public void onPutError(Throwable e) {
- L.e("Failed to add page to cache.", e);
- }
- });
+ app.getPageCache().put(model.getTitleOriginal(),
model.getPage());
}
}
}
diff --git a/app/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java
b/app/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java
index d19b5de..7ec2747 100644
--- a/app/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java
+++ b/app/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java
@@ -421,16 +421,7 @@
// save it to our current page, for later use
if (cacheOnLoad && page != null) {
page.setGalleryCollection(result);
- app.getPageCache().put(pageTitle, page, new
PageCache.CachePutListener() {
- @Override
- public void onPutComplete() {
- }
-
- @Override
- public void onPutError(Throwable e) {
- L.e("Failed to add page to cache.", e);
- }
- });
+ app.getPageCache().put(pageTitle, page);
}
applyGalleryCollection(result);
}
--
To view, visit https://gerrit.wikimedia.org/r/316847
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I80ccb18d6a3a8aa9714ae9114e3704bd2c877452
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski <sniedziel...@wikimedia.org>
Gerrit-Reviewer: BearND <bsitzm...@wikimedia.org>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
Gerrit-Reviewer: Dbrant <dbr...@wikimedia.org>
Gerrit-Reviewer: Mholloway <mhollo...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
