s416084/find-my-tutor-android
1
0
Fork 0
Code Issues Pull Requests Releases 9 Wiki Activity

Merge branch 'approximated-localizations' of s416084/find-my-tutor-android into develop

Browse Source
This commit is contained in:
Mieszko Wrzeszczyński 2018-11-21 07:37:49 +00:00 committed by Gogs
commit f4ea4a4378
5 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java
View File

@ -276,14 +276,12 @@ public abstract class BaseActivity
RxSearchObservable.fromView(searchView) RxSearchObservable.fromView(searchView)
.map(String::toLowerCase) .map(String::toLowerCase)
.filter(t -> !t.trim().isEmpty())
.debounce(300, TimeUnit.MILLISECONDS) .debounce(300, TimeUnit.MILLISECONDS)
.distinctUntilChanged() .distinctUntilChanged()
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(this::executeSearch); .subscribe(this::executeSearch);
return true; return true;
} }

6
app/src/main/java/com/uam/wmi/findmytutor/activity/LoginActivity.java
View File

@ -182,12 +182,10 @@ public class LoginActivity extends AppCompatActivity {
Claim userId = jwt.getClaim("nameid"); Claim userId = jwt.getClaim("nameid");
Claim role = jwt.getClaim("http://schemas.microsoft.com/ws/2008/06/identity/claims/role"); Claim role = jwt.getClaim("http://schemas.microsoft.com/ws/2008/06/identity/claims/role");
if(Objects.requireNonNull(role.asString()).equals("Student")){ if(!Objects.requireNonNull(role.asString()).equals("Student")){
PrefUtils.storeIsTutor(getApplicationContext(), false); PrefUtils.storeIsTutor(getApplicationContext(), true);
} }
Log.e("LOGOWANIE",role.asString());
PrefUtils.storeIsLoggedIn(getApplicationContext(), true); PrefUtils.storeIsLoggedIn(getApplicationContext(), true);
PrefUtils.storeApiKey(getApplicationContext(), token); PrefUtils.storeApiKey(getApplicationContext(), token);
PrefUtils.storeUserId(getApplicationContext(), userId.asString()); PrefUtils.storeUserId(getApplicationContext(), userId.asString());

2
app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java
View File

@ -595,7 +595,7 @@ public class MapActivity extends BaseActivity
private void getUserFromApi(String userNameToSearch) { private void getUserFromApi(String userNameToSearch) {
disposable.add( disposable.add(
userService.apiUsersGet() userService.getAllTutors()
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.map(tutors -> Stream.of(tutors).filter(t -> .map(tutors -> Stream.of(tutors).filter(t ->

3
app/src/main/java/com/uam/wmi/findmytutor/activity/UsersListFragment.java
View File

@ -9,7 +9,6 @@ import android.support.v7.app.AlertDialog;
import android.support.v7.widget.DefaultItemAnimator; import android.support.v7.widget.DefaultItemAnimator;
import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@ -170,7 +169,7 @@ public class UsersListFragment extends Fragment {
private void fetchAllTutors() { private void fetchAllTutors() {
disposable.add( disposable.add(
userService.apiUsersGet() userService.getAllTutors()
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.map(tutors -> { .map(tutors -> {

3
app/src/main/java/com/uam/wmi/findmytutor/service/UserService.java
View File

@ -27,6 +27,9 @@ public interface UserService {
@GET("api/users") @GET("api/users")
Single <List<User>> apiUsersGet(); Single <List<User>> apiUsersGet();
@GET("api/users/tutors")
Single <List<User>> getAllTutors();
@POST("api/users") @POST("api/users")
Completable createUser(@Body User user); Completable createUser(@Body User user);