From 660cea96e2c5972362ef6b7b49ec2434197e7073 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 31 Jul 2022 22:34:02 +0200
Subject: [PATCH] Refactoring

---
 app/src/dummy/java/eu/faircode/email/Send.java         |  7 +++----
 app/src/extra/java/eu/faircode/email/Send.java         | 10 +++++-----
 .../eu/faircode/email/FragmentDialogInsertLink.java    |  2 +-
 .../java/eu/faircode/email/FragmentOptionsMisc.java    |  2 +-
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/app/src/dummy/java/eu/faircode/email/Send.java b/app/src/dummy/java/eu/faircode/email/Send.java
index f6f49fd527..c4f7edb961 100644
--- a/app/src/dummy/java/eu/faircode/email/Send.java
+++ b/app/src/dummy/java/eu/faircode/email/Send.java
@@ -5,10 +5,9 @@ import androidx.documentfile.provider.DocumentFile;
 import java.io.InputStream;
 
 public class Send {
-    static final int FF_DEFAULT_DLIMIT = 0;
-    static final int FF_DEFAULT_TLIMIT = 0;
-    static final String FF_DEFAULT_SERVER = "";
-    static final String FF_INSTANCES = "";
+    static final int DEFAULT_DLIMIT = 0;
+    static final int DEFAULT_TLIMIT = 0;
+    static final String DEFAULT_SERVER = "";
 
     public static String upload(InputStream is, DocumentFile dfile, int dLimit, int timeLimit, String host) {
         return null;
diff --git a/app/src/extra/java/eu/faircode/email/Send.java b/app/src/extra/java/eu/faircode/email/Send.java
index 009dbaad00..f954fc4266 100644
--- a/app/src/extra/java/eu/faircode/email/Send.java
+++ b/app/src/extra/java/eu/faircode/email/Send.java
@@ -53,9 +53,9 @@ public class Send {
 
     static final int DEFAULT_DLIMIT = 10;
     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 {
         String result;
@@ -68,7 +68,7 @@ public class Send {
 
         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);
         List<String> queue = Collections.synchronizedList(new ArrayList<>());
@@ -90,7 +90,7 @@ public class Send {
             ws.sendText(jupload.toString());
 
             Log.i("Send wait reply");
-            if (!sem.tryAcquire(FF_TIMEOUT, TimeUnit.MILLISECONDS))
+            if (!sem.tryAcquire(TIMEOUT, TimeUnit.MILLISECONDS))
                 throw new TimeoutException("reply");
 
             JSONObject jreply = new JSONObject(queue.remove(0));
@@ -188,7 +188,7 @@ public class Send {
             ws.sendBinary(new byte[]{0}, true);
 
             Log.i("Send wait confirm");
-            if (!sem.tryAcquire(FF_TIMEOUT, TimeUnit.MILLISECONDS))
+            if (!sem.tryAcquire(TIMEOUT, TimeUnit.MILLISECONDS))
                 throw new TimeoutException("confirm");
 
             JSONObject jconfirm = new JSONObject(queue.remove(0));
diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogInsertLink.java b/app/src/main/java/eu/faircode/email/FragmentDialogInsertLink.java
index 5f900fead4..51bfc215db 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogInsertLink.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogInsertLink.java
@@ -413,7 +413,7 @@ public class FragmentDialogInsertLink extends FragmentDialogBase {
                 args.putString("title", dfile.getName());
 
                 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();
                 try (InputStream is = resolver.openInputStream(uri)) {
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
index d04a4fd6d6..cd01fe6018 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
@@ -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() {
             @Override
             public void beforeTextChanged(CharSequence s, int start, int count, int after) {