.idea/AndroidProjectSystem.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AndroidProjectSystem">
-    <option name="providerId" value="com.android.tools.idea.GradleProjectSystem" />
-  </component>
-</project>

.idea/deploymentTargetSelector.xml

@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2025-09-05T19:18:31.537268933Z">
+        <DropdownSelection timestamp="2025-01-09T00:51:44.224576189Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="LocalEmulator" identifier="path=/home/nicolas/.android/avd/Pixel_6_Pro_API_34.avd" />
+              <DeviceId pluginId="PhysicalDevice" identifier="serial=ZY22FN7MHQ" />
             </handle>
           </Target>
         </DropdownSelection>

app/src/main/java/com/example/dcav2gui/EarnerInterface.java

@@ -345,7 +345,7 @@ public class EarnerInterface {
             final double amountToSubscribe = Double.parseDouble(input.getText().toString());
             new Thread(() -> {
                 try {
-                    JsonObject response = subscribeFunds(exchange, amountToSubscribe,true,true);
+                    JsonObject response = subscribeFunds(exchange, amountToSubscribe,true);
                     new Handler(Looper.getMainLooper()).post(() -> {
                         showJsonDialog(response, context);
                     });
@@ -379,7 +379,7 @@ public class EarnerInterface {
             final double amountToRedeem = Double.parseDouble(input.getText().toString());
             new Thread(() -> {
                 try {
-                    JsonObject response = redeemFunds(exchange, amountToRedeem,true,true);
+                    JsonObject response = redeemFunds(exchange, amountToRedeem,true);
                     new Handler(Looper.getMainLooper()).post(() -> {
                         showJsonDialog(response, context);
                     });
@@ -868,12 +868,11 @@ public class EarnerInterface {
         }
     }
 
-    public static JsonObject subscribeFunds(String exchange, double amount, boolean forcePause, boolean retry) throws IOException {
+    public static JsonObject subscribeFunds(String exchange, double amount, boolean retry) throws IOException {
         Gson gson = new Gson();
         JsonObject jsonPayload = new JsonObject();
         jsonPayload.addProperty("broker", exchange);
         jsonPayload.addProperty("amount", amount);
-        jsonPayload.addProperty("force_pause", forcePause);
         String jsonPayloadString = gson.toJson(jsonPayload);
 
         RequestBody requestBody = RequestBody.create(jsonPayloadString, MediaType.get("application/json; charset=utf-8"));
@@ -886,7 +885,7 @@ public class EarnerInterface {
         try (Response subscribeFundsResponse = httpClient.newCall(subscribeFundsRequest).execute()) {
             if (!subscribeFundsResponse.isSuccessful()) {
                 if (subscribeFundsResponse.code() == 503 && retry) {
-                    return subscribeFunds(exchange, amount, forcePause,false);
+                    return subscribeFunds(exchange, amount, false);
                 }
                 throw new IOException("Unexpected code " + subscribeFundsResponse);
             }
@@ -907,12 +906,11 @@ public class EarnerInterface {
         }
     }
 
-    public static JsonObject redeemFunds(String exchange, double amount, boolean forcePause, boolean retry) throws IOException {
+    public static JsonObject redeemFunds(String exchange, double amount, boolean retry) throws IOException {
         Gson gson = new Gson();
         JsonObject jsonPayload = new JsonObject();
         jsonPayload.addProperty("broker", exchange);
         jsonPayload.addProperty("amount", amount);
-        jsonPayload.addProperty("force_pause", forcePause);
         String jsonPayloadString = gson.toJson(jsonPayload);
 
         RequestBody requestBody = RequestBody.create(jsonPayloadString, MediaType.get("application/json; charset=utf-8"));
@@ -925,7 +923,7 @@ public class EarnerInterface {
         try (Response redeemFundsResponse = httpClient.newCall(redeemFundsRequest).execute()) {
             if (!redeemFundsResponse.isSuccessful()) {
                 if (redeemFundsResponse.code() == 503 && retry) {
-                    return redeemFunds(exchange, amount, forcePause,false);
+                    return redeemFunds(exchange, amount, false);
                 }
                 throw new IOException("Unexpected code " + redeemFundsResponse);
             }

app/src/main/java/com/example/dcav2gui/InstanceInterface.java

@@ -2,12 +2,9 @@ package com.example.dcav2gui;
 
 import static com.example.dcav2gui.MainActivity.globalSettings;
 
-import android.util.Log;
-
 import androidx.annotation.NonNull;
 
 import com.example.dcav2gui.ui.exchanges.WorkerData;
-import com.google.gson.Gson;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
@@ -22,10 +19,8 @@ import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 
-import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
-import okhttp3.RequestBody;
 import okhttp3.Response;
 
 
@@ -382,45 +377,6 @@ public class InstanceInterface {
         }
     }
 
-
-    public static JsonObject modDefaultOrderSize(String exchange, double newOrderSize, boolean retry) throws IOException {
-        Gson gson = new Gson();
-        JsonObject jsonPayload = new JsonObject();
-        jsonPayload.addProperty("amount", String.valueOf(newOrderSize));
-        String jsonPayloadString = gson.toJson(jsonPayload);
-
-        RequestBody requestBody = RequestBody.create(jsonPayloadString, MediaType.get("application/json; charset=utf-8"));
-        Request modDefaultOrderSizeRequest = new Request.Builder()
-                .url(API_BASE_URL + "/" + exchange + "/mod_default_order_size")
-                .header("X-API-KEY", API_KEY)
-                .post(requestBody)
-                .build();
-
-        try (Response modDefaultOrderSizeResponse = httpClient.newCall(modDefaultOrderSizeRequest).execute()) {
-            if (!modDefaultOrderSizeResponse.isSuccessful()) {
-                if (modDefaultOrderSizeResponse.code() == 503 && retry) {
-                    return modDefaultOrderSize(exchange, newOrderSize,false);
-                }
-                throw new IOException("Unexpected code " + modDefaultOrderSizeResponse);
-            }
-            String modDefaultOrderSizeResponseBody = modDefaultOrderSizeResponse.body().string();
-            JsonElement jsonElement = JsonParser.parseString(modDefaultOrderSizeResponseBody);
-            if (!jsonElement.isJsonObject()) {
-                System.err.println("The parsed JSON response is not a JsonObject.");
-                return null;
-            }
-            JsonObject jsonObject = jsonElement.getAsJsonObject();
-            if (jsonObject.has("Error")) {
-                System.err.println("The parsed JSON response contains Error");
-                return jsonObject;
-            }
-
-            //If no error, the response is {"Success": f"Success. Default order size modified to $amount}"}
-            return jsonObject;
-        }
-    }
-
-
     public static String getAllLogs(String exchange, boolean retry) throws IOException {
         //200 lines hard limit
         Request logRequest = new Request.Builder()
@@ -694,24 +650,10 @@ public class InstanceInterface {
                     double price = value.has("price") && value.get("price").isJsonPrimitive() ? value.get("price").getAsDouble() : 0.0;
                     double takeProfitPrice = value.has("take_profit_price") && value.get("take_profit_price").isJsonPrimitive() ? value.get("take_profit_price").getAsDouble() : 0.0;
                     double nextSoPrice = value.has("next_so_price") && value.get("next_so_price").isJsonPrimitive() ? value.get("next_so_price").getAsDouble() : 0.0;
-                    JsonObject takeProfitOrder = null;
+                    String tpOrderId = value.has("tp_order_id") && value.get("tp_order_id").isJsonPrimitive() ? value.get("tp_order_id").getAsString() : null;
-                    String tpOrderId = "";
+                    JsonObject takeProfitOrder = value.get("take_profit_order").getAsJsonObject();
-                    JsonArray safetyOrders = null;
+                    String safetyOrderId = value.has("so_order_id") && value.get("so_order_id").isJsonPrimitive() ? value.get("so_order_id").getAsString() : null;
-                    String safetyOrderId = "";
+                    JsonObject safetyOrder = value.get("safety_order").getAsJsonObject();
-                    JsonElement takeProfitOrderElement = value.get("take_profit_order");
-                    if (takeProfitOrderElement!=null && !takeProfitOrderElement.isJsonNull() && takeProfitOrderElement.isJsonObject()) {
-                        takeProfitOrder = takeProfitOrderElement.getAsJsonObject();
-                        tpOrderId = takeProfitOrder.has("id") && takeProfitOrder.get("id").isJsonPrimitive() ? takeProfitOrder.get("id").getAsString() : "";
-                    }
-                    JsonElement safetyOrderElements = value.get("safety_orders");
-                    if (safetyOrderElements!=null && !safetyOrderElements.isJsonNull() && safetyOrderElements.isJsonArray()) {
-                        safetyOrders = safetyOrderElements.getAsJsonArray();
-                        if (!safetyOrders.isEmpty()) {
-                            JsonObject firstSafetyOrder = safetyOrders.get(0).getAsJsonObject();
-                            safetyOrderId = firstSafetyOrder.has("id") && firstSafetyOrder.get("id").isJsonPrimitive() ? firstSafetyOrder.get("id").getAsString() : "";
-                        }
-                    }
-                    int safetyOrdersFilled = value.has("safety_orders_filled") && value.get("safety_orders_filled").isJsonPrimitive() ? value.get("safety_orders_filled").getAsInt() : 0;
                     double feesPaidInBase = value.has("fees_paid_in_base") && value.get("fees_paid_in_base").isJsonPrimitive() ? value.get("fees_paid_in_base").getAsDouble() : 0.0;
                     double feesPaidInQuote = value.has("fees_paid_in_quote") && value.get("fees_paid_in_quote").isJsonPrimitive() ? value.get("fees_paid_in_quote").getAsDouble() : 0.0;
                     double partialProfit = value.has("partial_profit") && value.get("partial_profit").isJsonPrimitive() ? value.get("partial_profit").getAsDouble() : 0.0;
@@ -723,15 +665,13 @@ public class InstanceInterface {
                     OldLongDictionary oldLongDictionary = null;
                     if (value.has("old_long")) {
                         oldLong = value.get("old_long").getAsJsonObject();
-                        if (!oldLong.entrySet().isEmpty()) {
+                        oldLongDictionary = new OldLongDictionary(
-                            oldLongDictionary = new OldLongDictionary(
+                                oldLong.get("datetime").getAsString(),
-                                    oldLong.get("datetime").getAsString(),
+                                oldLong.get("fees_paid_in_quote").getAsDouble(),
-                                    oldLong.get("fees_paid_in_quote").getAsDouble(),
+                                oldLong.get("quote_spent").getAsDouble(),
-                                    oldLong.get("quote_spent").getAsDouble(),
+                                oldLong.get("tp_amount").getAsDouble(),
-                                    oldLong.get("tp_amount").getAsDouble(),
+                                oldLong.get("tp_price").getAsDouble()
-                                    oldLong.get("tp_price").getAsDouble()
+                        );
-                            );
-                        }
                     }
 
                     valueToReturn.add(new WorkerStatsData(
@@ -759,8 +699,7 @@ public class InstanceInterface {
                             tpOrderId,
                             takeProfitOrder,
                             safetyOrderId,
-                            safetyOrders,
+                            safetyOrder,
-                            safetyOrdersFilled,
                             feesPaidInBase,
                             feesPaidInQuote,
                             partialProfit,
@@ -771,7 +710,7 @@ public class InstanceInterface {
                             statusString
                     ));
                 } catch (Exception e) {
-                    System.err.println("In getAllWorkersStats: Error processing JSON for key '" + key + "': " + e.getMessage());
+                    System.err.println("Error processing JSON for key '" + key + "': " + e.getMessage());
                 }
             }
         }
@@ -892,7 +831,6 @@ public class InstanceInterface {
                 WorkerData workerData = new WorkerData(
                         workerStatsData.getPair(),
                         workerStatsData.getSoAmount(),
-                        workerStatsData.getSafetyOrdersFilled(),
                         workerStatsData.getNumberOfSafetyOrders(),
                         workerStatsData.getDealUptime(),
                         workerStatsData.getNextSoPrice(),
@@ -1103,14 +1041,14 @@ public class InstanceInterface {
         private final double dealStartTime;
         private final double dealUptime;
         private final double totalUptime;
+
         private final double price;
         private final double takeProfitPrice;
         private final double nextSoPrice;
         private final String tpOrderId;
         private final JsonObject takeProfitOrder;
         private final String soOrderId;
-        private final JsonArray safetyOrders;
+        private final JsonObject safetyOrder;
-        private final int safetyOrdersFilled;
         private final double feesPaidInBase;
         private final double feesPaidInQuote;
         private final double partialProfit;
@@ -1120,7 +1058,7 @@ public class InstanceInterface {
         private final OldLongDictionary oldLongDictionary; //Change type
         private final String statusString;
 
-        public WorkerStatsData(String pair, boolean isShort, boolean isBoosted, boolean isPaused, boolean autoSwitchEnabled, boolean stopWhenProfit, double orderSize, double quoteSpent, double baseBought, int soAmount, int numberOfSafetyOrders, int tpMode, String profitTable, double startTime, double startPrice, double dealStartTime, double dealUptime, double totalUptime, double price, double takeProfitPrice, double nextSoPrice, String tpOrderId, JsonObject takeProfitOrder, String soOrderId, JsonArray safetyOrders, int safetyOrdersFilled, double feesPaidInBase, double feesPaidInQuote, double partialProfit, String safetyPriceTable, String dealOrderHistory, String pauseReason, OldLongDictionary oldLong, String statusString) {
+        public WorkerStatsData(String pair, boolean isShort, boolean isBoosted, boolean isPaused, boolean autoSwitchEnabled, boolean stopWhenProfit, double orderSize, double quoteSpent, double baseBought, int soAmount, int numberOfSafetyOrders, int tpMode, String profitTable, double startTime, double startPrice, double dealStartTime, double dealUptime, double totalUptime, double price, double takeProfitPrice, double nextSoPrice, String tpOrderId, JsonObject takeProfitOrder, String soOrderId, JsonObject safetyOrder, double feesPaidInBase, double feesPaidInQuote, double partialProfit, String safetyPriceTable, String dealOrderHistory, String pauseReason, OldLongDictionary oldLong, String statusString) {
             this.pair = pair;
             this.isShort = isShort;
             this.isBoosted = isBoosted;
@@ -1145,8 +1083,7 @@ public class InstanceInterface {
             this.tpOrderId = tpOrderId;
             this.takeProfitOrder = takeProfitOrder;
             this.soOrderId = soOrderId;
-            this.safetyOrders = safetyOrders;
+            this.safetyOrder = safetyOrder;
-            this.safetyOrdersFilled = safetyOrdersFilled;
             this.feesPaidInBase = feesPaidInBase;
             this.feesPaidInQuote = feesPaidInQuote;
             this.partialProfit = partialProfit;
@@ -1180,8 +1117,7 @@ public class InstanceInterface {
         public String getTpOrderId() { return tpOrderId; }
         public JsonObject getTakeProfitOrder() { return takeProfitOrder; }
         public String getSoOrderId() { return soOrderId; }
-        public JsonArray getSafetyOrders() { return safetyOrders; }
+        public JsonObject getSafetyOrder() { return safetyOrder; }
-        public int getSafetyOrdersFilled() { return safetyOrdersFilled; }
         public double getFeesPaidInBase() { return feesPaidInBase; }
         public double getFeesPaidInQuote() { return feesPaidInQuote; }
         public double getPartialProfit() { return partialProfit; }

app/src/main/java/com/example/dcav2gui/MainActivity.java

@@ -203,7 +203,7 @@ public class MainActivity extends AppCompatActivity {
         promptInfo = new BiometricPrompt.PromptInfo.Builder()
                 .setTitle("Authenticate to access your app")
                 .setSubtitle("Verify your identity")
-                .setDescription("Use your fingerprint or PIN to access")
+                .setDescription("Use your fingerprint or PIN to access your trading information")
                 .setAllowedAuthenticators(BiometricManager.Authenticators.BIOMETRIC_STRONG | BiometricManager.Authenticators.DEVICE_CREDENTIAL)
                 .build();
 

app/src/main/java/com/example/dcav2gui/WorkerInterface.java

@@ -23,7 +23,6 @@ import com.example.dcav2gui.ui.exchanges.adapters.WorkerCardAdapter;
 import com.example.dcav2gui.ui.home.HomeFragment;
 import com.google.android.material.materialswitch.MaterialSwitch;
 import com.google.gson.Gson;
-import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
@@ -94,19 +93,10 @@ public class WorkerInterface {
                 double price = value.has("price") && value.get("price").isJsonPrimitive() ? value.get("price").getAsDouble() : 0.0;
                 double takeProfitPrice = value.has("take_profit_price") && value.get("take_profit_price").isJsonPrimitive() ? value.get("take_profit_price").getAsDouble() : 0.0;
                 double nextSoPrice = value.has("next_so_price") && value.get("next_so_price").isJsonPrimitive() ? value.get("next_so_price").getAsDouble() : 0.0;
+                String tpOrderId = value.has("tp_order_id") && value.get("tp_order_id").isJsonPrimitive() ? value.get("tp_order_id").getAsString() : null;
                 JsonObject takeProfitOrder = value.get("take_profit_order").getAsJsonObject();
-                JsonArray safetyOrders = null;
+                String safetyOrderId = value.has("so_order_id") && value.get("so_order_id").isJsonPrimitive() ? value.get("so_order_id").getAsString() : null;
-                String safetyOrderId = "";
+                JsonObject safetyOrder = value.get("safety_order").getAsJsonObject();
-                JsonElement safetyOrderElements = value.get("safety_orders");
-                if (safetyOrderElements!=null && !safetyOrderElements.isJsonNull() && safetyOrderElements.isJsonArray()) {
-                    safetyOrders = safetyOrderElements.getAsJsonArray();
-                    if (!safetyOrders.isEmpty()) {
-                        JsonObject firstSafetyOrder = safetyOrders.get(0).getAsJsonObject();
-                        safetyOrderId = firstSafetyOrder.has("id") && firstSafetyOrder.get("id").isJsonPrimitive() ? firstSafetyOrder.get("id").getAsString() : "";
-                    }
-                }
-                int safetyOrdersFilled = value.has("safety_orders_filled") && value.get("safety_orders_filled").isJsonPrimitive() ? value.get("safety_orders_filled").getAsInt() : 0;
-                String tpOrderId = takeProfitOrder.has("id") && takeProfitOrder.get("id").isJsonPrimitive() ? takeProfitOrder.get("id").getAsString() : null;
                 double feesPaidInBase = value.has("fees_paid_in_base") && value.get("fees_paid_in_base").isJsonPrimitive() ? value.get("fees_paid_in_base").getAsDouble() : 0.0;
                 double feesPaidInQuote = value.has("fees_paid_in_quote") && value.get("fees_paid_in_quote").isJsonPrimitive() ? value.get("fees_paid_in_quote").getAsDouble() : 0.0;
                 double partialProfit = value.has("partial_profit") && value.get("partial_profit").isJsonPrimitive() ? value.get("partial_profit").getAsDouble() : 0.0;
@@ -118,15 +108,13 @@ public class WorkerInterface {
                 InstanceInterface.OldLongDictionary oldLongDictionary = null;
                 if (value.has("old_long")) {
                     oldLong = value.get("old_long").getAsJsonObject();
-                    if (!oldLong.entrySet().isEmpty()) {
+                    oldLongDictionary = new InstanceInterface.OldLongDictionary(
-                        oldLongDictionary = new InstanceInterface.OldLongDictionary(
+                            oldLong.get("datetime").getAsString(),
-                                oldLong.get("datetime").getAsString(),
+                            oldLong.get("fees_paid_in_quote").getAsDouble(),
-                                oldLong.get("fees_paid_in_quote").getAsDouble(),
+                            oldLong.get("quote_spent").getAsDouble(),
-                                oldLong.get("quote_spent").getAsDouble(),
+                            oldLong.get("tp_amount").getAsDouble(),
-                                oldLong.get("tp_amount").getAsDouble(),
+                            oldLong.get("tp_price").getAsDouble()
-                                oldLong.get("tp_price").getAsDouble()
+                    );
-                        );
-                    }
                 }
 
                 valueToReturn = new InstanceInterface.WorkerStatsData(
@@ -154,8 +142,7 @@ public class WorkerInterface {
                         tpOrderId,
                         takeProfitOrder,
                         safetyOrderId,
-                        safetyOrders,
+                        safetyOrder,
-                        safetyOrdersFilled,
                         feesPaidInBase,
                         feesPaidInQuote,
                         partialProfit,
@@ -650,93 +637,6 @@ public class WorkerInterface {
         }
     }
 
-    public static JsonObject modConcurrentSafetyOrders(String exchange, String pair, int amount, boolean retry) throws IOException {
-        String[] pairBaseAndQuote = pair.split("/");
-        String base = pairBaseAndQuote[0];
-        String quote = pairBaseAndQuote[1];
-
-        Gson gson = new Gson();
-        JsonObject jsonPayload = new JsonObject();
-        jsonPayload.addProperty("base", base);
-        jsonPayload.addProperty("quote", quote);
-        jsonPayload.addProperty("amount", String.valueOf(amount));
-        String jsonPayloadString = gson.toJson(jsonPayload);
-
-        RequestBody requestBody = RequestBody.create(jsonPayloadString, MediaType.get("application/json; charset=utf-8"));
-        Request modConcurrentSafetyOrdersRequest = new Request.Builder()
-                .url(API_BASE_URL + "/" + exchange + "/mod_concurrent_safety_orders")
-                .header("X-API-KEY", API_KEY)
-                .post(requestBody)
-                .build();
-
-        try (Response modConcurrentSafetyOrdersResponse = httpClient.newCall(modConcurrentSafetyOrdersRequest).execute()) {
-            if (!modConcurrentSafetyOrdersResponse.isSuccessful()) {
-                if (modConcurrentSafetyOrdersResponse.code() == 503 && retry) {
-                    return modConcurrentSafetyOrders(exchange, pair, amount,false);
-                }
-                throw new IOException("Unexpected code " + modConcurrentSafetyOrdersResponse);
-            }
-            String modConcurrentSafetyOrdersResponseBody = modConcurrentSafetyOrdersResponse.body().string();
-            JsonElement jsonElement = JsonParser.parseString(modConcurrentSafetyOrdersResponseBody);
-            if (!jsonElement.isJsonObject()) {
-                System.err.println("The parsed JSON response is not a JsonObject.");
-                return null;
-            }
-            JsonObject jsonObject = jsonElement.getAsJsonObject();
-            if (jsonObject.has("Error")) {
-                System.err.println("The parsed JSON response contains Error");
-                return jsonObject;
-            }
-
-            //If no error, the response is {"Success": "Success. The change will take effect as new safety orders are sent or filled"}
-            return jsonObject;
-        }
-    }
-
-
-    public static JsonObject modOrderSize(String exchange, String pair, double newOrderSize, boolean retry) throws IOException {
-        String[] pairBaseAndQuote = pair.split("/");
-        String base = pairBaseAndQuote[0];
-        String quote = pairBaseAndQuote[1];
-
-        Gson gson = new Gson();
-        JsonObject jsonPayload = new JsonObject();
-        jsonPayload.addProperty("base", base);
-        jsonPayload.addProperty("quote", quote);
-        jsonPayload.addProperty("amount", String.valueOf(newOrderSize));
-        String jsonPayloadString = gson.toJson(jsonPayload);
-
-        RequestBody requestBody = RequestBody.create(jsonPayloadString, MediaType.get("application/json; charset=utf-8"));
-        Request modOrderSizeRequest = new Request.Builder()
-                .url(API_BASE_URL + "/" + exchange + "/mod_order_size")
-                .header("X-API-KEY", API_KEY)
-                .post(requestBody)
-                .build();
-
-        try (Response modOrderSizeResponse = httpClient.newCall(modOrderSizeRequest).execute()) {
-            if (!modOrderSizeResponse.isSuccessful()) {
-                if (modOrderSizeResponse.code() == 503 && retry) {
-                    return modOrderSize(exchange, pair, newOrderSize,false);
-                }
-                throw new IOException("Unexpected code " + modOrderSizeResponse);
-            }
-            String modOrderSizeResponseBody = modOrderSizeResponse.body().string();
-            JsonElement jsonElement = JsonParser.parseString(modOrderSizeResponseBody);
-            if (!jsonElement.isJsonObject()) {
-                System.err.println("The parsed JSON response is not a JsonObject.");
-                return null;
-            }
-            JsonObject jsonObject = jsonElement.getAsJsonObject();
-            if (jsonObject.has("Error")) {
-                System.err.println("The parsed JSON response contains Error");
-                return jsonObject;
-            }
-
-            //If no error, the response is {"Success": "Success. The change will take effect when the next deal is started"}
-            return jsonObject;
-        }
-    }
-
 
     public static JsonObject addSafetyOrders(String exchange, String pair, int amount, boolean retry) throws IOException {
         String[] pairBaseAndQuote = pair.split("/");
@@ -987,18 +887,11 @@ public class WorkerInterface {
 
     public static void sendRemoveTraderCall(String exchange, String pair, Context context) {
         AlertDialog.Builder builder = new AlertDialog.Builder(context);
-        builder.setTitle("Remove trader from instance?");
+        builder.setTitle("Remove "+ pair + " from instance?");
-        final EditText input = new EditText(context);
-        input.setInputType(InputType.TYPE_CLASS_TEXT);
-        input.setTextAlignment(View.TEXT_ALIGNMENT_CENTER);
-        input.setText(pair);
-        builder.setView(input);
-
         builder.setPositiveButton("Remove trader", (dialog, which) -> {
-            final String pairToRemove = input.getText().toString();
             new Thread(() -> {
                 try {
-                    JsonObject response = WorkerInterface.removeTrader(exchange, pairToRemove, true);
+                    JsonObject response = WorkerInterface.removeTrader(exchange, pair, true);
                     new Handler(Looper.getMainLooper()).post(() -> {
                         showToggleDialog(response, context);
                     });
@@ -1121,77 +1014,6 @@ public class WorkerInterface {
         builder.show();
     }
 
-    public static void sendModifyConcurrentSafetyOrdersCall(String exchange, String pair, Context context) {
-        AlertDialog.Builder builder = new AlertDialog.Builder(context);
-        builder.setTitle("Modify concurrent safety orders of  "+ pair);
-
-        final EditText input = new EditText(context);
-        input.setInputType(InputType.TYPE_CLASS_NUMBER);
-        input.setTextAlignment(View.TEXT_ALIGNMENT_CENTER);
-        builder.setView(input);
-
-        builder.setPositiveButton("Modify concurrent safety orders", (dialog, which) -> {
-            final int newAmount = Integer.parseInt(input.getText().toString());
-            new Thread(() -> {
-                try {
-                    JsonObject response = WorkerInterface.modConcurrentSafetyOrders(exchange, pair, newAmount, true);
-                    new Handler(Looper.getMainLooper()).post(() -> {
-                        showToggleDialog(response, context);
-                    });
-                } catch (IOException e) {
-                    e.printStackTrace();
-                    // Show an error dialog on the main thread
-                    new Handler(Looper.getMainLooper()).post(() -> {
-                        AlertDialog.Builder errorBuilder = new AlertDialog.Builder(context);
-                        errorBuilder.setTitle("Error");
-                        errorBuilder.setMessage("Failed to modify concurrent safety orders: " + e.getMessage());
-                        errorBuilder.setPositiveButton("OK", null);
-                        errorBuilder.show();
-                    });
-                }
-            }).start();
-        });
-
-        builder.setNegativeButton("Cancel", (dialog, which) -> dialog.cancel());
-        builder.show();
-    }
-
-
-    public static void sendModifyOrderSizeCall(String exchange, String pair, Context context) {
-        AlertDialog.Builder builder = new AlertDialog.Builder(context);
-        builder.setTitle("Modify order size of  "+ pair);
-
-        final EditText input = new EditText(context);
-        input.setInputType(InputType.TYPE_CLASS_NUMBER);
-        input.setTextAlignment(View.TEXT_ALIGNMENT_CENTER);
-        builder.setView(input);
-
-        builder.setPositiveButton("Modify", (dialog, which) -> {
-            final double newOrderSize = Double.parseDouble(input.getText().toString());
-            new Thread(() -> {
-                try {
-                    JsonObject response = WorkerInterface.modOrderSize(exchange, pair, newOrderSize, true);
-                    new Handler(Looper.getMainLooper()).post(() -> {
-                        showToggleDialog(response, context);
-                    });
-                } catch (IOException e) {
-                    e.printStackTrace();
-                    // Show an error dialog on the main thread
-                    new Handler(Looper.getMainLooper()).post(() -> {
-                        AlertDialog.Builder errorBuilder = new AlertDialog.Builder(context);
-                        errorBuilder.setTitle("Error");
-                        errorBuilder.setMessage("Failed to modify order size: " + e.getMessage());
-                        errorBuilder.setPositiveButton("OK", null);
-                        errorBuilder.show();
-                    });
-                }
-            }).start();
-        });
-
-        builder.setNegativeButton("Cancel", (dialog, which) -> dialog.cancel());
-        builder.show();
-    }
-
 
     public static void sendAddSafetyOrdersCall(String exchange, String pair, Context context) {
         AlertDialog.Builder builder = new AlertDialog.Builder(context);
@@ -1305,9 +1127,6 @@ public class WorkerInterface {
                 "Next safety order price: " + String.format(Locale.ROOT, numberFormat,result.getNextSoPrice()) + "\n" +
                 "Take profit order ID: " + result.getTpOrderId() + "\n" +
                 "Safety order ID: " + result.getSoOrderId() + "\n" +
-                "Safety orders online: " + result.getSafetyOrders().size() + "\n" +
-                "Safety orders filled: " + result.getSafetyOrdersFilled() + "\n" +
-                "Max safety orders: " + result.getNumberOfSafetyOrders() + "\n" +
                 "Short: " + result.getIsShort() + "\n" +
                 "Boosted: " + result.getIsBoosted() + "\n" +
                 "Paused: " + result.getIsPaused() + "\n" + isPausedExtraString +
@@ -1316,6 +1135,8 @@ public class WorkerInterface {
                 "Order size: " + result.getOrderSize() + "\n" +
                 "Quote in deal: " + result.getQuoteSpent() + "\n" +
                 "Base in deal: " + result.getBaseBought() + "\n" +
+                "Safety orders sent: " + (result.getSoAmount()-1) + "\n" +
+                "Max safety orders: " + result.getNumberOfSafetyOrders() + "\n" +
                 "Start time: " + HomeFragment.timeStampConverter(result.getStartTime(), false) + "\n" +
                 "Total uptime: " + WorkerCardAdapter.formatSeconds(result.getTotalUptime()) + "\n" +
                 "Start price: " + String.format(Locale.ROOT, numberFormat,result.getStartPrice()) + "\n" +

app/src/main/java/com/example/dcav2gui/ui/earners/EarnerCardAdapter.java

@@ -92,21 +92,9 @@ public class EarnerCardAdapter {
 
     public void populateStatusBar(TextView statusBar, EarnerInterface.EarnerGlobalData earnerData) {
         double uptime = earnerData.getUptime();
-        //Loop through all the earners in earnerData and calculate total funds
-        double totalEarningFunds = 0;
-        double totalTradingFunds = 0;
-        for (EarnerData earner : earnerData.getEarnerList()) {
-            totalEarningFunds += earner.getEarningBalance();
-            totalTradingFunds += earner.getTradingBalance();
-        }
-        double totalFunds = totalEarningFunds + totalTradingFunds;
-        String earningPercentage = String.format(Locale.ROOT, "%.2f", totalEarningFunds/totalFunds*100);
-
         List<EarnerData> earnerList = earnerData.getEarnerList();
 
-        String statusBarText = "Uptime: " + formatSeconds(uptime) + " | Total funds: " +
+        String statusBarText = "Uptime: " + formatSeconds(uptime) + " | Earners online: " + earnerList.size();
-                String.format(Locale.ROOT, "%.2f", totalFunds) + " USDT \n On Earn: " +
-                String.format(Locale.ROOT, "%.2f", totalEarningFunds) + " USDT (" + earningPercentage + "%)";
         statusBar.setText(statusBarText);
     }
 

app/src/main/java/com/example/dcav2gui/ui/exchanges/BinanceFragment.java

@@ -100,12 +100,6 @@ public class BinanceFragment extends Fragment implements WorkerCardAdapter.OnCar
                     } else if (item.getItemId() == R.id.switchQuoteCurrency) {
                         WorkerInterface.sendSwitchQuoteCurrencyCall("binance", pair, getContext());
                         return true;
-                    } else if (item.getItemId() == R.id.modConcurrentSafetyOrders) {
-                        WorkerInterface.sendModifyConcurrentSafetyOrdersCall("binance", pair, getContext());
-                        return true;
-                    } else if (item.getItemId() == R.id.modOrderSize) {
-                        WorkerInterface.sendModifyOrderSizeCall("binance", pair, getContext());
-                        return true;
                     } else if (item.getItemId() == R.id.addSafetyOrders) {
                         WorkerInterface.sendAddSafetyOrdersCall("binance", pair, getContext());
                         return true;

app/src/main/java/com/example/dcav2gui/ui/exchanges/GateioFragment.java

@@ -99,12 +99,6 @@ public class GateioFragment extends Fragment implements WorkerCardAdapter.OnCard
                     } else if (item.getItemId() == R.id.switchQuoteCurrency) {
                         WorkerInterface.sendSwitchQuoteCurrencyCall("gateio", pair, getContext());
                         return true;
-                    } else if (item.getItemId() == R.id.modConcurrentSafetyOrders) {
-                        WorkerInterface.sendModifyConcurrentSafetyOrdersCall("gateio", pair, getContext());
-                        return true;
-                    } else if (item.getItemId() == R.id.modOrderSize) {
-                        WorkerInterface.sendModifyOrderSizeCall("gateio", pair, getContext());
-                        return true;
                     } else if (item.getItemId() == R.id.addSafetyOrders) {
                         WorkerInterface.sendAddSafetyOrdersCall("gateio", pair, getContext());
                         return true;

app/src/main/java/com/example/dcav2gui/ui/exchanges/KucoinFragment.java

@@ -99,12 +99,6 @@ public class KucoinFragment extends Fragment implements WorkerCardAdapter.OnCard
                     } else if (item.getItemId() == R.id.switchQuoteCurrency) {
                         WorkerInterface.sendSwitchQuoteCurrencyCall("kucoin", pair, getContext());
                         return true;
-                    } else if (item.getItemId() == R.id.modConcurrentSafetyOrders) {
-                        WorkerInterface.sendModifyConcurrentSafetyOrdersCall("kucoin", pair, getContext());
-                        return true;
-                    } else if (item.getItemId() == R.id.modOrderSize) {
-                        WorkerInterface.sendModifyOrderSizeCall("kucoin", pair, getContext());
-                        return true;
                     } else if (item.getItemId() == R.id.addSafetyOrders) {
                         WorkerInterface.sendAddSafetyOrdersCall("kucoin", pair, getContext());
                         return true;

app/src/main/java/com/example/dcav2gui/ui/exchanges/OkxFragment.java

@@ -99,12 +99,6 @@ public class OkxFragment extends Fragment implements WorkerCardAdapter.OnCardLon
                     } else if (item.getItemId() == R.id.switchQuoteCurrency) {
                         WorkerInterface.sendSwitchQuoteCurrencyCall("okex", pair, getContext());
                         return true;
-                    } else if (item.getItemId() == R.id.modConcurrentSafetyOrders) {
-                        WorkerInterface.sendModifyConcurrentSafetyOrdersCall("okex", pair, getContext());
-                        return true;
-                    } else if (item.getItemId() == R.id.modOrderSize) {
-                        WorkerInterface.sendModifyOrderSizeCall("okex", pair, getContext());
-                        return true;
                     } else if (item.getItemId() == R.id.addSafetyOrders) {
                         WorkerInterface.sendAddSafetyOrdersCall("okex", pair, getContext());
                         return true;

app/src/main/java/com/example/dcav2gui/ui/exchanges/WorkerData.java

@@ -5,7 +5,6 @@ import com.example.dcav2gui.InstanceInterface;
 public class WorkerData {
     private final String pair;
     private final int amountOfSafetyOrders;
-    private final int safetyOrdersFilled;
     private final int maxSafetyOrders;
     private final double uptime;
     private final double nextSoPrice;
@@ -20,14 +19,13 @@ public class WorkerData {
     private final boolean stopWhenProfit;
     private final InstanceInterface.OldLongDictionary oldLongDictionary;
 
-    public WorkerData(String pair, int amountOfSafetyOrders, int safetyOrdersFilled, int maxSafetyOrders, double uptime,
+    public WorkerData(String pair, int amountOfSafetyOrders, int maxSafetyOrders, double uptime,
                       double nextSoPrice, double price, double takeProfitPrice, double totalAmountOfQuote, double totalAmountOfBase, boolean isShort,
                       boolean isBoosted, boolean isAuto, boolean isPaused, boolean stopWhenProfit,
                       InstanceInterface.OldLongDictionary oldLongDictionary) {
 
         this.pair = pair;
         this.amountOfSafetyOrders = amountOfSafetyOrders;
-        this.safetyOrdersFilled = safetyOrdersFilled;
         this.maxSafetyOrders = maxSafetyOrders;
         this.uptime = uptime;
         this.nextSoPrice = nextSoPrice;
@@ -45,7 +43,6 @@ public class WorkerData {
 
     public String getPair() { return pair; }
     public int getAmountOfSafetyOrders() { return amountOfSafetyOrders; }
-    public int getSafetyOrdersFilled() { return safetyOrdersFilled; }
     public int getMaxSafetyOrders() { return maxSafetyOrders; }
     public double getUptime() { return uptime; }
     public double getNextSoPrice() { return nextSoPrice; }

app/src/main/java/com/example/dcav2gui/ui/exchanges/adapters/WorkerCardAdapter.java

@@ -116,7 +116,7 @@ public class WorkerCardAdapter{
             percentage.setTextColor(Color.parseColor("#CACACA"));
         }
 
-        String safetyOrdersToDisplay = worker.getSafetyOrdersFilled() + "/" + worker.getMaxSafetyOrders();
+        String safetyOrdersToDisplay = worker.getAmountOfSafetyOrders()-1 + "/" + worker.getMaxSafetyOrders();
         safetyOrders.setText(safetyOrdersToDisplay);
 
         uptime.setText(formatSeconds(worker.getUptime()));

app/src/main/java/com/example/dcav2gui/ui/home/HomeFragment.java

@@ -1,16 +1,13 @@
 package com.example.dcav2gui.ui.home;
 
 import static com.example.dcav2gui.InstanceInterface.getLastNTrades;
-import static com.example.dcav2gui.WorkerInterface.showToggleDialog;
 
 import android.annotation.SuppressLint;
 import android.app.AlertDialog;
-import android.content.Context;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
-import android.text.InputType;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.SpannableStringBuilder;
@@ -19,7 +16,6 @@ import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.PopupMenu;
@@ -38,7 +34,6 @@ import com.example.dcav2gui.InstanceInterface;
 import com.example.dcav2gui.MainActivity;
 import com.example.dcav2gui.R;
 import com.example.dcav2gui.TickerTracker;
-import com.example.dcav2gui.WorkerInterface;
 import com.example.dcav2gui.ui.exchanges.adapters.WorkerCardAdapter;
 import com.google.gson.JsonObject;
 
@@ -353,9 +348,6 @@ public class HomeFragment extends Fragment {
                 } else if (item.getItemId() == R.id.exchangeMenuConfigFile) {
                     fetchExchangeConfig(exchange, true);
                     return true;
-                } else if (item.getItemId() == R.id.exchangeModDefaultOrderSize) {
-                    sendModifyDefaultOrderSizeCall(exchange, getContext());
-                    return true;
                 }
                 return false;
             }
@@ -548,43 +540,6 @@ public class HomeFragment extends Fragment {
         return shortWorkers;
     }
 
-
-    public static void sendModifyDefaultOrderSizeCall(String exchange, Context context) {
-        AlertDialog.Builder builder = new AlertDialog.Builder(context);
-        builder.setTitle("Modify default order size of "+ exchange);
-
-        final EditText input = new EditText(context);
-        input.setInputType(InputType.TYPE_CLASS_NUMBER);
-        input.setTextAlignment(View.TEXT_ALIGNMENT_CENTER);
-        builder.setView(input);
-
-        builder.setPositiveButton("Modify", (dialog, which) -> {
-            final double newOrderSize = Double.parseDouble(input.getText().toString());
-            new Thread(() -> {
-                try {
-                    JsonObject response = InstanceInterface.modDefaultOrderSize(exchange, newOrderSize, true);
-                    new Handler(Looper.getMainLooper()).post(() -> {
-                        showToggleDialog(response, context);
-                    });
-                } catch (IOException e) {
-                    e.printStackTrace();
-                    // Show an error dialog on the main thread
-                    new Handler(Looper.getMainLooper()).post(() -> {
-                        AlertDialog.Builder errorBuilder = new AlertDialog.Builder(context);
-                        errorBuilder.setTitle("Error");
-                        errorBuilder.setMessage("Failed to modify default order size: " + e.getMessage());
-                        errorBuilder.setPositiveButton("OK", null);
-                        errorBuilder.show();
-                    });
-                }
-            }).start();
-        });
-
-        builder.setNegativeButton("Cancel", (dialog, which) -> dialog.cancel());
-        builder.show();
-    }
-
-
     private void showLastTradesDetailsDialog(List<InstanceInterface.DealData> result) {
         AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
         List<String> shortWorkers = new ArrayList<>();

app/src/main/res/layout/earner_card.xml

@@ -36,7 +36,7 @@
                 android:text="Trading:"
                 android:textColor="@color/secondary_text_color"
                 android:textAlignment="center"
-                android:textSize="11sp" />
+                android:textSize="10sp" />
             <TextView
                 android:id="@+id/earnerCardTradingBalanceValue"
                 android:layout_width="64dp"
@@ -59,7 +59,7 @@
                 android:text="Earning:"
                 android:textColor="@color/secondary_text_color"
                 android:textAlignment="center"
-                android:textSize="11sp" />
+                android:textSize="10sp" />
             <TextView
                 android:id="@+id/earnerCardEarningBalanceValue"
                 android:layout_width="64dp"
@@ -88,42 +88,42 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="20dp"
-            android:layout_marginHorizontal="8dp"
+            android:layout_marginHorizontal="24dp"
             android:orientation="horizontal"
             android:padding="3dp"
             android:layout_marginBottom="2dp">
             <TextView
                 android:id="@+id/earnerCardLastSubscriptionLabel"
-                android:layout_width="88dp"
+                android:layout_width="84dp"
                 android:layout_height="18dp"
                 android:text="Last subscription:"
                 android:textColor="@color/secondary_text_color"
                 android:textAlignment="center"
-                android:textSize="11sp" />
+                android:textSize="10sp" />
             <TextView
                 android:id="@+id/earnerCardLastSubscriptionDateTime"
-                android:layout_width="104dp"
+                android:layout_width="96dp"
                 android:layout_height="18dp"
                 android:text="2025/03/08 04:20"
                 android:textColor="@color/bright_green"
                 android:textAlignment="center"
-                android:textSize="11sp" />
+                android:textSize="10sp" />
             <TextView
                 android:id="@+id/earnerCardLastRedemptionLabel"
-                android:layout_width="88dp"
+                android:layout_width="84dp"
                 android:layout_height="18dp"
                 android:text="Last redemption:"
                 android:textColor="@color/secondary_text_color"
                 android:textAlignment="center"
-                android:textSize="11sp" />
+                android:textSize="10sp" />
             <TextView
                 android:id="@+id/earnerCardLastRedemptionDateTime"
-                android:layout_width="104dp"
+                android:layout_width="96dp"
                 android:layout_height="18dp"
                 android:text="2025/03/08 04:20"
                 android:textColor="@color/red"
                 android:textAlignment="center"
-                android:textSize="11sp" />
+                android:textSize="10sp" />
 
         </LinearLayout>
     </LinearLayout>

app/src/main/res/menu/exchange_popup_menu.xml

@@ -12,6 +12,4 @@
         android:title="View paused traders" />
     <item android:id="@+id/exchangeMenuConfigFile"
         android:title="View config file" />
-    <item android:id="@+id/exchangeModDefaultOrderSize"
-        android:title="Modify default order size" />
 </menu>

app/src/main/res/menu/worker_popup_menu.xml

@@ -42,10 +42,6 @@
     <item android:id="@+id/workerMenuAdd"
         android:title="Add...">
         <menu>
-            <item android:id="@+id/modOrderSize"
-                android:title="Modify order size"/>
-            <item android:id="@+id/modConcurrentSafetyOrders"
-                android:title="Modify concurrent safety orders"/>
             <item android:id="@+id/addSafetyOrders"
                 android:title="Add safety orders"/>
             <item android:id="@+id/addQuote"

app/src/main/res/values/strings.xml

@@ -1,7 +1,7 @@
 <resources>
     <string name="app_name" translatable="false">DCAv2GUI</string>
     <string name="nav_header_title" translatable="false">DCAv2</string>
-    <string name="nav_header_subtitle">Version 2025.09.06</string>
+    <string name="nav_header_subtitle">Version 2025.03.06 </string>
     <string name="navigation_drawer_open">Open navigation drawer</string>
     <string name="navigation_drawer_close">Close navigation drawer</string>
     <string name="nav_header_desc">Navigation header</string>