mirror of
https://github.com/nextcloud/talk-android
synced 2025-06-20 12:09:45 +01:00
Do not guard code that can not throw the caught exception
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
This commit is contained in:
parent
af514b142a
commit
ac4be52b84
@ -320,37 +320,40 @@ public class PeerConnectionWrapper {
|
|||||||
String strData = new String(bytes);
|
String strData = new String(bytes);
|
||||||
Log.d(TAG, "Got msg: " + strData + " over " + TAG + " " + sessionId);
|
Log.d(TAG, "Got msg: " + strData + " over " + TAG + " " + sessionId);
|
||||||
|
|
||||||
|
DataChannelMessage dataChannelMessage;
|
||||||
try {
|
try {
|
||||||
DataChannelMessage dataChannelMessage = LoganSquare.parse(strData, DataChannelMessage.class);
|
dataChannelMessage = LoganSquare.parse(strData, DataChannelMessage.class);
|
||||||
|
|
||||||
if ("nickChanged".equals(dataChannelMessage.getType())) {
|
|
||||||
String nick = null;
|
|
||||||
if (dataChannelMessage.getPayload() instanceof String) {
|
|
||||||
nick = (String) dataChannelMessage.getPayload();
|
|
||||||
} else if (dataChannelMessage.getPayload() instanceof Map) {
|
|
||||||
Map<String, String> payloadMap = (Map<String, String>) dataChannelMessage.getPayload();
|
|
||||||
nick = payloadMap.get("name");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (nick != null) {
|
|
||||||
EventBus.getDefault().post(new PeerConnectionEvent(PeerConnectionEvent.PeerConnectionEventType
|
|
||||||
.NICK_CHANGE, sessionId, nick, null, videoStreamType));
|
|
||||||
}
|
|
||||||
} else if ("audioOn".equals(dataChannelMessage.getType())) {
|
|
||||||
EventBus.getDefault().post(new PeerConnectionEvent(PeerConnectionEvent.PeerConnectionEventType
|
|
||||||
.AUDIO_CHANGE, sessionId, null, TRUE, videoStreamType));
|
|
||||||
} else if ("audioOff".equals(dataChannelMessage.getType())) {
|
|
||||||
EventBus.getDefault().post(new PeerConnectionEvent(PeerConnectionEvent.PeerConnectionEventType
|
|
||||||
.AUDIO_CHANGE, sessionId, null, FALSE, videoStreamType));
|
|
||||||
} else if ("videoOn".equals(dataChannelMessage.getType())) {
|
|
||||||
EventBus.getDefault().post(new PeerConnectionEvent(PeerConnectionEvent.PeerConnectionEventType
|
|
||||||
.VIDEO_CHANGE, sessionId, null, TRUE, videoStreamType));
|
|
||||||
} else if ("videoOff".equals(dataChannelMessage.getType())) {
|
|
||||||
EventBus.getDefault().post(new PeerConnectionEvent(PeerConnectionEvent.PeerConnectionEventType
|
|
||||||
.VIDEO_CHANGE, sessionId, null, FALSE, videoStreamType));
|
|
||||||
}
|
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
Log.d(TAG, "Failed to parse data channel message");
|
Log.d(TAG, "Failed to parse data channel message");
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ("nickChanged".equals(dataChannelMessage.getType())) {
|
||||||
|
String nick = null;
|
||||||
|
if (dataChannelMessage.getPayload() instanceof String) {
|
||||||
|
nick = (String) dataChannelMessage.getPayload();
|
||||||
|
} else if (dataChannelMessage.getPayload() instanceof Map) {
|
||||||
|
Map<String, String> payloadMap = (Map<String, String>) dataChannelMessage.getPayload();
|
||||||
|
nick = payloadMap.get("name");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (nick != null) {
|
||||||
|
EventBus.getDefault().post(new PeerConnectionEvent(PeerConnectionEvent.PeerConnectionEventType
|
||||||
|
.NICK_CHANGE, sessionId, nick, null, videoStreamType));
|
||||||
|
}
|
||||||
|
} else if ("audioOn".equals(dataChannelMessage.getType())) {
|
||||||
|
EventBus.getDefault().post(new PeerConnectionEvent(PeerConnectionEvent.PeerConnectionEventType
|
||||||
|
.AUDIO_CHANGE, sessionId, null, TRUE, videoStreamType));
|
||||||
|
} else if ("audioOff".equals(dataChannelMessage.getType())) {
|
||||||
|
EventBus.getDefault().post(new PeerConnectionEvent(PeerConnectionEvent.PeerConnectionEventType
|
||||||
|
.AUDIO_CHANGE, sessionId, null, FALSE, videoStreamType));
|
||||||
|
} else if ("videoOn".equals(dataChannelMessage.getType())) {
|
||||||
|
EventBus.getDefault().post(new PeerConnectionEvent(PeerConnectionEvent.PeerConnectionEventType
|
||||||
|
.VIDEO_CHANGE, sessionId, null, TRUE, videoStreamType));
|
||||||
|
} else if ("videoOff".equals(dataChannelMessage.getType())) {
|
||||||
|
EventBus.getDefault().post(new PeerConnectionEvent(PeerConnectionEvent.PeerConnectionEventType
|
||||||
|
.VIDEO_CHANGE, sessionId, null, FALSE, videoStreamType));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user