Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-12 12:03:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring

Browse Source
This commit is contained in:
M66B
2023-12-06 15:31:05 +01:00
parent 8346ded5c9
commit 3a5c8d6415
6 changed files with 34 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/eu/faircode/email/EntityRule.java
View File

@@ -50,7 +50,6 @@ import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.net.HttpURLConnection;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.text.DateFormat;
@@ -75,6 +74,7 @@ import javax.mail.Part;
import javax.mail.internet.AddressException;
import javax.mail.internet.InternetAddress;
import javax.mail.internet.InternetHeaders;
import javax.net.ssl.HttpsURLConnection;
@Entity(
tableName = EntityRule.TABLE_NAME,
@@ -1447,9 +1447,9 @@ public class EntityRule {
Log.i("GET " + url);
HttpURLConnection connection = null;
HttpsURLConnection connection = null;
try {
connection = (HttpURLConnection) new URL(url).openConnection();
connection = (HttpsURLConnection) new URL(url).openConnection();
connection.setRequestMethod(method);
connection.setDoOutput(body != null);
connection.setReadTimeout(URL_TIMEOUT);

9
app/src/main/java/eu/faircode/email/FragmentDialogInsertLink.java
View File

@@ -56,10 +56,11 @@ import org.jsoup.nodes.Element;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.net.HttpURLConnection;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import javax.net.ssl.HttpsURLConnection;
public class FragmentDialogInsertLink extends FragmentDialogBase {
private EditText etLink;
private CheckBox cbImage;
@@ -132,7 +133,7 @@ public class FragmentDialogInsertLink extends FragmentDialogBase {
tvInsecure.setVisibility(
!UriHelper.isHyperLink(uri) || UriHelper.isSecure(uri)
? View.GONE : View.VISIBLE);
btnMetadata.setEnabled(UriHelper.isHyperLink(uri));
btnMetadata.setEnabled(UriHelper.isSecure(uri));
}
});
@@ -162,7 +163,7 @@ public class FragmentDialogInsertLink extends FragmentDialogBase {
OpenGraph og = new OpenGraph();
HttpURLConnection connection = (HttpURLConnection) base.openConnection();
HttpsURLConnection connection = (HttpsURLConnection) base.openConnection();
connection.setRequestMethod("GET");
connection.setReadTimeout(METADATA_READ_TIMEOUT);
connection.setConnectTimeout(METADATA_CONNECT_TIMEOUT);
@@ -172,7 +173,7 @@ public class FragmentDialogInsertLink extends FragmentDialogBase {
try {
int status = connection.getResponseCode();
if (status != HttpURLConnection.HTTP_OK) {
if (status != HttpsURLConnection.HTTP_OK) {
String error = "Error " + status + ": " + connection.getResponseMessage();
try {
InputStream is = connection.getErrorStream();

15
app/src/main/java/eu/faircode/email/LanguageTool.java
View File

@@ -42,7 +42,6 @@ import org.json.JSONObject;
import java.io.IOException;
import java.io.InputStream;
import java.net.HttpURLConnection;
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
@@ -50,6 +49,8 @@ import java.util.Locale;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.net.ssl.HttpsURLConnection;
public class LanguageTool {
static final String LT_URI = "https://api.languagetool.org/v2/";
static final String LT_URI_PLUS = "https://api.languagetoolplus.com/v2/";
@@ -87,7 +88,7 @@ public class LanguageTool {
Log.i("LT uri=" + uri);
URL url = new URL(uri.toString());
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
HttpsURLConnection connection = (HttpsURLConnection) url.openConnection();
connection.setRequestMethod("GET");
connection.setDoOutput(false);
connection.setReadTimeout(LT_TIMEOUT * 1000);
@@ -248,7 +249,7 @@ public class LanguageTool {
Log.i("LT uri=" + uri + " request=" + request);
URL url = new URL(uri.toString());
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
HttpsURLConnection connection = (HttpsURLConnection) url.openConnection();
connection.setRequestMethod("POST");
connection.setDoOutput(true);
connection.setReadTimeout(LT_TIMEOUT * 1000);
@@ -327,7 +328,7 @@ public class LanguageTool {
Log.i("LT uri=" + uri + " request=" + request);
URL url = new URL(uri.toString());
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
HttpsURLConnection connection = (HttpsURLConnection) url.openConnection();
connection.setRequestMethod("POST");
connection.setDoOutput(true);
connection.setReadTimeout(LT_TIMEOUT * 1000);
@@ -378,7 +379,7 @@ public class LanguageTool {
Log.i("LT uri=" + uri);
URL url = new URL(uri.toString());
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
HttpsURLConnection connection = (HttpsURLConnection) url.openConnection();
connection.setRequestMethod("GET");
connection.setDoOutput(false);
connection.setReadTimeout(LT_TIMEOUT * 1000);
@@ -460,9 +461,9 @@ public class LanguageTool {
return (!TextUtils.isEmpty(lt_user) && !TextUtils.isEmpty(lt_key));
}
private static void checkStatus(HttpURLConnection connection) throws IOException {
private static void checkStatus(HttpsURLConnection connection) throws IOException {
int status = connection.getResponseCode();
if (status != HttpURLConnection.HTTP_OK) {
if (status != HttpsURLConnection.HTTP_OK) {
String error = "Error " + status + ": " + connection.getResponseMessage();
try {
InputStream is = connection.getErrorStream();

10
app/src/main/java/eu/faircode/email/MicrosoftGraph.java
View File

@@ -37,13 +37,13 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.HttpURLConnection;
import java.net.URL;
import java.util.Date;
import java.util.Objects;
import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
import javax.net.ssl.HttpsURLConnection;
public class MicrosoftGraph {
static final int GRAPH_TIMEOUT = 20; // seconds
@@ -68,7 +68,7 @@ public class MicrosoftGraph {
// https://learn.microsoft.com/en-us/graph/api/user-sendmail?view=graph-rest-1.0
URL url = new URL(MicrosoftGraph.GRAPH_ENDPOINT + "sendMail");
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
HttpsURLConnection connection = (HttpsURLConnection) url.openConnection();
connection.setRequestMethod("POST");
connection.setDoOutput(true);
connection.setReadTimeout(MicrosoftGraph.GRAPH_TIMEOUT * 1000);
@@ -90,7 +90,7 @@ public class MicrosoftGraph {
long end = new Date().getTime();
int status = connection.getResponseCode();
if (status == HttpURLConnection.HTTP_ACCEPTED) {
if (status == HttpsURLConnection.HTTP_ACCEPTED) {
EntityLog.log(context, "Sent via Graph " + ident.user + " elapse=" + (end - start) + " ms");
boolean log = prefs.getBoolean("protocol", false);
if (log || BuildConfig.DEBUG)
@@ -136,7 +136,7 @@ public class MicrosoftGraph {
// https://learn.microsoft.com/en-us/graph/api/user-list-contacts?view=graph-rest-1.0&tabs=http
URL url = new URL(MicrosoftGraph.GRAPH_ENDPOINT + "contacts");
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
HttpsURLConnection connection = (HttpsURLConnection) url.openConnection();
connection.setRequestMethod("GET");
connection.setReadTimeout(GRAPH_TIMEOUT * 1000);
connection.setConnectTimeout(GRAPH_TIMEOUT * 1000);
@@ -146,7 +146,7 @@ public class MicrosoftGraph {
try {
int status = connection.getResponseCode();
if (status == HttpURLConnection.HTTP_OK) {
if (status == HttpsURLConnection.HTTP_OK) {
String response = Helper.readStream(connection.getInputStream());
JSONObject jroot = new JSONObject(response);
JSONArray jvalue = jroot.getJSONArray("value");

8
app/src/main/java/eu/faircode/email/OpenAI.java
View File

@@ -33,7 +33,6 @@ import org.json.JSONObject;
import java.io.IOException;
import java.io.InputStream;
import java.net.HttpURLConnection;
import java.net.URL;
import java.util.ArrayList;
import java.util.Date;
@@ -41,6 +40,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.Objects;
import javax.net.ssl.HttpsURLConnection;
public class OpenAI {
private static final int MAX_OPENAI_LEN = 1000; // characters
private static final int TIMEOUT = 45; // seconds
@@ -146,7 +147,8 @@ public class OpenAI {
long start = new Date().getTime();
URL url = new URL(uri.toString());
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
HttpsURLConnection connection = (HttpsURLConnection) url.openConnection();
connection.setRequestMethod(method);
connection.setDoOutput(args != null);
connection.setDoInput(true);
@@ -166,7 +168,7 @@ public class OpenAI {
}
int status = connection.getResponseCode();
if (status != HttpURLConnection.HTTP_OK) {
if (status != HttpsURLConnection.HTTP_OK) {
// https://platform.openai.com/docs/guides/error-codes/api-errors
String error = "Error " + status + ": " + connection.getResponseMessage();
try {