From 010e03252e676a4f1cdd7e4113991835c055423a Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Thu, 26 Feb 2015 21:39:26 -0500 Subject: [PATCH] Encapsulate the cache IO streams in buffered streams --- .../limelight/computers/ComputerManagerService.java | 3 ++- .../com/limelight/grid/assets/DiskAssetLoader.java | 4 ++-- app/src/main/java/com/limelight/utils/CacheHelper.java | 10 ++++++---- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/limelight/computers/ComputerManagerService.java b/app/src/main/java/com/limelight/computers/ComputerManagerService.java index 56e8d157..06e3be56 100644 --- a/app/src/main/java/com/limelight/computers/ComputerManagerService.java +++ b/app/src/main/java/com/limelight/computers/ComputerManagerService.java @@ -2,6 +2,7 @@ package com.limelight.computers; import java.io.FileOutputStream; import java.io.IOException; +import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.StringReader; import java.net.InetAddress; @@ -627,7 +628,7 @@ public class ComputerManagerService extends Service { List list = NvHTTP.getAppListByReader(new StringReader(appList)); if (appList != null && !appList.isEmpty() && !list.isEmpty()) { // Open the cache file - FileOutputStream cacheOut = null; + OutputStream cacheOut = null; try { cacheOut = CacheHelper.openCacheFileForOutput(getCacheDir(), "applist", computer.uuid.toString()); CacheHelper.writeStringToOutputStream(cacheOut, appList); diff --git a/app/src/main/java/com/limelight/grid/assets/DiskAssetLoader.java b/app/src/main/java/com/limelight/grid/assets/DiskAssetLoader.java index fd5a313c..219ca8a7 100644 --- a/app/src/main/java/com/limelight/grid/assets/DiskAssetLoader.java +++ b/app/src/main/java/com/limelight/grid/assets/DiskAssetLoader.java @@ -7,9 +7,9 @@ import com.limelight.LimeLog; import com.limelight.utils.CacheHelper; import java.io.File; -import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; public class DiskAssetLoader implements CachedAppAssetLoader.CachedLoader { private final File cacheDir; @@ -44,7 +44,7 @@ public class DiskAssetLoader implements CachedAppAssetLoader.CachedLoader { @Override public void populateCache(CachedAppAssetLoader.LoaderTuple tuple, Bitmap bitmap) { - FileOutputStream out = null; + OutputStream out = null; try { // PNG ignores quality setting out = CacheHelper.openCacheFileForOutput(cacheDir, "boxart", tuple.computer.uuid.toString(), tuple.app.getAppId() + ".png"); diff --git a/app/src/main/java/com/limelight/utils/CacheHelper.java b/app/src/main/java/com/limelight/utils/CacheHelper.java index 1da135a4..4bbebd46 100644 --- a/app/src/main/java/com/limelight/utils/CacheHelper.java +++ b/app/src/main/java/com/limelight/utils/CacheHelper.java @@ -1,5 +1,7 @@ package com.limelight.utils; +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -28,12 +30,12 @@ public class CacheHelper { return f; } - public static FileInputStream openCacheFileForInput(File root, String... path) throws FileNotFoundException { - return new FileInputStream(openPath(false, root, path)); + public static InputStream openCacheFileForInput(File root, String... path) throws FileNotFoundException { + return new BufferedInputStream(new FileInputStream(openPath(false, root, path))); } - public static FileOutputStream openCacheFileForOutput(File root, String... path) throws FileNotFoundException { - return new FileOutputStream(openPath(true, root, path)); + public static OutputStream openCacheFileForOutput(File root, String... path) throws FileNotFoundException { + return new BufferedOutputStream(new FileOutputStream(openPath(true, root, path))); } public static String readInputStreamToString(InputStream in) throws IOException {