gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-05 11:59:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Finally some reconnection magic working

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2019-07-21 16:38:17 +02:00
parent 87ea461f53
commit ceac6efa39
5 changed files with 18 additions and 6 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 101 versionCode 102
versionName "6.0.7beta" versionName "6.1.0"
flavorDimensions "default" flavorDimensions "default"
renderscriptTargetApi 19 renderscriptTargetApi 19

5
app/src/main/java/com/nextcloud/talk/controllers/CallController.java
View File

@ -1190,6 +1190,10 @@ public class CallController extends BaseController {
externalSignalingServer.getExternalSignalingServer(), externalSignalingServer.getExternalSignalingServer(),
conversationUser, externalSignalingServer.getExternalSignalingTicket(), conversationUser, externalSignalingServer.getExternalSignalingTicket(),
TextUtils.isEmpty(credentials)); TextUtils.isEmpty(credentials));
} else {
if (webSocketClient.isConnected() && currentCallStatus.equals(CallStatus.PUBLISHER_FAILED)) {
webSocketClient.restartWebSocket();
}
} }
joinRoomAndCall(); joinRoomAndCall();
@ -1707,6 +1711,7 @@ public class CallController extends BaseController {
peerConnectionEvent.getChangeValue()); peerConnectionEvent.getChangeValue());
} else if (peerConnectionEvent.getPeerConnectionEventType().equals(PeerConnectionEvent.PeerConnectionEventType.PUBLISHER_FAILED)) { } else if (peerConnectionEvent.getPeerConnectionEventType().equals(PeerConnectionEvent.PeerConnectionEventType.PUBLISHER_FAILED)) {
currentCallStatus = CallStatus.PUBLISHER_FAILED; currentCallStatus = CallStatus.PUBLISHER_FAILED;
webSocketClient.clearResumeId();
if (MerlinTheWizard.isConnectedToInternet()) { if (MerlinTheWizard.isConnectedToInternet()) {
hangup(false); hangup(false);
} }

1
app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
View File

@ -1157,6 +1157,7 @@ public class ChatController extends BaseController implements MessagesListAdapte
return false; return false;
} }
@Subscribe(threadMode = ThreadMode.BACKGROUND) @Subscribe(threadMode = ThreadMode.BACKGROUND)
public void onMessageEvent(UserMentionClickEvent userMentionClickEvent) { public void onMessageEvent(UserMentionClickEvent userMentionClickEvent) {
if ((!currentConversation.getType().equals(Conversation.ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL) || !currentConversation.getName().equals(userMentionClickEvent.getUserId()))) { if ((!currentConversation.getType().equals(Conversation.ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL) || !currentConversation.getName().equals(userMentionClickEvent.getUserId()))) {

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

@ -123,9 +123,16 @@ public class MagicWebSocketInstance extends WebSocketListener {
connected = false; connected = false;
messagesQueue = new ArrayList<>(); messagesQueue = new ArrayList<>();
} }
restartWebSocket();
} }
private void restartWebSocket() {
public void clearResumeId() {
resumeId = "";
}
public void restartWebSocket() {
reconnecting = true; reconnecting = true;
if (MerlinTheWizard.isConnectedToInternet()) { if (MerlinTheWizard.isConnectedToInternet()) {
@ -282,7 +289,6 @@ public class MagicWebSocketInstance extends WebSocketListener {
@Override @Override
public void onClosing(WebSocket webSocket, int code, String reason) { public void onClosing(WebSocket webSocket, int code, String reason) {
Log.d(TAG, "Closing : " + code + " / " + reason); Log.d(TAG, "Closing : " + code + " / " + reason);
Log.d("MARIO", String.valueOf(webSocket.hashCode()));
LoggingUtils.writeLogEntryToFile(context, LoggingUtils.writeLogEntryToFile(context,
"WebSocket " + webSocket.hashCode() + " Closing: " + reason); "WebSocket " + webSocket.hashCode() + " Closing: " + reason);
} }
@ -369,7 +375,7 @@ public class MagicWebSocketInstance extends WebSocketListener {
} }
} }
boolean isConnected() { public boolean isConnected() {
return connected; return connected;
} }

2
build.gradle
View File

@ -13,7 +13,7 @@ buildscript {
} }
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.4.1' classpath 'com.android.tools.build:gradle:3.4.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}"
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong