Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'refs/merge-requests/13' of git://gitorious.org/f-droid/fdroidclient into merge-requests/13

Browse Source
This commit is contained in:
Ciaran Gultnieks 2013-01-04 10:32:52 +00:00
commit 5640225247
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/org/fdroid/fdroid/Hasher.java
View File

@ -21,6 +21,7 @@
package org.fdroid.fdroid;
import java.io.File;
import java.io.BufferedInputStream;
import java.io.FileInputStream;
import java.io.InputStream;
import java.security.MessageDigest;
@ -62,7 +63,8 @@ public class Hasher {
byte[] buffer = new byte[1024];
int read = 0;
try {
InputStream is = new FileInputStream(file);
InputStream is = new BufferedInputStream(
new FileInputStream(file));
while ((read = is.read(buffer)) > 0) {
digest.update(buffer, 0, read);
}

9
src/org/fdroid/fdroid/RepoXMLHandler.java
View File

@ -21,13 +21,14 @@ package org.fdroid.fdroid;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileOutputStream;
import java.io.FileReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.Reader;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
import java.net.URL;
@ -380,9 +381,9 @@ public class RepoXMLHandler extends DefaultHandler {
RepoXMLHandler handler = new RepoXMLHandler(repo.id, apps);
xr.setContentHandler(handler);
InputStreamReader isr = new FileReader(new File(
ctx.getFilesDir() + "/tempindex.xml"));
InputSource is = new InputSource(isr);
Reader r = new BufferedReader(new FileReader(new File(
ctx.getFilesDir() + "/tempindex.xml")));
InputSource is = new InputSource(r);
xr.parse(is);
if (handler.pubkey != null && repo.pubkey == null) {