fix: recursive calls

Author: gabreek

app/src/main/java/medev/gabreek/flyffucommander/ClientManager.java

@@ -37,6 +37,7 @@ public class ClientManager {
     private final FloatingActionButton floatingActionButton;
     private final ActionButtonManager actionButtonManager;
     private final WebViewCreator webViewCreator;
+    private final Function<Integer, String> clientDisplayNameProvider;
     private final Consumer<String> titleSetter;
     private final Supplier<Integer> screenHeightProvider;
     private final Supplier<Integer> screenWidthProvider;
@@ -49,7 +50,7 @@ public interface WebViewCreator {
     public ClientManager(Context context, SparseArray<WebView> webViews, SparseArray<FrameLayout> layouts,
                          TinyDB appTinyDB, Set<Integer> configuredClientIds, LinearLayout linearLayout,
                          FloatingActionButton floatingActionButton, ActionButtonManager actionButtonManager,
-                         WebViewCreator webViewCreator,
+                         WebViewCreator webViewCreator, Function<Integer, String> clientDisplayNameProvider,
                          Consumer<String> titleSetter, Supplier<Integer> screenHeightProvider, Supplier<Integer> screenWidthProvider) {
         this.context = context;
         this.webViews = webViews;
@@ -60,6 +61,7 @@ public ClientManager(Context context, SparseArray<WebView> webViews, SparseArray
         this.floatingActionButton = floatingActionButton;
         this.actionButtonManager = actionButtonManager;
         this.webViewCreator = webViewCreator;
+        this.clientDisplayNameProvider = clientDisplayNameProvider;
         this.titleSetter = titleSetter;
         this.screenHeightProvider = screenHeightProvider;
         this.screenWidthProvider = screenWidthProvider;
@@ -204,18 +206,7 @@ public List<Integer> getExistingClientIdsFromFileSystem() {
     }
 
     public String getClientDisplayName(int id) {
-        switch (id) {
-            case Constants.WIKI_CLIENT_ID:
-                return "Wiki";
-            case Constants.MADRIGAL_CLIENT_ID:
-                return "Madrigal";
-            case Constants.FLYFFULATOR_CLIENT_ID:
-                return "Flyffulator";
-            case Constants.FLYFFUSKILL_CLIENT_ID:
-                return "FlyffuSkill";
-            default:
-                return "Client " + id;
-        }
+        return clientDisplayNameProvider.apply(id);
     }
 
     public void createNewClient() {

app/src/main/java/medev/gabreek/flyffucommander/MainActivity.java

@@ -139,7 +139,20 @@ protected void onCreate(Bundle savedInstanceState) {
         displayUtils = new DisplayUtils(this);
         keyDispatcher = new KeyDispatcher(this, webViews, clientActionButtonsData, fabViewToActionDataMap);
         actionButtonManager = new ActionButtonManager(this, rootContainer, clientActionButtonsData, fabViewToActionDataMap, appTinyDB, displayUtils, keyDispatcher, areActionButtonsPositionsFixed, this::getClientDisplayName, this::getWebViews);
-        clientManager = new ClientManager(this, webViews, layouts, appTinyDB, configuredClientIds, linearLayout, floatingActionButton, actionButtonManager, this::createWebViewer, this::setTitle, this::getScreenHeight, this::getScreenWidth);
+        clientManager = new ClientManager(this, webViews, layouts, appTinyDB, configuredClientIds, linearLayout, floatingActionButton, actionButtonManager, this::createWebViewer, id -> {
+            switch (id) {
+                case Constants.WIKI_CLIENT_ID:
+                    return "Wiki";
+                case Constants.MADRIGAL_CLIENT_ID:
+                    return "Madrigal";
+                case Constants.FLYFFULATOR_CLIENT_ID:
+                    return "Flyffulator";
+                case Constants.FLYFFUSKILL_CLIENT_ID:
+                    return "FlyffuSkill";
+                default:
+                    return "Client " + id;
+            }
+        }, this::setTitle, this::getScreenHeight, this::getScreenWidth);
         fabMovementHandler = new FabMovementHandler(screenWidth, screenHeight);
         backupManager = new BackupManager(this, gson, clientActionButtonsData, () -> actionButtonManager.refreshAllActionButtonsDisplay(isActionButtonsVisible, fabHideShow, activeClientId));