From 6ceb0c12da8dd99bf3333a3867c85ab05f9204e5 Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Tue, 28 Nov 2017 04:09:48 +0100
Subject: [PATCH] Clean up

Signed-off-by: Mario Danic <mario@lovelyhq.com>
---
 .../talk/controllers/CallsListController.java | 37 ++++++++-----------
 .../talk/controllers/RoomMenuController.java  | 18 ++++-----
 2 files changed, 23 insertions(+), 32 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallsListController.java b/app/src/main/java/com/nextcloud/talk/controllers/CallsListController.java
index 454e0aa53..5edfc0873 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/CallsListController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/CallsListController.java
@@ -84,7 +84,8 @@ import io.reactivex.schedulers.Schedulers;
 import retrofit2.HttpException;
 
 @AutoInjector(NextcloudTalkApplication.class)
-public class CallsListController extends BaseController implements SearchView.OnQueryTextListener {
+public class CallsListController extends BaseController implements SearchView.OnQueryTextListener,
+        FlexibleAdapter.OnItemClickListener {
 
     public static final String TAG = "CallsListController";
 
@@ -146,7 +147,6 @@ public class CallsListController extends BaseController implements SearchView.On
             }
         }
 
-        adapter.addListener(new OnItemClickListener());
         prepareViews();
 
     }
@@ -384,25 +384,20 @@ public class CallsListController extends BaseController implements SearchView.On
         bottomSheet.show();
     }
 
-
-    private class OnItemClickListener implements FlexibleAdapter.OnItemClickListener {
-
-        @Override
-        public boolean onItemClick(int position) {
-            if (callItems.size() > position) {
-                overridePushHandler(new NoOpControllerChangeHandler());
-                overridePopHandler(new NoOpControllerChangeHandler());
-                CallItem callItem = callItems.get(position);
-                Intent callIntent = new Intent(getActivity(), CallActivity.class);
-                BundleBuilder bundleBuilder = new BundleBuilder(new Bundle());
-                bundleBuilder.putString("roomToken", callItem.getModel().getToken());
-                bundleBuilder.putParcelable("userEntity", Parcels.wrap(userEntity));
-                callIntent.putExtras(bundleBuilder.build());
-                startActivity(callIntent);
-            }
-
-            return true;
+    @Override
+    public boolean onItemClick(int position) {
+        if (callItems.size() > position) {
+            overridePushHandler(new NoOpControllerChangeHandler());
+            overridePopHandler(new NoOpControllerChangeHandler());
+            CallItem callItem = callItems.get(position);
+            Intent callIntent = new Intent(getActivity(), CallActivity.class);
+            BundleBuilder bundleBuilder = new BundleBuilder(new Bundle());
+            bundleBuilder.putString("roomToken", callItem.getModel().getToken());
+            bundleBuilder.putParcelable("userEntity", Parcels.wrap(userEntity));
+            callIntent.putExtras(bundleBuilder.build());
+            startActivity(callIntent);
         }
-    }
 
+        return true;
+    }
 }
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/RoomMenuController.java b/app/src/main/java/com/nextcloud/talk/controllers/RoomMenuController.java
index c9cd27e8d..58987b318 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/RoomMenuController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/RoomMenuController.java
@@ -47,7 +47,7 @@ import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager;
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem;
 
 @AutoInjector(NextcloudTalkApplication.class)
-public class RoomMenuController extends BaseController {
+public class RoomMenuController extends BaseController implements FlexibleAdapter.OnItemClickListener{
     @BindView(R.id.recycler_view)
     RecyclerView recyclerView;
     private Room room;
@@ -82,7 +82,6 @@ public class RoomMenuController extends BaseController {
         }
 
         recyclerView.setAdapter(adapter);
-        adapter.addListener(new OnItemClickListener());
 
         recyclerView.addItemDecoration(new DividerItemDecoration(
                 recyclerView.getContext(),
@@ -120,15 +119,12 @@ public class RoomMenuController extends BaseController {
         }
     }
 
-    private class OnItemClickListener implements FlexibleAdapter.OnItemClickListener {
-
-        @Override
-        public boolean onItemClick(int position) {
-            if (menuItems.size() > position) {
-                MenuItem menuItem = (MenuItem) menuItems.get(position);
-            }
-
-            return true;
+    @Override
+    public boolean onItemClick(int position) {
+        if (menuItems.size() > position) {
+            MenuItem menuItem = (MenuItem) menuItems.get(position);
         }
+
+        return true;
     }
 }