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

Rollback to httpsurlconnection

This commit is contained in:
tom79 2020-02-01 10:48:03 +01:00
parent 0fb2390f0f
commit b2c8336a0f
2 changed files with 85 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/assets/changelogs/348.txt
View File

@ -1,2 +1,4 @@
Fixed:
- Mentions with delete & re-draft for Pleroma accounts
- Nitter timeline refresh
- Remove notification bar for Android 8-

103
app/src/main/java/app/fedilab/android/client/HttpsConnection.java
View File

@ -54,9 +54,7 @@ import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Scanner;
import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@ -65,18 +63,12 @@ import javax.net.ssl.HttpsURLConnection;
import javax.net.ssl.SSLSession;
import app.fedilab.android.R;
import app.fedilab.android.activities.MainActivity;
import app.fedilab.android.activities.SlideMediaActivity;
import app.fedilab.android.activities.TootActivity;
import app.fedilab.android.client.Entities.Error;
import app.fedilab.android.helper.FileNameCleaner;
import app.fedilab.android.helper.Helper;
import app.fedilab.android.interfaces.OnDownloadInterface;
import okhttp3.Cache;
import okhttp3.HttpUrl;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.Response;
import static app.fedilab.android.helper.Helper.urlPattern;
@ -98,7 +90,7 @@ public class HttpsConnection {
private Proxy proxy;
private String instance;
private String USER_AGENT;
private int cacheSize = 30*1024*1024;
public HttpsConnection(Context context, String instance) {
this.instance = instance;
@ -185,58 +177,6 @@ public class HttpsConnection {
url = new URL(urlConnection);
}
if (Build.VERSION.SDK_INT >= 21) {
Cache cache = new Cache(context.getCacheDir(), cacheSize);
OkHttpClient.Builder builder = new OkHttpClient.Builder().connectTimeout(timeout, TimeUnit.SECONDS).cache(cache);
if (proxy != null) {
builder.proxy(proxy);
}
OkHttpClient client = builder.build();
Request.Builder requestBuilder = new Request.Builder()
.url(urlConnection);
HttpUrl.Builder httpBuider = Objects.requireNonNull(HttpUrl.parse(url.toString())).newBuilder();
if (token != null && !token.startsWith("Basic ")) {
requestBuilder.addHeader("Authorization", "Bearer " + token);
} else if (token != null && token.startsWith("Basic ")) {
requestBuilder.addHeader("Authorization", token);
}
Request requesthttp = requestBuilder
.url(httpBuider.build())
.build();
int code = 500;
try {
Response httpresponse = client.newCall(requesthttp).execute();
assert httpresponse.body() != null;
String response = httpresponse.body().string();
code = httpresponse.code();
String error = httpresponse.message();
if (code >= 200 && code < 400) {
if (!cache.isClosed()) {
try {
cache.close();
} catch (Exception e) {
e.printStackTrace();
}
}
getOKHttpHeader(httpresponse.headers().toMultimap());
return response;
} else {
throw new HttpsConnectionException(code, error);
}
} catch (Exception ignored){}
finally {
if (!cache.isClosed()) {
try {
cache.close();
} catch (Exception e) {
e.printStackTrace();
}
}
}
throw new HttpsConnectionException(code, context.getString(R.string.toast_error));
}else{
if (proxy != null)
httpsURLConnection = (HttpsURLConnection) url.openConnection(proxy);
else
@ -282,7 +222,6 @@ public class HttpsConnection {
httpsURLConnection.getInputStream().close();
return response;
}
}
/**
@ -333,45 +272,7 @@ public class HttpsConnection {
public String get(String urlConnection) throws IOException, NoSuchAlgorithmException, KeyManagementException, HttpsConnectionException {
if (Build.VERSION.SDK_INT >= 21) {
Cache cache = new Cache(context.getCacheDir(), cacheSize);
OkHttpClient.Builder builder = new OkHttpClient.Builder().connectTimeout(30, TimeUnit.SECONDS).cache(cache);
if (proxy != null) {
builder.proxy(proxy);
}
if( !urlConnection.startsWith("http")){
urlConnection = "http://" + urlConnection;
}
OkHttpClient client = builder.build();
Request.Builder requestBuilder = new Request.Builder()
.url(urlConnection);
HttpUrl.Builder httpBuider = Objects.requireNonNull(HttpUrl.parse(urlConnection)).newBuilder();
Request requesthttp = requestBuilder
.url(httpBuider.build())
.build();
try (Response httpresponse = client.newCall(requesthttp).execute()) {
assert httpresponse.body() != null;
String response = httpresponse.body().string();
int code = httpresponse.code();
String error = httpresponse.message();
if (code >= 200 && code < 400) {
getOKHttpHeader(httpresponse.headers().toMultimap());
return response;
} else {
throw new HttpsConnectionException(code, error);
}
}finally {
if (!cache.isClosed()) {
try {
cache.close();
} catch (IOException e) {
e.printStackTrace();
}
}
}
} else {
URL url = new URL(urlConnection);
if (proxy != null)
httpsURLConnection = (HttpsURLConnection) url.openConnection(proxy);
@ -414,7 +315,7 @@ public class HttpsConnection {
getSinceMaxId();
httpsURLConnection.getInputStream().close();
return response;
}
}