gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-19 10:45:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update version

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2019-05-27 18:57:15 +02:00
parent 92e56cdef2
commit f13292a1b7
2 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -38,8 +38,8 @@ android {
targetSdkVersion 28 targetSdkVersion 28
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
versionCode 96 versionCode 97
versionName "6.0.3" versionName "6.0.4"
flavorDimensions "default" flavorDimensions "default"
renderscriptTargetApi 19 renderscriptTargetApi 19

27
app/src/main/java/com/nextcloud/talk/webrtc/MagicWebSocketInstance.java
View File

@ -57,7 +57,6 @@ public class MagicWebSocketInstance extends WebSocketListener {
private String webSocketTicket; private String webSocketTicket;
private String resumeId; private String resumeId;
private String sessionId; private String sessionId;
private String ncBackendSession;
private boolean hasMCU; private boolean hasMCU;
private boolean connected; private boolean connected;
private WebSocketConnectionHelper webSocketConnectionHelper; private WebSocketConnectionHelper webSocketConnectionHelper;
@ -149,7 +148,7 @@ public class MagicWebSocketInstance extends WebSocketListener {
if (("no_such_session").equals(errorOverallWebSocketMessage.getErrorWebSocketMessage().getCode())) { if (("no_such_session").equals(errorOverallWebSocketMessage.getErrorWebSocketMessage().getCode())) {
resumeId = ""; resumeId = "";
restartWebSocket(); restartWebSocket();
} else if (("hello_expected") .equals(errorOverallWebSocketMessage.getErrorWebSocketMessage().getCode())) { } else if (("hello_expected").equals(errorOverallWebSocketMessage.getErrorWebSocketMessage().getCode())) {
restartWebSocket(); restartWebSocket();
} }
@ -260,23 +259,15 @@ public class MagicWebSocketInstance extends WebSocketListener {
} }
public void joinRoomWithRoomTokenAndSession(String roomToken, String normalBackendSession) { public void joinRoomWithRoomTokenAndSession(String roomToken, String normalBackendSession) {
if (!roomToken.equals(currentRoomToken) || !normalBackendSession.equals(ncBackendSession)) { try {
ncBackendSession = normalBackendSession; String message = LoganSquare.serialize(webSocketConnectionHelper.getAssembledJoinOrLeaveRoomModel(roomToken, normalBackendSession));
try { if (!connected || reconnecting) {
String message = LoganSquare.serialize(webSocketConnectionHelper.getAssembledJoinOrLeaveRoomModel(roomToken, normalBackendSession)); messagesQueue.add(message);
if (!connected || reconnecting) { } else {
messagesQueue.add(message); internalWebSocket.send(message);
} else {
internalWebSocket.send(message);
}
} catch (IOException e) {
e.printStackTrace();
} }
} else if (!roomToken.equals("")) { } catch (IOException e) {
HashMap<String, String> joinRoomHashMap = new HashMap<>(); e.printStackTrace();
joinRoomHashMap.put("roomToken", currentRoomToken);
eventBus.post(new WebSocketCommunicationEvent("roomJoined", joinRoomHashMap));
} }
} }