Browse Source

Fixes

Signed-off-by: Mario Danic <mario@lovelyhq.com>
Mario Danic 7 years ago
parent
commit
24811f0088

+ 5 - 7
app/src/main/java/com/nextcloud/talk/activities/CallActivity.java

@@ -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
-                                                        .MILLISECONDS))
+                                                //.repeatWhen(observable -> observable.delay(1500, TimeUnit
+                                                //        .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();
         }
         }