msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Refactoring

Browse Source
pull/209/head
M66B 3 years ago
parent a43e424f7a
commit 660cea96e2
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File

7
app/src/dummy/java/eu/faircode/email/Send.java
Unescape View File

@ -5,10 +5,9 @@ import androidx.documentfile.provider.DocumentFile;
import java.io.InputStream; import java.io.InputStream;
public class Send { public class Send {
static final int FF_DEFAULT_DLIMIT = 0; static final int DEFAULT_DLIMIT = 0;
static final int FF_DEFAULT_TLIMIT = 0; static final int DEFAULT_TLIMIT = 0;
static final String FF_DEFAULT_SERVER = ""; static final String DEFAULT_SERVER = "";
static final String FF_INSTANCES = "";
public static String upload(InputStream is, DocumentFile dfile, int dLimit, int timeLimit, String host) { public static String upload(InputStream is, DocumentFile dfile, int dLimit, int timeLimit, String host) {
return null; return null;

10
app/src/extra/java/eu/faircode/email/Send.java
Unescape View File

@ -53,9 +53,9 @@ public class Send {
static final int DEFAULT_DLIMIT = 10; static final int DEFAULT_DLIMIT = 10;
static final int DEFAULT_TLIMIT = 24; // hours static final int DEFAULT_TLIMIT = 24; // hours
static final String FF_DEFAULT_SERVER = "https://send.vis.ee/"; static final String DEFAULT_SERVER = "https://send.vis.ee/";
private static final int FF_TIMEOUT = 20 * 1000; // milliseconds private static final int TIMEOUT = 20 * 1000; // milliseconds
public static String upload(InputStream is, DocumentFile dfile, int dLimit, int timeLimit, String host) throws Throwable { public static String upload(InputStream is, DocumentFile dfile, int dLimit, int timeLimit, String host) throws Throwable {
String result; String result;
@ -68,7 +68,7 @@ public class Send {
Uri uri = Uri.parse("wss://" + Uri.parse(host).getHost() + "/api/ws"); Uri uri = Uri.parse("wss://" + Uri.parse(host).getHost() + "/api/ws");
WebSocket ws = new WebSocketFactory().createSocket(uri.toString(), FF_TIMEOUT); WebSocket ws = new WebSocketFactory().createSocket(uri.toString(), TIMEOUT);
Semaphore sem = new Semaphore(0); Semaphore sem = new Semaphore(0);
List<String> queue = Collections.synchronizedList(new ArrayList<>()); List<String> queue = Collections.synchronizedList(new ArrayList<>());
@ -90,7 +90,7 @@ public class Send {
ws.sendText(jupload.toString()); ws.sendText(jupload.toString());
Log.i("Send wait reply"); Log.i("Send wait reply");
if (!sem.tryAcquire(FF_TIMEOUT, TimeUnit.MILLISECONDS)) if (!sem.tryAcquire(TIMEOUT, TimeUnit.MILLISECONDS))
throw new TimeoutException("reply"); throw new TimeoutException("reply");
JSONObject jreply = new JSONObject(queue.remove(0)); JSONObject jreply = new JSONObject(queue.remove(0));
@ -188,7 +188,7 @@ public class Send {
ws.sendBinary(new byte[]{0}, true); ws.sendBinary(new byte[]{0}, true);
Log.i("Send wait confirm"); Log.i("Send wait confirm");
if (!sem.tryAcquire(FF_TIMEOUT, TimeUnit.MILLISECONDS)) if (!sem.tryAcquire(TIMEOUT, TimeUnit.MILLISECONDS))
throw new TimeoutException("confirm"); throw new TimeoutException("confirm");
JSONObject jconfirm = new JSONObject(queue.remove(0)); JSONObject jconfirm = new JSONObject(queue.remove(0));

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

@ -413,7 +413,7 @@ public class FragmentDialogInsertLink extends FragmentDialogBase {
args.putString("title", dfile.getName()); args.putString("title", dfile.getName());
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
String send_host = prefs.getString("send_host", Send.FF_DEFAULT_SERVER); String send_host = prefs.getString("send_host", Send.DEFAULT_SERVER);
ContentResolver resolver = context.getContentResolver(); ContentResolver resolver = context.getContentResolver();
try (InputStream is = resolver.openInputStream(uri)) { try (InputStream is = resolver.openInputStream(uri)) {

2
app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
Unescape View File

@ -704,7 +704,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
} }
}); });
etSend.setHint(Send.FF_DEFAULT_SERVER); etSend.setHint(Send.DEFAULT_SERVER);
etSend.addTextChangedListener(new TextWatcher() { etSend.addTextChangedListener(new TextWatcher() {
@Override @Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) { public void beforeTextChanged(CharSequence s, int start, int count, int after) {

Write Preview
Loading…
Cancel
Save