mirrors/nextcloud-talk-android
1
0
Fork 0
mirror of https://github.com/nextcloud/talk-android.git synced 2024-11-25 14:35:40 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fixes

Browse source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2017-12-08 13:17:21 +01:00
parent 3a9ebd16c3
commit 24811f0088
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
View file

@ -382,7 +382,7 @@ public class CallActivity extends AppCompatActivity {
ApiHelper.getUrlForCallPing(userEntity.getBaseUrl(), roomToken)) ApiHelper.getUrlForCallPing(userEntity.getBaseUrl(), roomToken))
.subscribeOn(Schedulers.newThread()) .subscribeOn(Schedulers.newThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.repeatWhen(observable -> observable.delay(5000, TimeUnit.MILLISECONDS)) .repeatWhen(completed -> completed.delay(5000, TimeUnit.MILLISECONDS))
.repeatUntil(booleanSupplier) .repeatUntil(booleanSupplier)
.retry(3) .retry(3)
.subscribe(new Observer<GenericOverall>() { .subscribe(new Observer<GenericOverall>() {
@ -412,8 +412,9 @@ public class CallActivity extends AppCompatActivity {
userEntity.getToken()), ApiHelper.getUrlForSignaling(userEntity.getBaseUrl())) userEntity.getToken()), ApiHelper.getUrlForSignaling(userEntity.getBaseUrl()))
.subscribeOn(Schedulers.newThread()) .subscribeOn(Schedulers.newThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.repeatWhen(observable -> observable.delay(1500, TimeUnit //.repeatWhen(observable -> observable.delay(1500, TimeUnit
.MILLISECONDS)) // .MILLISECONDS))
.repeatWhen(completed -> completed)
.repeatUntil(booleanSupplier) .repeatUntil(booleanSupplier)
.retry(3) .retry(3)
.subscribe(new Observer<SignalingOverall>() { .subscribe(new Observer<SignalingOverall>() {
@ -501,6 +502,7 @@ public class CallActivity extends AppCompatActivity {
switch (type) { switch (type) {
case "offer": case "offer":
case "answer": case "answer":
Log.d("MARIO GOT ", type + " " + ncSignalingMessage.getFrom());
magicPeerConnectionWrapper.setNick(ncSignalingMessage.getPayload().getNick()); magicPeerConnectionWrapper.setNick(ncSignalingMessage.getPayload().getNick());
magicPeerConnectionWrapper.getPeerConnection().setRemoteDescription(magicPeerConnectionWrapper magicPeerConnectionWrapper.getPeerConnection().setRemoteDescription(magicPeerConnectionWrapper
.getMagicSdpObserver(), new SessionDescription(SessionDescription.Type.fromCanonicalForm(type), .getMagicSdpObserver(), new SessionDescription(SessionDescription.Type.fromCanonicalForm(type),
@ -611,10 +613,6 @@ public class CallActivity extends AppCompatActivity {
} }
for (MagicPeerConnectionWrapper magicPeerConnectionWrapper : magicPeerConnectionWrapperList) {
endPeerConnection(magicPeerConnectionWrapper.getSessionId());
}
if (videoCapturer != null) { if (videoCapturer != null) {
videoCapturer.dispose(); videoCapturer.dispose();
} }