From 2a3deb99b5ffc3823897e606b4f2b1b02b185b0f Mon Sep 17 00:00:00 2001 From: Philipp Schaefer Date: Thu, 13 Feb 2014 23:27:17 +0100 Subject: [PATCH] don't open inputstream twice on http streams...we should get a valid filename here --- .../com/cradle/iitc_mobile/IITC_FileManager.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_FileManager.java b/mobile/src/com/cradle/iitc_mobile/IITC_FileManager.java index 14f53495..2c8a32cf 100644 --- a/mobile/src/com/cradle/iitc_mobile/IITC_FileManager.java +++ b/mobile/src/com/cradle/iitc_mobile/IITC_FileManager.java @@ -283,18 +283,17 @@ public class IITC_FileManager { // we need 2 stream since an inputStream is useless after read once // we read it twice because we first need the script ID for the fileName and // afterwards reading it again while copying - InputStream is, isCopy; + InputStream is; + String fileName; if (uri.getScheme().contains("http")) { - final URLConnection conn = new URL(url).openConnection(); - final URLConnection connCopy = new URL(url).openConnection(); + URLConnection conn = new URL(url).openConnection(); is = conn.getInputStream(); - isCopy = connCopy.getInputStream(); + fileName = uri.getLastPathSegment(); } else { is = mActivity.getContentResolver().openInputStream(uri); - isCopy = mActivity.getContentResolver().openInputStream(uri); + final InputStream isCopy = mActivity.getContentResolver().openInputStream(uri); + fileName = getScriptInfo(isCopy).get("id") + ".user.js"; } - final String fileName = getScriptInfo(isCopy).get("id") + ".user.js"; - // create IITCm external plugins directory if it doesn't already exist final File pluginsDirectory = new File(PLUGINS_PATH); pluginsDirectory.mkdirs();