Public

Project privacy set to public. By default, its content is available to everyone (authenticated or not). Please note that more restrictive permissions might exist on some items.

server

Clone or download

Fix NPE error on non phone device while connection

Download Browse
+17 −3
Debayan Sutradhar (rnayabed) 2021-06-15 23:11
Debayan Sutradhar (rnayabed) 2021-06-15 23:11
be56b7b624e7d1db410aa29bdc78ae02679f25ea
c4a78c94f624f53e118cf8013c51dfee26a5ced3
git #server/be56b7b624e7d1db410aa29bdc78ae02679f25ea

Modified Files

List
Side by side diff
M src/main/java/com/stream_pi/server/connection/ClientConnection.java
+8 −1
--- 'a/src/main/java/com/stream_pi/server/connection/ClientConnection.java'
+++ b/src/main/java/com/stream_pi/server/connection/ClientConnection.java
@@ -197,8 +197,15 @@ public class ClientConnection extends Th
throw new MinorException(errTxt);
}
+ String or = ar[10];
+ Orientation orientation = null;
+ if(or != null) // device has no orientation
+ {
+ orientation = Orientation.valueOf(or);
+ }
+
client = new Client(clientVersion, releaseStatus, commsStandard, themesStandard, ar[4],
- Platform.valueOf(ar[7]), socket.getRemoteSocketAddress(), Orientation.valueOf(ar[10]));
+ Platform.valueOf(ar[7]), socket.getRemoteSocketAddress(), orientation);
client.setDisplayWidth(Double.parseDouble(ar[5]));
client.setDisplayHeight(Double.parseDouble(ar[6]));
M src/main/java/com/stream_pi/server/window/dashboard/actiongridpane/ActionGridPane.java
+9 −2
--- 'a/src/main/java/com/stream_pi/server/window/dashboard/actiongridpane/ActionGridPane.java'
+++ b/src/main/java/com/stream_pi/server/window/dashboard/actiongridpane/ActionGridPane.java
@@ -290,13 +290,20 @@ public class ActionGridPane extends Scro
ActionBox actionBox = new ActionBox(Config.getInstance().getActionGridActionSize(), actionDetailsPaneListener, this,
col, row);
- if(getClient().getOrientation() == Orientation.HORIZONTAL)
+ if(getClient().getOrientation() == null)
{
actionsGridPane.add(actionBox, col, row);
}
else
{
- actionsGridPane.add(actionBox, row, col);
+ if(getClient().getOrientation() == Orientation.HORIZONTAL)
+ {
+ actionsGridPane.add(actionBox, col, row);
+ }
+ else
+ {
+ actionsGridPane.add(actionBox, row, col);
+ }
}
return actionBox;