Buffer all InputStreams and Readers
Also prefer generic Reader over InputStreamReader.
This commit is contained in:
parent
c2cd6a9c66
commit
9b35942c17
@ -21,6 +21,7 @@
|
|||||||
package org.fdroid.fdroid;
|
package org.fdroid.fdroid;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
import java.io.BufferedInputStream;
|
||||||
import java.io.FileInputStream;
|
import java.io.FileInputStream;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
import java.security.MessageDigest;
|
import java.security.MessageDigest;
|
||||||
@ -62,7 +63,8 @@ public class Hasher {
|
|||||||
byte[] buffer = new byte[1024];
|
byte[] buffer = new byte[1024];
|
||||||
int read = 0;
|
int read = 0;
|
||||||
try {
|
try {
|
||||||
InputStream is = new FileInputStream(file);
|
InputStream is = new BufferedInputStream(
|
||||||
|
new FileInputStream(file));
|
||||||
while ((read = is.read(buffer)) > 0) {
|
while ((read = is.read(buffer)) > 0) {
|
||||||
digest.update(buffer, 0, read);
|
digest.update(buffer, 0, read);
|
||||||
}
|
}
|
||||||
|
@ -21,13 +21,14 @@ package org.fdroid.fdroid;
|
|||||||
|
|
||||||
import java.io.BufferedInputStream;
|
import java.io.BufferedInputStream;
|
||||||
import java.io.BufferedOutputStream;
|
import java.io.BufferedOutputStream;
|
||||||
|
import java.io.BufferedReader;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.FileOutputStream;
|
import java.io.FileOutputStream;
|
||||||
import java.io.FileReader;
|
import java.io.FileReader;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
import java.io.InputStreamReader;
|
|
||||||
import java.io.OutputStream;
|
import java.io.OutputStream;
|
||||||
|
import java.io.Reader;
|
||||||
import java.net.HttpURLConnection;
|
import java.net.HttpURLConnection;
|
||||||
import java.net.MalformedURLException;
|
import java.net.MalformedURLException;
|
||||||
import java.net.URL;
|
import java.net.URL;
|
||||||
@ -380,9 +381,9 @@ public class RepoXMLHandler extends DefaultHandler {
|
|||||||
RepoXMLHandler handler = new RepoXMLHandler(repo.id, apps);
|
RepoXMLHandler handler = new RepoXMLHandler(repo.id, apps);
|
||||||
xr.setContentHandler(handler);
|
xr.setContentHandler(handler);
|
||||||
|
|
||||||
InputStreamReader isr = new FileReader(new File(
|
Reader r = new BufferedReader(new FileReader(new File(
|
||||||
ctx.getFilesDir() + "/tempindex.xml"));
|
ctx.getFilesDir() + "/tempindex.xml")));
|
||||||
InputSource is = new InputSource(isr);
|
InputSource is = new InputSource(r);
|
||||||
xr.parse(is);
|
xr.parse(is);
|
||||||
|
|
||||||
if (handler.pubkey != null && repo.pubkey == null) {
|
if (handler.pubkey != null && repo.pubkey == null) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user