From fce151be6fd5336f709459e01967e55e02566aa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mieszko=20Wrzeszczy=C5=84ski?= <miewrz@st.amu.edu.pl>
Date: Wed, 21 Nov 2018 08:11:48 +0100
Subject: [PATCH] Change endpoint for users

---
 .../java/com/uam/wmi/findmytutor/activity/BaseActivity.java    | 2 --
 .../java/com/uam/wmi/findmytutor/activity/MapActivity.java     | 2 +-
 .../com/uam/wmi/findmytutor/activity/UsersListFragment.java    | 3 +--
 .../main/java/com/uam/wmi/findmytutor/service/UserService.java | 3 +++
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java
index 610b1ea..ad2c2a4 100644
--- a/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java
@@ -275,14 +275,12 @@ public abstract class BaseActivity
 
         RxSearchObservable.fromView(searchView)
                 .map(String::toLowerCase)
-                .filter(t -> !t.trim().isEmpty())
                 .debounce(300, TimeUnit.MILLISECONDS)
                 .distinctUntilChanged()
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(this::executeSearch);
 
-
         return true;
     }
 
diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java
index 14a4d43..b35dd5a 100644
--- a/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java
@@ -582,7 +582,7 @@ public class MapActivity extends BaseActivity
 
     private void getUserFromApi(String userNameToSearch) {
         disposable.add(
-                userService.apiUsersGet()
+                userService.getAllTutors()
                         .subscribeOn(Schedulers.io())
                         .observeOn(AndroidSchedulers.mainThread())
                         .map(tutors -> Stream.of(tutors).filter(t ->
diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/UsersListFragment.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/UsersListFragment.java
index c2c8e53..433ed70 100644
--- a/app/src/main/java/com/uam/wmi/findmytutor/activity/UsersListFragment.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/UsersListFragment.java
@@ -9,7 +9,6 @@ import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.DefaultItemAnimator;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -170,7 +169,7 @@ public class UsersListFragment extends Fragment {
 
     private void fetchAllTutors() {
         disposable.add(
-                userService.apiUsersGet()
+                userService.getAllTutors()
                         .subscribeOn(Schedulers.io())
                         .observeOn(AndroidSchedulers.mainThread())
                         .map(tutors -> {
diff --git a/app/src/main/java/com/uam/wmi/findmytutor/service/UserService.java b/app/src/main/java/com/uam/wmi/findmytutor/service/UserService.java
index aca16a4..75671ed 100644
--- a/app/src/main/java/com/uam/wmi/findmytutor/service/UserService.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/service/UserService.java
@@ -27,6 +27,9 @@ public interface UserService {
     @GET("api/users")
     Single <List<User>> apiUsersGet();
 
+    @GET("api/users/tutors")
+    Single <List<User>> getAllTutors();
+
     @POST("api/users")
     Completable createUser(@Body User user);