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

More cleanup

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2017-11-21 12:17:48 +01:00
parent 0ecd90a45c
commit b2d15dcce7
1 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
View File

@ -272,7 +272,6 @@ public class CallActivity extends AppCompatActivity {
// can add our renderer to the VideoTrack. // can add our renderer to the VideoTrack.
localVideoTrack.addRenderer(localRenderer); localVideoTrack.addRenderer(localRenderer);
//we already have video and audio tracks. Now create peerconnections
iceServers = new ArrayList<>(); iceServers = new ArrayList<>();
iceServers.add(new PeerConnection.IceServer("stun:stun.nextcloud.com:443")); iceServers.add(new PeerConnection.IceServer("stun:stun.nextcloud.com:443"));
@ -518,15 +517,14 @@ public class CallActivity extends AppCompatActivity {
} }
private PeerConnectionWrapper alwaysGetPeerConnectionWrapperForSessionId(String sessionId, boolean isLocalPeer) { private PeerConnectionWrapper alwaysGetPeerConnectionWrapperForSessionId(String sessionId, boolean isLocalPeer) {
PeerConnectionWrapper peerConnectionWrapper; PeerConnectionWrapper peerConnectionWrapper;
if ((peerConnectionWrapper = getPeerConnectionWrapperForSessionId(sessionId)) != null) { if ((peerConnectionWrapper = getPeerConnectionWrapperForSessionId(sessionId)) != null) {
return peerConnectionWrapper; return peerConnectionWrapper;
} else { } else {
peerConnectionWrapper = new PeerConnectionWrapper(peerConnectionFactory, peerConnectionWrapper = new PeerConnectionWrapper(peerConnectionFactory,
iceServers, sdpConstraints, sessionId); iceServers, sdpConstraints, sessionId);
peerConnectionWrapper.getPeerConnection().addStream(localMediaStream); peerConnectionWrapper.getPeerConnection().addStream(localMediaStream);
peerConnectionWrapperList.add(peerConnectionWrapper); peerConnectionWrapperList.add(peerConnectionWrapper);
return peerConnectionWrapper; return peerConnectionWrapper;
} }
@ -699,35 +697,36 @@ public class CallActivity extends AppCompatActivity {
ncApi.sendSignalingMessages(credentials, ApiHelper.getUrlForSignaling(userEntity.getBaseUrl()), ncApi.sendSignalingMessages(credentials, ApiHelper.getUrlForSignaling(userEntity.getBaseUrl()),
strings.toString()) strings.toString())
.subscribeOn(Schedulers.newThread()) .retry(3)
.subscribe(new Observer<SignalingOverall>() { .subscribeOn(Schedulers.newThread())
@Override .subscribe(new Observer<SignalingOverall>() {
public void onSubscribe(Disposable d) { @Override
public void onSubscribe(Disposable d) {
} }
@Override @Override
public void onNext(SignalingOverall signalingOverall) { public void onNext(SignalingOverall signalingOverall) {
if (signalingOverall.getOcs().getSignalings() != null) { if (signalingOverall.getOcs().getSignalings() != null) {
for (int i = 0; i < signalingOverall.getOcs().getSignalings().size(); i++) { for (int i = 0; i < signalingOverall.getOcs().getSignalings().size(); i++) {
try { try {
receivedSignalingMessage(signalingOverall.getOcs().getSignalings().get(i)); receivedSignalingMessage(signalingOverall.getOcs().getSignalings().get(i));
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
}
} }
} }
} }
}
@Override @Override
public void onError(Throwable e) { public void onError(Throwable e) {
} }
@Override @Override
public void onComplete() { public void onComplete() {
} }
}); });
} }
} }