Android ByteBuffer and Color fixes (#842)

SlimeVR · Sep 16, 2023 · 3f30760 · 3f30760
1 parent 185dc8d
commit 3f30760
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 40 deletions.
diff --git a/server/android/src/main/java/java/awt/Color.java b/server/android/src/main/java/java/awt/Color.java
@@ -0,0 +1,4 @@
+package java.awt;
+
+public class Color {
+}
diff --git a/server/core/src/main/java/dev/slimevr/osc/OSCRouter.java b/server/core/src/main/java/dev/slimevr/osc/OSCRouter.java
@@ -72,7 +72,7 @@ public void refreshSettings(boolean refreshHandlersSettings) {
 			// Else, create our own OSC receiver
 			if (oscReceiver == null) {
 				try {
-					oscReceiver = new OSCPortIn(OSCStatic.serializer, portIn);
+					oscReceiver = new OSCPortIn(portIn);
 					if (lastPortIn != portIn || !wasListening) {
 						LogManager.info("[OSCRouter] Listening to port " + portIn);
 					}
@@ -114,10 +114,7 @@ public void refreshSettings(boolean refreshHandlersSettings) {
 			// Else, create our own OSC sender
 			if (oscSender == null) {
 				try {
-					oscSender = new OSCPortOut(
-						OSCStatic.serializer,
-						new InetSocketAddress(address, portOut)
-					);
+					oscSender = new OSCPortOut(new InetSocketAddress(address, portOut));
 					if ((lastPortOut != portOut && lastAddress != address) || !wasConnected) {
 						LogManager
 							.info(

diff --git a/server/core/src/main/java/dev/slimevr/osc/OSCStatic.java b/server/core/src/main/java/dev/slimevr/osc/OSCStatic.java
diff --git a/server/core/src/main/java/dev/slimevr/osc/VMCHandler.java b/server/core/src/main/java/dev/slimevr/osc/VMCHandler.java
@@ -93,10 +93,7 @@ public void refreshSettings(boolean refreshRouterSettings) {
 			// Instantiates the OSC receiver
 			try {
 				int port = config.getPortIn();
-				oscReceiver = new OSCPortIn(
-					OSCStatic.serializer,
-					port
-				);
+				oscReceiver = new OSCPortIn(port);
 				if (lastPortIn != port || !wasListening) {
 					LogManager.info("[VMCHandler] Listening to port " + port);
 				}
@@ -130,10 +127,7 @@ public void refreshSettings(boolean refreshRouterSettings) {
 			try {
 				InetAddress address = InetAddress.getByName(config.getAddress());
 				int port = config.getPortOut();
-				oscSender = new OSCPortOut(
-					OSCStatic.serializer,
-					new InetSocketAddress(address, port)
-				);
+				oscSender = new OSCPortOut(new InetSocketAddress(address, port));
 				if ((lastPortOut != port && lastAddress != address) || !wasConnected) {
 					LogManager
 						.info(

diff --git a/server/core/src/main/java/dev/slimevr/osc/VRCOSCHandler.kt b/server/core/src/main/java/dev/slimevr/osc/VRCOSCHandler.kt
@@ -99,10 +99,7 @@ class VRCOSCHandler(
 			// Instantiates the OSC receiver
 			try {
 				val port = config.portIn
-				oscReceiver = OSCPortIn(
-					OSCStatic.serializer,
-					port
-				)
+				oscReceiver = OSCPortIn(port)
 				if (lastPortIn != port || !wasListening) {
 					LogManager.info("[VRCOSCHandler] Listening to port $port")
 				}
@@ -142,10 +139,7 @@ class VRCOSCHandler(
 			try {
 				val address = InetAddress.getByName(config.address)
 				val port = config.portOut
-				oscSender = OSCPortOut(
-					OSCStatic.serializer,
-					InetSocketAddress(address, port)
-				)
+				oscSender = OSCPortOut(InetSocketAddress(address, port))
 				if (lastPortOut != port && lastAddress !== address || !wasConnected) {
 					LogManager
 						.info(

diff --git a/server/core/src/main/java/dev/slimevr/tracking/trackers/udp/UDPProtocolParser.kt b/server/core/src/main/java/dev/slimevr/tracking/trackers/udp/UDPProtocolParser.kt
@@ -25,7 +25,8 @@ class UDPProtocolParser {
 				if (bundlePacketLen == 0) continue
 
 				val bundlePacketStart = buf.position()
-				val bundleBuf = buf.slice(bundlePacketStart, bundlePacketLen)
+				val bundleBuf = buf.slice()
+				bundleBuf.limit(bundlePacketLen)
 				val bundlePacketId = bundleBuf.int
 				val newPacket = getNewPacket(bundlePacketId)
 				newPacket?.let {