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

Disable network receiver

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-01-08 23:16:47 +01:00
parent c52cc03602
commit 04d67829b3
1 changed files with 46 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -197,9 +197,6 @@ public class CallActivity extends AppCompatActivity {
private boolean videoOn = false; private boolean videoOn = false;
private boolean audioOn = false; private boolean audioOn = false;
private boolean cameraInitialized = false;
private boolean microphoneInitialized = false;
private BroadcastReceiver networkBroadcastReceier; private BroadcastReceiver networkBroadcastReceier;
private static int getSystemUiVisibility() { private static int getSystemUiVisibility() {
@ -231,11 +228,11 @@ public class CallActivity extends AppCompatActivity {
networkBroadcastReceier = new BroadcastReceiver() { networkBroadcastReceier = new BroadcastReceiver() {
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
if (!Device.getNetworkType(context).equals(JobRequest.NetworkType.ANY)) { if ("android.net.conn.CONNECTIVITY_CHANGE".equals(intent.getAction())) {
if (!leavingCall) { if (!Device.getNetworkType(context).equals(JobRequest.NetworkType.ANY)) {
startPullingSignalingMessages(true); startPullingSignalingMessages(true);
} else { } else {
hangup(true); //hangup(true);
} }
} }
} }
@ -285,6 +282,14 @@ public class CallActivity extends AppCompatActivity {
} }
} }
private void performIceRestart() {
for (int i = 0; i < magicPeerConnectionWrapperList.size(); i++) {
sdpConstraints.optional.add(new MediaConstraints.KeyValuePair("IceRestart", "true"));
PeerConnection.RTCConfiguration rtcConfiguration = new PeerConnection.RTCConfiguration(iceServers);
magicPeerConnectionWrapperList.get(i).getPeerConnection().setConfiguration(rtcConfiguration);
}
}
private void handleFromNotification() { private void handleFromNotification() {
ncApi.getRooms(credentials, ApiHelper.getUrlForGetRooms(userEntity.getBaseUrl())) ncApi.getRooms(credentials, ApiHelper.getUrlForGetRooms(userEntity.getBaseUrl()))
.subscribeOn(Schedulers.newThread()) .subscribeOn(Schedulers.newThread())
@ -604,8 +609,6 @@ public class CallActivity extends AppCompatActivity {
// And finally, with our VideoRenderer ready, we // And finally, with our VideoRenderer ready, we
// can add our renderer to the VideoTrack. // can add our renderer to the VideoTrack.
localVideoTrack.addRenderer(localRenderer); localVideoTrack.addRenderer(localRenderer);
cameraInitialized = true;
} }
private void microphoneInitialization() { private void microphoneInitialization() {
@ -614,15 +617,13 @@ public class CallActivity extends AppCompatActivity {
localAudioTrack = peerConnectionFactory.createAudioTrack("NCa0", audioSource); localAudioTrack = peerConnectionFactory.createAudioTrack("NCa0", audioSource);
localAudioTrack.setEnabled(false); localAudioTrack.setEnabled(false);
localMediaStream.addTrack(localAudioTrack); localMediaStream.addTrack(localAudioTrack);
microphoneInitialized = true;
} }
private void startCall() { private void startCall() {
inCall = true; inCall = true;
animateCallControls(false, 5000); animateCallControls(false, 5000);
startPullingSignalingMessages(false); startPullingSignalingMessages(false);
registerNetworkReceiver(); //registerNetworkReceiver();
} }
@OnClick({R.id.pip_video_view, R.id.remote_renderers_layout}) @OnClick({R.id.pip_video_view, R.id.remote_renderers_layout})
@ -636,7 +637,7 @@ public class CallActivity extends AppCompatActivity {
if (restart) { if (restart) {
dispose(null); dispose(null);
hangupNetworkCalls(); //hangupNetworkCalls();
} }
leavingCall = false; leavingCall = false;
@ -680,9 +681,11 @@ public class CallActivity extends AppCompatActivity {
} }
} }
if (restart) {
joinRoomAndCall(); performIceRestart();
} else {
joinRoomAndCall();
}
} }
@Override @Override
@ -973,35 +976,36 @@ public class CallActivity extends AppCompatActivity {
} }
if (videoCapturer != null) {
videoCapturer.dispose();
}
if (localMediaStream != null) {
if (localMediaStream.videoTracks != null && localMediaStream.videoTracks.size() > 0) {
localMediaStream.removeTrack(localMediaStream.videoTracks.get(0));
}
if (localMediaStream.audioTracks != null && localMediaStream.audioTracks.size() > 0) {
localMediaStream.removeTrack(localMediaStream.audioTracks.get(0));
}
}
localVideoTrack = null;
localAudioTrack = null;
localRenderer = null;
localMediaStream = null;
if (videoCapturer != null) {
videoCapturer.dispose();
videoCapturer = null;
}
pipVideoView.release();
if (!dueToNetworkChange) { if (!dueToNetworkChange) {
pipVideoView.release();
if (videoCapturer != null) {
videoCapturer.dispose();
}
if (localMediaStream != null) {
if (localMediaStream.videoTracks != null && localMediaStream.videoTracks.size() > 0) {
localMediaStream.removeTrack(localMediaStream.videoTracks.get(0));
}
if (localMediaStream.audioTracks != null && localMediaStream.audioTracks.size() > 0) {
localMediaStream.removeTrack(localMediaStream.audioTracks.get(0));
}
}
localVideoTrack = null;
localAudioTrack = null;
localRenderer = null;
localMediaStream = null;
if (videoCapturer != null) {
videoCapturer.dispose();
videoCapturer = null;
}
hangupNetworkCalls(); hangupNetworkCalls();
} }
} }
@ -1113,7 +1117,7 @@ public class CallActivity extends AppCompatActivity {
@Override @Override
public void onDestroy() { public void onDestroy() {
hangup(false); hangup(false);
this.unregisterReceiver(networkBroadcastReceier); //this.unregisterReceiver(networkBroadcastReceier);
super.onDestroy(); super.onDestroy();
} }