gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 03:59:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Do not guard code that can not throw the caught exception

Browse Source 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
This commit is contained in:
Daniel Calviño Sánchez 2022-11-07 01:39:11 +01:00
parent af514b142a
commit ac4be52b84
1 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
app/src/main/java/com/nextcloud/talk/webrtc/PeerConnectionWrapper.java
View File

@ -320,37 +320,40 @@ public class PeerConnectionWrapper {
String strData = new String(bytes);
Log.d(TAG, "Got msg: " + strData + " over " + TAG + " " + sessionId);
DataChannelMessage dataChannelMessage;
try {
DataChannelMessage 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));
}
dataChannelMessage = LoganSquare.parse(strData, DataChannelMessage.class);
} catch (IOException e) {
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));
}
}
}