From 477100ccd8b0cb73543bb2cc7bfcf529f4bc5bbf Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Tue, 16 Nov 2021 19:53:45 +0100 Subject: [PATCH] delete unused method leaveRoom delete redundant if-check cleanup of commit https://github.com/nextcloud/talk-android/commit/ca9a6220303760f9e1b5fdbd4cba56ace1a7e436 Signed-off-by: Marcel Hibbe --- .../talk/activities/CallActivity.java | 36 +------------------ 1 file changed, 1 insertion(+), 35 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java index 0b69bb9e7..c55e63844 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java +++ b/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() { - @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);