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

Clean up

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2017-11-21 12:15:35 +01:00
parent f00f01c175
commit 0ecd90a45c
2 changed files with 3 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -473,7 +473,7 @@ public class CallActivity extends AppCompatActivity {
}
for (PeerConnectionWrapper peerConnectionWrapper : peerConnectionWrapperList) {
if (!peerConnectionWrapper.isLocal()) {
if (!peerConnectionWrapper.getSessionId().equals(callSession)) {
oldSesssions.add(peerConnectionWrapper.getSessionId());
}
}
@ -525,7 +525,7 @@ public class CallActivity extends AppCompatActivity {
return peerConnectionWrapper;
} else {
peerConnectionWrapper = new PeerConnectionWrapper(peerConnectionFactory,
iceServers, sdpConstraints, sessionId, isLocalPeer, callSession);
iceServers, sdpConstraints, sessionId);
peerConnectionWrapper.getPeerConnection().addStream(localMediaStream);
peerConnectionWrapperList.add(peerConnectionWrapper);
return peerConnectionWrapper;
@ -611,7 +611,6 @@ public class CallActivity extends AppCompatActivity {
if (stream.audioTracks.size() == 1) {
AudioTrack audioTrack = stream.audioTracks.get(0);
Log.d("MARIO", "BL");
}
}
@ -659,12 +658,10 @@ public class CallActivity extends AppCompatActivity {
@Subscribe(threadMode = ThreadMode.BACKGROUND)
public void onMessageEvent(SessionDescriptionSendEvent sessionDescriptionSend) throws IOException {
Log.d("MARIO_123", "SENDING " + sessionDescriptionSend.getType());
String credentials = ApiHelper.getCredentials(userEntity.getUsername(), userEntity.getToken());
NCMessageWrapper ncMessageWrapper = new NCMessageWrapper();
ncMessageWrapper.setEv("message");
ncMessageWrapper.setSessionId(callSession);
// Create signaling message and payload
NCSignalingMessage ncSignalingMessage = new NCSignalingMessage();
ncSignalingMessage.setTo(sessionDescriptionSend.getPeerId());
ncSignalingMessage.setRoomType("video");

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

@ -45,24 +45,18 @@ public class PeerConnectionWrapper {
private static PeerConnection peerConnection;
List<IceCandidate> iceCandidates = new ArrayList<>();
List<PeerConnection.IceServer> iceServers;
List<IceCandidate> candidatesToSend = new ArrayList<>();
List<SessionDescription> sessionDescriptionsQueue = new ArrayList<>();
List<NCIceCandidate> localCandidates = new ArrayList<>();
List<SessionDescriptionSendEvent> sessionDescriptionSendEvents = new ArrayList<>();
private String sessionId;
private String callToken;
private String nick;
private boolean local;
private MediaConstraints mediaConstraints;
private DataChannel dataChannel;
private MagicSdpObserver magicSdpObserver;
private MagicPeerConnectionObserver magicPeerConnectionObserver;
private boolean isInitiator;
public PeerConnectionWrapper(PeerConnectionFactory peerConnectionFactory,
List<PeerConnection.IceServer> iceServerList,
MediaConstraints mediaConstraints,
String sessionId, boolean isLocalPeer, String callToken) {
String sessionId) {
this.iceServers = iceServerList;
@ -74,7 +68,6 @@ public class PeerConnectionWrapper {
@Override
public void onIceConnectionChange(PeerConnection.IceConnectionState iceConnectionState) {
Log.d("MARIO_ICE", iceConnectionState.name());
}
@Override
@ -84,15 +77,11 @@ public class PeerConnectionWrapper {
@Override
public void onSignalingChange(PeerConnection.SignalingState signalingState) {
Log.d("MARIO", signalingState.name());
}
@Override
public void onIceGatheringChange(PeerConnection.IceGatheringState iceGatheringState) {
/*if (iceGatheringState.equals(PeerConnection.IceGatheringState.COMPLETE)) {
sendLocalCandidates();
}*/
}
@Override
@ -115,10 +104,7 @@ public class PeerConnectionWrapper {
magicPeerConnectionObserver);
this.sessionId = sessionId;
this.local = isLocalPeer;
this.mediaConstraints = mediaConstraints;
this.callToken = callToken;
isInitiator = this.sessionId.compareTo(callToken) < 0;
magicSdpObserver = new MagicSdpObserver() {
@Override
@ -173,7 +159,6 @@ public class PeerConnectionWrapper {
}
public void drainIceCandidates() {
Log.d("MARIO", "DRAINING");
for (IceCandidate iceCandidate : iceCandidates) {
peerConnection.addIceCandidate(iceCandidate);
@ -188,12 +173,9 @@ public class PeerConnectionWrapper {
}
public void addCandidate(IceCandidate iceCandidate) {
Log.d("MARIO", "RECEIVING CANDIDATE");
if (peerConnection.getRemoteDescription() != null) {
Log.d("MARIO", "DIRECT ADDING");
peerConnection.addIceCandidate(iceCandidate);
} else {
Log.d("MARIO", "DIRECT QUEUE");
iceCandidates.add(iceCandidate);
}
}
@ -204,14 +186,6 @@ public class PeerConnectionWrapper {
}
public boolean isLocal() {
return local;
}
public void setLocal(boolean local) {
this.local = local;
}
public PeerConnection getPeerConnection() {
return peerConnection;
}