Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixes an issue with StringBuilder and memory

This commit is contained in:
stom79 2018-01-13 16:59:10 +01:00
parent 337fa7a82f
commit 61ae0a086a
2 changed files with 88 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/build.gradle
View File

@ -48,4 +48,5 @@ dependencies {
playstoreImplementation 'io.github.kobakei:ratethisapp:1.2.0' playstoreImplementation 'io.github.kobakei:ratethisapp:1.2.0'
implementation 'org.conscrypt:conscrypt-android:1.0.0.RC13' implementation 'org.conscrypt:conscrypt-android:1.0.0.RC13'
implementation 'com.google.code.gson:gson:2.8.2' implementation 'com.google.code.gson:gson:2.8.2'
implementation 'com.google.guava:guava:23.6-android'
} }

174
app/src/main/java/fr/gouv/etalab/mastodon/client/HttpsConnection.java
View File

@ -19,6 +19,8 @@ import android.os.Build;
import android.text.Html; import android.text.Html;
import android.text.SpannableString; import android.text.SpannableString;
import com.google.common.io.ByteStreams;
import org.json.JSONObject; import org.json.JSONObject;
import java.io.BufferedInputStream; import java.io.BufferedInputStream;
import java.io.BufferedReader; import java.io.BufferedReader;
@ -30,7 +32,6 @@ import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.io.Reader;
import java.net.HttpURLConnection; import java.net.HttpURLConnection;
import java.net.URL; import java.net.URL;
import java.security.KeyManagementException; import java.security.KeyManagementException;
@ -103,23 +104,18 @@ public class HttpsConnection {
if( token != null) if( token != null)
httpsURLConnection.setRequestProperty("Authorization", "Bearer " + token); httpsURLConnection.setRequestProperty("Authorization", "Bearer " + token);
httpsURLConnection.setRequestMethod("GET"); httpsURLConnection.setRequestMethod("GET");
String response;
if (httpsURLConnection.getResponseCode() >= 200 && httpsURLConnection.getResponseCode() < 400) { if (httpsURLConnection.getResponseCode() >= 200 && httpsURLConnection.getResponseCode() < 400) {
Reader in = new BufferedReader(new InputStreamReader(httpsURLConnection.getInputStream(), "UTF-8")); response = new String(ByteStreams.toByteArray(httpsURLConnection.getInputStream()));
StringBuilder sb = new StringBuilder();
for (int c; (c = in.read()) >= 0; )
sb.append((char) c);
getSinceMaxId();
httpsURLConnection.disconnect();
in.close();
return sb.toString();
}else { }else {
Reader in = new BufferedReader(new InputStreamReader(httpsURLConnection.getErrorStream(), "UTF-8")); String error = new String(ByteStreams.toByteArray(httpsURLConnection.getErrorStream()));
StringBuilder sb = new StringBuilder(); int responseCode = httpsURLConnection.getResponseCode();
for (int c; (c = in.read()) >= 0; ) httpsURLConnection.getInputStream().close();
sb.append((char) c); throw new HttpsConnectionException(responseCode, error);
httpsURLConnection.disconnect();
throw new HttpsConnectionException(httpsURLConnection.getResponseCode(), sb.toString());
} }
getSinceMaxId();
httpsURLConnection.getInputStream().close();
return response;
} }
@ -127,7 +123,6 @@ public class HttpsConnection {
public String get(String urlConnection) throws IOException, NoSuchAlgorithmException, KeyManagementException, HttpsConnectionException { public String get(String urlConnection) throws IOException, NoSuchAlgorithmException, KeyManagementException, HttpsConnectionException {
HttpsURLConnection httpsURLConnection; HttpsURLConnection httpsURLConnection;
HttpURLConnection httpURLConnection; HttpURLConnection httpURLConnection;
StringBuilder sb = new StringBuilder();
if( urlConnection.startsWith("https://")) { if( urlConnection.startsWith("https://")) {
URL url = new URL(urlConnection); URL url = new URL(urlConnection);
httpsURLConnection = (HttpsURLConnection) url.openConnection(); httpsURLConnection = (HttpsURLConnection) url.openConnection();
@ -136,20 +131,19 @@ public class HttpsConnection {
httpsURLConnection.setRequestProperty("User-Agent", "Mozilla/5.0 (Windows NT 6.2; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/32.0.1667.0 Safari/537.36"); httpsURLConnection.setRequestProperty("User-Agent", "Mozilla/5.0 (Windows NT 6.2; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/32.0.1667.0 Safari/537.36");
httpsURLConnection.setSSLSocketFactory(new TLSSocketFactory()); httpsURLConnection.setSSLSocketFactory(new TLSSocketFactory());
httpsURLConnection.setRequestMethod("GET"); httpsURLConnection.setRequestMethod("GET");
String response;
if (httpsURLConnection.getResponseCode() >= 200 && httpsURLConnection.getResponseCode() < 400) { if (httpsURLConnection.getResponseCode() >= 200 && httpsURLConnection.getResponseCode() < 400) {
Reader in = new BufferedReader(new InputStreamReader(httpsURLConnection.getInputStream(), "UTF-8")); getSinceMaxId();
for (int c; (c = in.read()) >= 0; ) response = new String(ByteStreams.toByteArray(httpsURLConnection.getInputStream()));
sb.append((char) c); }else {
httpsURLConnection.disconnect(); String error = new String(ByteStreams.toByteArray(httpsURLConnection.getErrorStream()));
in.close(); int responseCode = httpsURLConnection.getResponseCode();
return sb.toString(); httpsURLConnection.getInputStream().close();
} else { throw new HttpsConnectionException(responseCode, error);
Reader in = new BufferedReader(new InputStreamReader(httpsURLConnection.getErrorStream(), "UTF-8"));
for (int c; (c = in.read()) >= 0; )
sb.append((char) c);
httpsURLConnection.disconnect();
throw new HttpsConnectionException(httpsURLConnection.getResponseCode(), sb.toString());
} }
getSinceMaxId();
httpsURLConnection.getInputStream().close();
return response;
}else{ }else{
URL url = new URL(urlConnection); URL url = new URL(urlConnection);
httpURLConnection = (HttpURLConnection) url.openConnection(); httpURLConnection = (HttpURLConnection) url.openConnection();
@ -157,20 +151,19 @@ public class HttpsConnection {
httpURLConnection.setRequestProperty("http.keepAlive", "false"); httpURLConnection.setRequestProperty("http.keepAlive", "false");
httpURLConnection.setRequestProperty("User-Agent", "Mozilla/5.0 (Windows NT 6.2; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/32.0.1667.0 Safari/537.36"); httpURLConnection.setRequestProperty("User-Agent", "Mozilla/5.0 (Windows NT 6.2; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/32.0.1667.0 Safari/537.36");
httpURLConnection.setRequestMethod("GET"); httpURLConnection.setRequestMethod("GET");
String response;
if (httpURLConnection.getResponseCode() >= 200 && httpURLConnection.getResponseCode() < 400) { if (httpURLConnection.getResponseCode() >= 200 && httpURLConnection.getResponseCode() < 400) {
Reader in = new BufferedReader(new InputStreamReader(httpURLConnection.getInputStream(), "UTF-8")); getSinceMaxId();
for (int c; (c = in.read()) >= 0; ) response = new String(ByteStreams.toByteArray(httpURLConnection.getInputStream()));
sb.append((char) c); }else {
httpURLConnection.disconnect(); String error = new String(ByteStreams.toByteArray(httpURLConnection.getErrorStream()));
in.close(); int responseCode = httpURLConnection.getResponseCode();
return sb.toString(); httpURLConnection.getInputStream().close();
} else { throw new HttpsConnectionException(responseCode, error);
Reader in = new BufferedReader(new InputStreamReader(httpURLConnection.getErrorStream(), "UTF-8"));
for (int c; (c = in.read()) >= 0; )
sb.append((char) c);
httpURLConnection.disconnect();
throw new HttpsConnectionException(httpURLConnection.getResponseCode(), sb.toString());
} }
getSinceMaxId();
httpURLConnection.getInputStream().close();
return response;
} }
} }
@ -208,15 +201,19 @@ public class HttpsConnection {
httpsURLConnection.getOutputStream().write(postDataBytes); httpsURLConnection.getOutputStream().write(postDataBytes);
Reader in = new BufferedReader(new InputStreamReader(httpsURLConnection.getInputStream(), "UTF-8")); String response;
StringBuilder sb = new StringBuilder(); if (httpsURLConnection.getResponseCode() >= 200 && httpsURLConnection.getResponseCode() < 400) {
for (int c; (c = in.read()) >= 0;) getSinceMaxId();
sb.append((char)c); response = new String(ByteStreams.toByteArray(httpsURLConnection.getInputStream()));
}else {
String error = new String(ByteStreams.toByteArray(httpsURLConnection.getErrorStream()));
int responseCode = httpsURLConnection.getResponseCode();
httpsURLConnection.getInputStream().close();
throw new HttpsConnectionException(responseCode, error);
}
getSinceMaxId(); getSinceMaxId();
httpsURLConnection.disconnect(); httpsURLConnection.getInputStream().close();
in.close(); return response;
return sb.toString();
} }
@ -422,7 +419,6 @@ public class HttpsConnection {
int responseCode = httpsURLConnection.getResponseCode(); int responseCode = httpsURLConnection.getResponseCode();
// always check HTTP response code first // always check HTTP response code first
if (responseCode == HttpURLConnection.HTTP_OK) { if (responseCode == HttpURLConnection.HTTP_OK) {
String disposition = httpsURLConnection.getHeaderField("Content-Disposition");
// opens input stream from the HTTP connection // opens input stream from the HTTP connection
return httpsURLConnection.getInputStream(); return httpsURLConnection.getInputStream();
} }
@ -526,36 +522,30 @@ public class HttpsConnection {
request.writeBytes(twoHyphens + boundary + twoHyphens + lineEnd); request.writeBytes(twoHyphens + boundary + twoHyphens + lineEnd);
request.flush(); request.flush();
request.close(); request.close();
if (200 != httpsURLConnection.getResponseCode()) { if (200 != httpsURLConnection.getResponseCode()) {
Reader in = new BufferedReader(new InputStreamReader(httpsURLConnection.getErrorStream(), "UTF-8")); String error = new String(ByteStreams.toByteArray(httpsURLConnection.getErrorStream()));
StringBuilder sb = new StringBuilder(); int responseCode = httpsURLConnection.getResponseCode();
for (int c; (c = in.read()) >= 0; ) httpsURLConnection.getInputStream().close();
sb.append((char) c); throw new HttpsConnectionException(responseCode, error);
httpsURLConnection.disconnect();
throw new HttpsConnectionException(httpsURLConnection.getResponseCode(), context.getString(R.string.toast_error));
} }
InputStream responseStream = new BufferedInputStream(httpsURLConnection.getInputStream()); InputStream responseStream = new BufferedInputStream(httpsURLConnection.getInputStream());
BufferedReader responseStreamReader = new BufferedReader(new InputStreamReader(responseStream)); BufferedReader responseStreamReader = new BufferedReader(new InputStreamReader(responseStream));
String line; String response = new String(ByteStreams.toByteArray(httpsURLConnection.getInputStream()));
StringBuilder stringBuilder = new StringBuilder();
while ((line = responseStreamReader.readLine()) != null) {
stringBuilder.append(line).append("\n");
}
((TootActivity)context).runOnUiThread(new Runnable() { ((TootActivity)context).runOnUiThread(new Runnable() {
public void run() { public void run() {
listener.onUpdateProgress(101); listener.onUpdateProgress(101);
}}); }});
String response = stringBuilder.toString();
final Attachment attachment = API.parseAttachmentResponse(new JSONObject(response)); final Attachment attachment = API.parseAttachmentResponse(new JSONObject(response));
responseStreamReader.close(); responseStreamReader.close();
responseStream.close(); responseStream.close();
httpsURLConnection.disconnect(); httpsURLConnection.getInputStream().close();
((TootActivity)context).runOnUiThread(new Runnable() { ((TootActivity)context).runOnUiThread(new Runnable() {
public void run() { public void run() {
@ -569,7 +559,11 @@ public class HttpsConnection {
final Error error = new Error(); final Error error = new Error();
error.setError(e.getMessage()); error.setError(e.getMessage());
if(httpsURLConnection != null) if(httpsURLConnection != null)
httpsURLConnection.disconnect(); try {
httpsURLConnection.getInputStream().close();
} catch (IOException e1) {
e1.printStackTrace();
}
((TootActivity)context).runOnUiThread(new Runnable() { ((TootActivity)context).runOnUiThread(new Runnable() {
public void run() { public void run() {
listener.onRetrieveAttachment(null, error); listener.onRetrieveAttachment(null, error);
@ -615,15 +609,19 @@ public class HttpsConnection {
httpsURLConnection.setDoOutput(true); httpsURLConnection.setDoOutput(true);
httpsURLConnection.getOutputStream().write(postDataBytes); httpsURLConnection.getOutputStream().write(postDataBytes);
Reader in = new BufferedReader(new InputStreamReader(httpsURLConnection.getInputStream(), "UTF-8")); String response;
StringBuilder sb = new StringBuilder(); if (httpsURLConnection.getResponseCode() >= 200 && httpsURLConnection.getResponseCode() < 400) {
for (int c; (c = in.read()) >= 0;) getSinceMaxId();
sb.append((char)c); response = new String(ByteStreams.toByteArray(httpsURLConnection.getInputStream()));
}else {
String error = new String(ByteStreams.toByteArray(httpsURLConnection.getErrorStream()));
int responseCode = httpsURLConnection.getResponseCode();
httpsURLConnection.getInputStream().close();
throw new HttpsConnectionException(responseCode, error);
}
getSinceMaxId(); getSinceMaxId();
httpsURLConnection.disconnect(); httpsURLConnection.getInputStream().close();
in.close(); return response;
return sb.toString();
} }
@ -661,15 +659,19 @@ public class HttpsConnection {
httpsURLConnection.setDoOutput(true); httpsURLConnection.setDoOutput(true);
httpsURLConnection.getOutputStream().write(postDataBytes); httpsURLConnection.getOutputStream().write(postDataBytes);
Reader in = new BufferedReader(new InputStreamReader(httpsURLConnection.getInputStream(), "UTF-8")); String response;
StringBuilder sb = new StringBuilder(); if (httpsURLConnection.getResponseCode() >= 200 && httpsURLConnection.getResponseCode() < 400) {
for (int c; (c = in.read()) >= 0;) getSinceMaxId();
sb.append((char)c); response = new String(ByteStreams.toByteArray(httpsURLConnection.getInputStream()));
}else {
String error = new String(ByteStreams.toByteArray(httpsURLConnection.getErrorStream()));
int responseCode = httpsURLConnection.getResponseCode();
httpsURLConnection.getInputStream().close();
throw new HttpsConnectionException(responseCode, error);
}
getSinceMaxId(); getSinceMaxId();
httpsURLConnection.disconnect(); httpsURLConnection.getInputStream().close();
in.close(); return response;
return sb.toString();
} }
@ -709,15 +711,13 @@ public class HttpsConnection {
if (httpsURLConnection.getResponseCode() >= 200 && httpsURLConnection.getResponseCode() < 400) { if (httpsURLConnection.getResponseCode() >= 200 && httpsURLConnection.getResponseCode() < 400) {
getSinceMaxId(); getSinceMaxId();
httpsURLConnection.disconnect(); httpsURLConnection.getInputStream().close();
return httpsURLConnection.getResponseCode(); return httpsURLConnection.getResponseCode();
}else { }else {
Reader in = new BufferedReader(new InputStreamReader(httpsURLConnection.getErrorStream(), "UTF-8")); String error = new String(ByteStreams.toByteArray(httpsURLConnection.getErrorStream()));
StringBuilder sb = new StringBuilder(); int responseCode = httpsURLConnection.getResponseCode();
for (int c; (c = in.read()) >= 0; ) httpsURLConnection.getInputStream().close();
sb.append((char) c); throw new HttpsConnectionException(responseCode, error);
httpsURLConnection.disconnect();
throw new HttpsConnectionException(httpsURLConnection.getResponseCode(), sb.toString());
} }
} }