Added support for moving any user to a channel.

2 files changed, 7 insertions, 1 deletions

diff --git a/src/main/aidl/com/morlunk/jumble/IJumbleService.aidl b/src/main/aidl/com/morlunk/jumble/IJumbleService.aidl
index cc4a2ab..b1cd1e5 100644
--- a/src/main/aidl/com/morlunk/jumble/IJumbleService.aidl
+++ b/src/main/aidl/com/morlunk/jumble/IJumbleService.aidl
@@ -73,6 +73,7 @@ interface IJumbleService {
 
     // Server actions
     void joinChannel(int channel);
+    void moveUserToChannel(int session, int channel);
     void createChannel(int parent, String name, String description, int position, boolean temporary);
     void sendAccessTokens(in List tokens);
     //void setTexture(byte[] texture);
diff --git a/src/main/java/com/morlunk/jumble/JumbleService.java b/src/main/java/com/morlunk/jumble/JumbleService.java
index 10ed653..0d4ad34 100644
--- a/src/main/java/com/morlunk/jumble/JumbleService.java
+++ b/src/main/java/com/morlunk/jumble/JumbleService.java
@@ -367,8 +367,13 @@ public class JumbleService extends Service implements JumbleConnection.JumbleCon
 
         @Override
         public void joinChannel(int channel) throws RemoteException {
+            moveUserToChannel(getSession(), channel);
+        }
+
+        @Override
+        public void moveUserToChannel(int session, int channel) throws RemoteException {
             Mumble.UserState.Builder usb = Mumble.UserState.newBuilder();
-            usb.setSession(mConnection.getSession());
+            usb.setSession(session);
             usb.setChannelId(channel);
             mConnection.sendTCPMessage(usb.build(), JumbleTCPMessageType.UserState);
         }