phillip/ingress-intel-total-conversion
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

don't open inputstream twice on http streams...we should get a valid filename here

Browse Source
This commit is contained in:
Philipp Schaefer 2014-02-13 23:27:17 +01:00
parent fc571ecf7e
commit 2a3deb99b5
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mobile/src/com/cradle/iitc_mobile/IITC_FileManager.java
View File

@ -283,18 +283,17 @@ public class IITC_FileManager {
// we need 2 stream since an inputStream is useless after read once // 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 // we read it twice because we first need the script ID for the fileName and
// afterwards reading it again while copying // afterwards reading it again while copying
InputStream is, isCopy; InputStream is;
String fileName;
if (uri.getScheme().contains("http")) { if (uri.getScheme().contains("http")) {
final URLConnection conn = new URL(url).openConnection(); URLConnection conn = new URL(url).openConnection();
final URLConnection connCopy = new URL(url).openConnection();
is = conn.getInputStream(); is = conn.getInputStream();
isCopy = connCopy.getInputStream(); fileName = uri.getLastPathSegment();
} else { } else {
is = mActivity.getContentResolver().openInputStream(uri); 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 // create IITCm external plugins directory if it doesn't already exist
final File pluginsDirectory = new File(PLUGINS_PATH); final File pluginsDirectory = new File(PLUGINS_PATH);
pluginsDirectory.mkdirs(); pluginsDirectory.mkdirs();