From 50bd01b1ef1530e632cd0e9f28eb134287b0527e Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Mon, 12 Mar 2018 20:26:22 +0100
Subject: [PATCH] Clean up operations

Signed-off-by: Mario Danic <mario@lovelyhq.com>
---
 .../bottomsheet/OperationsMenuController.java | 99 ++++++++++---------
 1 file changed, 51 insertions(+), 48 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/OperationsMenuController.java b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/OperationsMenuController.java
index 108f2346d..9a6c84e00 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/OperationsMenuController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/OperationsMenuController.java
@@ -229,8 +229,7 @@ public class OperationsMenuController extends BaseController {
                             .subscribe(operationsObserver);
                     break;
                 case 10:
-                    String finalCredentials = credentials;
-                    ncApi.getRoom(finalCredentials, ApiUtils.getRoom(baseUrl, conversationToken))
+                    ncApi.getRoom(credentials, ApiUtils.getRoom(baseUrl, conversationToken))
                             .subscribeOn(Schedulers.newThread())
                             .observeOn(AndroidSchedulers.mainThread())
                             .retry(1)
@@ -243,52 +242,7 @@ public class OperationsMenuController extends BaseController {
                                 @Override
                                 public void onNext(RoomOverall roomOverall) {
                                     room = roomOverall.getOcs().getData();
-                                    ncApi.getCapabilities(finalCredentials, ApiUtils.getUrlForCapabilities(baseUrl))
-                                            .subscribeOn(Schedulers.newThread())
-                                            .observeOn(AndroidSchedulers.mainThread())
-                                            .subscribe(new Observer<CapabilitiesOverall>() {
-                                                @Override
-                                                public void onSubscribe(Disposable d) {
-
-                                                }
-
-                                                @Override
-                                                public void onNext(CapabilitiesOverall capabilitiesOverall) {
-                                                    if (capabilitiesOverall.getOcs().getData()
-                                                            .getCapabilities().getSpreedCapability() != null &&
-                                                            capabilitiesOverall.getOcs().getData()
-                                                                    .getCapabilities().getSpreedCapability()
-                                                                    .getFeatures() != null && capabilitiesOverall.getOcs().getData()
-                                                            .getCapabilities().getSpreedCapability()
-                                                            .getFeatures().contains("guest-signaling")) {
-                                                        if (room.isHasPassword() && room.isGuest()) {
-                                                            eventBus.post(new BottomSheetLockEvent(true, 0,
-                                                                    true, false));
-                                                            Bundle bundle = new Bundle();
-                                                            bundle.putParcelable(BundleKeys.KEY_ROOM, Parcels.wrap(room));
-                                                            bundle.putString(BundleKeys.KEY_CALL_URL, callUrl);
-                                                            bundle.putInt(BundleKeys.KEY_OPERATION_CODE, 99);
-                                                            getRouter().pushController(RouterTransaction.with(new EntryMenuController(bundle))
-                                                                    .pushChangeHandler(new HorizontalChangeHandler())
-                                                                    .popChangeHandler(new HorizontalChangeHandler()));
-                                                        } else {
-                                                            initiateCall();
-                                                        }
-                                                    } else {
-                                                        showResultImage(false, true);
-                                                    }
-                                                }
-
-                                                @Override
-                                                public void onError(Throwable e) {
-                                                    showResultImage(false, false);
-                                                }
-
-                                                @Override
-                                                public void onComplete() {
-
-                                                }
-                                            });
+                                    fetchCapabilities(credentials);
                                 }
 
                                 @Override
@@ -455,6 +409,55 @@ public class OperationsMenuController extends BaseController {
         dispose();
     }
 
+    private void fetchCapabilities(String credentials) {
+        ncApi.getCapabilities(credentials, ApiUtils.getUrlForCapabilities(baseUrl))
+                .subscribeOn(Schedulers.newThread())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Observer<CapabilitiesOverall>() {
+                    @Override
+                    public void onSubscribe(Disposable d) {
+
+                    }
+
+                    @Override
+                    public void onNext(CapabilitiesOverall capabilitiesOverall) {
+                        if (capabilitiesOverall.getOcs().getData()
+                                .getCapabilities().getSpreedCapability() != null &&
+                                capabilitiesOverall.getOcs().getData()
+                                        .getCapabilities().getSpreedCapability()
+                                        .getFeatures() != null && capabilitiesOverall.getOcs().getData()
+                                .getCapabilities().getSpreedCapability()
+                                .getFeatures().contains("guest-signaling")) {
+                            if (room.isHasPassword() && room.isGuest()) {
+                                eventBus.post(new BottomSheetLockEvent(true, 0,
+                                        true, false));
+                                Bundle bundle = new Bundle();
+                                bundle.putParcelable(BundleKeys.KEY_ROOM, Parcels.wrap(room));
+                                bundle.putString(BundleKeys.KEY_CALL_URL, callUrl);
+                                bundle.putInt(BundleKeys.KEY_OPERATION_CODE, 99);
+                                getRouter().pushController(RouterTransaction.with(new EntryMenuController(bundle))
+                                        .pushChangeHandler(new HorizontalChangeHandler())
+                                        .popChangeHandler(new HorizontalChangeHandler()));
+                            } else {
+                                initiateCall();
+                            }
+                        } else {
+                            showResultImage(false, true);
+                        }
+                    }
+
+                    @Override
+                    public void onError(Throwable e) {
+                        showResultImage(false, false);
+                    }
+
+                    @Override
+                    public void onComplete() {
+
+                    }
+                });
+    }
+
     private void inviteUsersToAConversation() {
         RetrofitBucket retrofitBucket;
         final ArrayList<String> localInvitedUsers = invitedUsers;