From: rnayabed <debayansutradhar3@gmail.com>
Date: Sun, 28 Feb 2021 23:51:02 +0530
Subject: 1. Renamed "Default.obj" to "Default.zip"
---
1. Renamed "Default.obj" to "Default.zip"
2. Server now checks for Android screen size while changing col/row
3. Changed default screen size
4. Changed logger log file name
---


--- 'a/src/main/java/com/stream_pi/server/controller/Controller.java'
+++ b/src/main/java/com/stream_pi/server/controller/Controller.java
@@ -118,7 +118,8 @@ public class Controller extends Base imp
             if(getConfig().isFirstTimeUse())
             {
                 Stage stage = new Stage();
-                Scene s = new Scene(new FirstTimeUse(this, this), 512, 300);       
+                Scene s = new Scene(new FirstTimeUse(this, this),
+                        getConfig().getStartupWindowWidth(), getConfig().getStartupWindowHeight());
                 stage.setResizable(false);
                 stage.setScene(s); 
                 stage.setTitle("Stream-Pi Server Setup");

--- 'a/src/main/java/com/stream_pi/server/window/Base.java'
+++ b/src/main/java/com/stream_pi/server/window/Base.java
@@ -62,11 +62,11 @@ public abstract class Base extends Stack
     private StreamPiLogFallbackHandler logFallbackHandler = null;
 
     @Override
-    public void initLogger() throws SevereException
+    public void initLogger()
     {
         try
         {
-            if(logger != null || logFileHandler != null)
+            if(logFileHandler != null)
                 return;
 
             closeLogger();
@@ -74,10 +74,10 @@ public abstract class Base extends Stack
 
             if(new File(ServerInfo.getInstance().getPrePath()).getAbsoluteFile().getParentFile().canWrite())
             {
-                String path = ServerInfo.getInstance().getPrePath()+"../streampi.log";
+                String path = ServerInfo.getInstance().getPrePath()+"../stream-pi-server.log";
 
                 if(ServerInfo.getInstance().getPlatformType() == Platform.ANDROID)
-                    path = ServerInfo.getInstance().getPrePath()+"streampi.log";
+                    path = ServerInfo.getInstance().getPrePath()+"stream-pi-server.log";
 
                 logFileHandler = new StreamPiLogFileHandler(path);
                 logger.addHandler(logFileHandler);
@@ -166,7 +166,7 @@ public abstract class Base extends Stack
                 boolean result = filex.mkdirs();
                 if(result)
                 {
-                    IOHelper.unzip(Main.class.getResourceAsStream("Default.obj"), ServerInfo.getInstance().getPrePath());
+                    IOHelper.unzip(Main.class.getResourceAsStream("Default.zip"), ServerInfo.getInstance().getPrePath());
 
                     Config.getInstance().setThemesPath(ServerInfo.getInstance().getPrePath()+"Themes/");
                     Config.getInstance().setPluginsPath(ServerInfo.getInstance().getPrePath()+"Plugins/");
@@ -177,6 +177,8 @@ public abstract class Base extends Stack
                     }
 
                     Config.getInstance().save();
+
+                    initLogger();
                 }
                 else
                 {

--- 'a/src/main/java/com/stream_pi/server/window/settings/ClientsSettings.java'
+++ b/src/main/java/com/stream_pi/server/window/settings/ClientsSettings.java
@@ -140,9 +140,9 @@ public class ClientsSettings extends VBo
                                 double startupWidth = Double.parseDouble(clientSettingsVBox.getStartupWindowWidth());
 
 
-                                if((rows*actionsSize) > (startupWidth - 25) && clientSettingsVBox.getPlatform()!= com.stream_pi.util.platform.Platform.ANDROID)
+                                if((rows*actionsSize) > (startupWidth - 50))
                                 {
-                                    errors2.append("        Rows out of bounds of screen size. \n"+startupWidth);
+                                    errors2.append("        Rows out of bounds of screen size. \n");
                                 }
                             }
                             catch (NumberFormatException e)
@@ -157,9 +157,9 @@ public class ClientsSettings extends VBo
                                 int actionsSize = Integer.parseInt(clientProfileVBox.getActionSize());
                                 double startupHeight = Double.parseDouble(clientSettingsVBox.getStartupWindowHeight());
 
-                                if((cols*actionsSize) > (startupHeight - 25) && clientSettingsVBox.getPlatform()!= com.stream_pi.util.platform.Platform.ANDROID)
+                                if((cols*actionsSize) > (startupHeight - 50))
                                 {
-                                    errors2.append("        Cols out of bounds of screen size. \n"+startupHeight);
+                                    errors2.append("        Cols out of bounds of screen size. \n");
                                 }
                             }
                             catch (NumberFormatException e)

Binary files 'a/src/main/resources/com/stream_pi/server/Default.obj' and /dev/null differ

Binary files /dev/null and b/src/main/resources/com/stream_pi/server/Default.zip differ