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

Fix joining magic

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2019-06-21 12:04:30 +02:00
parent c48e9e01a2
commit f37a05dfb6
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1191,10 +1191,10 @@ public class CallController extends BaseController {
externalSignalingServer.getExternalSignalingServer(), externalSignalingServer.getExternalSignalingServer(),
conversationUser, externalSignalingServer.getExternalSignalingTicket(), conversationUser, externalSignalingServer.getExternalSignalingTicket(),
TextUtils.isEmpty(credentials)); TextUtils.isEmpty(credentials));
}
joinRoomAndCall(); joinRoomAndCall();
} }
}
private void initiateCall() { private void initiateCall() {
if (!TextUtils.isEmpty(roomToken)) { if (!TextUtils.isEmpty(roomToken)) {
@ -1215,7 +1215,6 @@ public class CallController extends BaseController {
initiateCall(); initiateCall();
} }
} else { } else {
} }
break; break;
case "roomJoined": case "roomJoined":
@ -1708,8 +1707,8 @@ public class CallController extends BaseController {
gotAudioOrVideoChange(false, peerConnectionEvent.getSessionId() + "+" + peerConnectionEvent.getVideoStreamType(), gotAudioOrVideoChange(false, peerConnectionEvent.getSessionId() + "+" + peerConnectionEvent.getVideoStreamType(),
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;
if (MerlinTheWizard.isConnectedToInternet()) { if (MerlinTheWizard.isConnectedToInternet()) {
currentCallStatus = CallStatus.RECONNECTING;
hangup(false); hangup(false);
} }
} }
@ -1728,7 +1727,7 @@ public class CallController extends BaseController {
magicPeerConnectionWrapper = magicPeerConnectionWrapperList.get(i); magicPeerConnectionWrapper = magicPeerConnectionWrapperList.get(i);
Observable Observable
.interval(1, TimeUnit.SECONDS) .interval(1, TimeUnit.SECONDS)
.repeatWhen() -> !isConnectionEstablished() || isBeingDestroyed() || isDestroyed() || !MerlinTheWizard.isConnectedToInternet()) .repeatUntil(() -> (!isConnectionEstablished() || isBeingDestroyed() || isDestroyed() || !MerlinTheWizard.isConnectedToInternet()))
.observeOn(Schedulers.io()) .observeOn(Schedulers.io())
.subscribe(new Observer<Long>() { .subscribe(new Observer<Long>() {
@Override @Override