Browse Source

delete unused method leaveRoom

delete redundant if-check

cleanup of commit https://github.com/nextcloud/talk-android/commit/ca9a6220303760f9e1b5fdbd4cba56ace1a7e436

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
Marcel Hibbe 3 years ago
parent
commit
477100ccd8
1 changed files with 1 additions and 35 deletions
  1. 1 35
      app/src/main/java/com/nextcloud/talk/activities/CallActivity.java

+ 1 - 35
app/src/main/java/com/nextcloud/talk/activities/CallActivity.java

@@ -1591,9 +1591,7 @@ public class CallActivity extends CallBaseActivity {
                 public void onNext(@io.reactivex.annotations.NonNull GenericOverall genericOverall) {
                     if (shutDownView) {
                         finish();
-                    } else if (!shutDownView &&
-                        (currentCallStatus == CallStatus.RECONNECTING ||
-                            currentCallStatus == CallStatus.PUBLISHER_FAILED)) {
+                    } else if (currentCallStatus == CallStatus.RECONNECTING || currentCallStatus == CallStatus.PUBLISHER_FAILED) {
                         initiateCall();
                     }
                 }
@@ -1610,38 +1608,6 @@ public class CallActivity extends CallBaseActivity {
             });
     }
 
-    // TODO: why is this never called?!
-    private void leaveRoom(boolean shutDownView) {
-        int apiVersion = ApiUtils.getConversationApiVersion(conversationUser, new int[]{ApiUtils.APIv4, 1});
-
-        ncApi.leaveRoom(credentials, ApiUtils.getUrlForParticipantsActive(apiVersion, baseUrl, roomToken))
-            .subscribeOn(Schedulers.io())
-            .observeOn(AndroidSchedulers.mainThread())
-            .subscribe(new Observer<GenericOverall>() {
-                @Override
-                public void onSubscribe(@io.reactivex.annotations.NonNull Disposable d) {
-                    // unused atm
-                }
-
-                @Override
-                public void onNext(@io.reactivex.annotations.NonNull GenericOverall genericOverall) {
-                    if (shutDownView) {
-                        finish();
-                    }
-                }
-
-                @Override
-                public void onError(@io.reactivex.annotations.NonNull Throwable e) {
-                    // unused atm
-                }
-
-                @Override
-                public void onComplete() {
-                    // unused atm
-                }
-            });
-    }
-
     private void startVideoCapture() {
         if (videoCapturer != null) {
             videoCapturer.startCapture(1280, 720, 30);