From b6bac053a8e45768b9c75463d01e9610f5474663 Mon Sep 17 00:00:00 2001 From: Andrew Comminos Date: Thu, 15 Oct 2015 19:21:13 -0700 Subject: Nuke AIDL interfaces, to be replaced by plain old Java interfaces --- .../aidl/com/morlunk/jumble/IJumbleObserver.aidl | 53 ---------- .../aidl/com/morlunk/jumble/IJumbleService.aidl | 108 --------------------- .../aidl/com/morlunk/jumble/model/IChannel.aidl | 32 ------ .../aidl/com/morlunk/jumble/model/IMessage.aidl | 27 ------ src/main/aidl/com/morlunk/jumble/model/IUser.aidl | 44 --------- src/main/aidl/com/morlunk/jumble/model/Server.aidl | 19 ---- .../aidl/com/morlunk/jumble/model/TalkState.aidl | 4 - .../com/morlunk/jumble/util/JumbleException.aidl | 3 - .../morlunk/jumble/util/ParcelableByteArray.aidl | 19 ---- 9 files changed, 309 deletions(-) delete mode 100644 src/main/aidl/com/morlunk/jumble/IJumbleObserver.aidl delete mode 100644 src/main/aidl/com/morlunk/jumble/IJumbleService.aidl delete mode 100644 src/main/aidl/com/morlunk/jumble/model/IChannel.aidl delete mode 100644 src/main/aidl/com/morlunk/jumble/model/IMessage.aidl delete mode 100644 src/main/aidl/com/morlunk/jumble/model/IUser.aidl delete mode 100644 src/main/aidl/com/morlunk/jumble/model/Server.aidl delete mode 100644 src/main/aidl/com/morlunk/jumble/model/TalkState.aidl delete mode 100644 src/main/aidl/com/morlunk/jumble/util/JumbleException.aidl delete mode 100644 src/main/aidl/com/morlunk/jumble/util/ParcelableByteArray.aidl diff --git a/src/main/aidl/com/morlunk/jumble/IJumbleObserver.aidl b/src/main/aidl/com/morlunk/jumble/IJumbleObserver.aidl deleted file mode 100644 index 50e80f3..0000000 --- a/src/main/aidl/com/morlunk/jumble/IJumbleObserver.aidl +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (C) 2013 Andrew Comminos - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.morlunk.jumble; - -import com.morlunk.jumble.model.IChannel; -import com.morlunk.jumble.model.IUser; -import com.morlunk.jumble.model.IMessage; -import com.morlunk.jumble.util.ParcelableByteArray; -import com.morlunk.jumble.util.JumbleException; - -interface IJumbleObserver { - // Connection - void onConnected(); - void onConnecting(); - void onDisconnected(in JumbleException e); - - // Authentication - void onTLSHandshakeFailed(in ParcelableByteArray cert); - - // Channel - void onChannelAdded(in IChannel channel); - void onChannelStateUpdated(in IChannel channel); - void onChannelRemoved(in IChannel channel); - void onChannelPermissionsUpdated(in IChannel channel); - - // User - void onUserConnected(in IUser user); - void onUserStateUpdated(in IUser user); - void onUserTalkStateUpdated(in IUser user); - void onUserJoinedChannel(in IUser user, in IChannel newChannel, in IChannel oldChannel); - void onUserRemoved(in IUser user, String reason); - void onPermissionDenied(String reason); - - // Logging & Messaging - void onMessageLogged(in IMessage message); - void onLogInfo(String message); - void onLogWarning(String message); - void onLogError(String message); -} diff --git a/src/main/aidl/com/morlunk/jumble/IJumbleService.aidl b/src/main/aidl/com/morlunk/jumble/IJumbleService.aidl deleted file mode 100644 index ea3efd1..0000000 --- a/src/main/aidl/com/morlunk/jumble/IJumbleService.aidl +++ /dev/null @@ -1,108 +0,0 @@ -/* - * Copyright (C) 2013 Andrew Comminos - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.morlunk.jumble; - -import com.morlunk.jumble.model.IUser; -import com.morlunk.jumble.model.IChannel; -import com.morlunk.jumble.model.Server; -import com.morlunk.jumble.model.IMessage; -import com.morlunk.jumble.IJumbleObserver; -import com.morlunk.jumble.util.JumbleException; - -interface IJumbleService { - // Network - int getConnectionState(); - JumbleException getConnectionError(); - boolean isReconnecting(); - void cancelReconnect(); - void disconnect(); - /** - * Gets the TCP latency, in nanoseconds. - */ - long getTCPLatency(); - /** - * Gets the UDP latency, in nanoseconds. - */ - long getUDPLatency(); - int getMaxBandwidth(); - int getCurrentBandwidth(); - - // Server information - int getServerVersion(); - String getServerRelease(); - String getServerOSName(); - String getServerOSVersion(); - - // Session and users - int getSession(); - IUser getSessionUser(); - IChannel getSessionChannel(); - Server getConnectedServer(); - IUser getUser(int id); - IChannel getChannel(int id); - IChannel getRootChannel(); - int getPermissions(); - - // Audio actions and settings - boolean isTalking(); - void setTalkingState(boolean talking); - int getTransmitMode(); - int getCodec(); - - // Bluetooth - boolean usingBluetoothSco(); - void enableBluetoothSco(); - void disableBluetoothSco(); - - // 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); - void requestBanList(); - void requestUserList(); - //void requestACL(int channel); - void requestPermissions(int channel); - void requestComment(int session); - void requestAvatar(int session); - void requestChannelDescription(int channel); - void registerUser(int session); - void kickBanUser(int session, String reason, boolean ban); - IMessage sendUserTextMessage(int session, String message); - IMessage sendChannelTextMessage(int channel, String message, boolean tree); - void setUserComment(int session, String comment); - void setPrioritySpeaker(int session, boolean priority); - void removeChannel(int channel); - //void addChannelLink(int channel, int link); - //void requestChannelPermissions(int channel); - void setMuteDeafState(int session, boolean mute, boolean deaf); - void setSelfMuteDeafState(boolean mute, boolean deaf); - //void announceRecordingState(boolean recording); - - // Observation - void registerObserver(in IJumbleObserver observer); - void unregisterObserver(in IJumbleObserver observer); - - /** - * Reconfigures the JumbleService with the given extras. - * These are the same extras you would pass in for a connect call. This "patches" the service - * only with the new extras specified. - * @return true if the a reconnect is required for changes to take effect. - */ - boolean reconfigure(in Bundle extras); -} \ No newline at end of file diff --git a/src/main/aidl/com/morlunk/jumble/model/IChannel.aidl b/src/main/aidl/com/morlunk/jumble/model/IChannel.aidl deleted file mode 100644 index e393f0b..0000000 --- a/src/main/aidl/com/morlunk/jumble/model/IChannel.aidl +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (C) 2013 Andrew Comminos - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.morlunk.jumble.model; - -interface IChannel { - int getId(); - int getPosition(); - boolean isTemporary(); - IChannel getParent(); - String getName(); - String getDescription(); - byte[] getDescriptionHash(); - List getUsers(); - List getSubchannels(); - List getLinks(); - int getSubchannelUserCount(); - int getPermissions(); -} \ No newline at end of file diff --git a/src/main/aidl/com/morlunk/jumble/model/IMessage.aidl b/src/main/aidl/com/morlunk/jumble/model/IMessage.aidl deleted file mode 100644 index 623a94e..0000000 --- a/src/main/aidl/com/morlunk/jumble/model/IMessage.aidl +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (C) 2013 Andrew Comminos - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.morlunk.jumble.model; - -interface IMessage { - int getActor(); - String getActorName(); - List getTargetChannels(); - List getTargetTrees(); - List getTargetUsers(); - String getMessage(); - long getReceivedTime(); -} \ No newline at end of file diff --git a/src/main/aidl/com/morlunk/jumble/model/IUser.aidl b/src/main/aidl/com/morlunk/jumble/model/IUser.aidl deleted file mode 100644 index aa0f71a..0000000 --- a/src/main/aidl/com/morlunk/jumble/model/IUser.aidl +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (C) 2013 Andrew Comminos - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.morlunk.jumble.model; - -import com.morlunk.jumble.model.IChannel; -import com.morlunk.jumble.model.TalkState; - -interface IUser { - int getSession(); - IChannel getChannel(); - int getUserId(); - String getName(); - String getComment(); - byte[] getCommentHash(); - byte[] getTexture(); - byte[] getTextureHash(); - String getHash(); - boolean isMuted(); - boolean isDeafened(); - boolean isSuppressed(); - boolean isSelfMuted(); - boolean isSelfDeafened(); - boolean isPrioritySpeaker(); - boolean isRecording(); - boolean isLocalMuted(); - boolean isLocalIgnored(); - void setLocalMuted(boolean localMuted); - void setLocalIgnored(boolean localIgnored); - TalkState getTalkState(); -} \ No newline at end of file diff --git a/src/main/aidl/com/morlunk/jumble/model/Server.aidl b/src/main/aidl/com/morlunk/jumble/model/Server.aidl deleted file mode 100644 index d39a553..0000000 --- a/src/main/aidl/com/morlunk/jumble/model/Server.aidl +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2013 Andrew Comminos - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.morlunk.jumble.model; - -parcelable Server; diff --git a/src/main/aidl/com/morlunk/jumble/model/TalkState.aidl b/src/main/aidl/com/morlunk/jumble/model/TalkState.aidl deleted file mode 100644 index 786bc26..0000000 --- a/src/main/aidl/com/morlunk/jumble/model/TalkState.aidl +++ /dev/null @@ -1,4 +0,0 @@ -// TalkState.aidl -package com.morlunk.jumble.model; - -parcelable TalkState; \ No newline at end of file diff --git a/src/main/aidl/com/morlunk/jumble/util/JumbleException.aidl b/src/main/aidl/com/morlunk/jumble/util/JumbleException.aidl deleted file mode 100644 index d63ffc7..0000000 --- a/src/main/aidl/com/morlunk/jumble/util/JumbleException.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package com.morlunk.jumble.util; - -parcelable JumbleException; diff --git a/src/main/aidl/com/morlunk/jumble/util/ParcelableByteArray.aidl b/src/main/aidl/com/morlunk/jumble/util/ParcelableByteArray.aidl deleted file mode 100644 index 5fb2228..0000000 --- a/src/main/aidl/com/morlunk/jumble/util/ParcelableByteArray.aidl +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2013 Andrew Comminos - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.morlunk.jumble.util; - -parcelable ParcelableByteArray; -- cgit v1.2.3