diff --git a/app/src/main/java/com/fastaccess/ui/base/BaseActivity.java b/app/src/main/java/com/fastaccess/ui/base/BaseActivity.java index 6c56204d..e34f45bb 100644 --- a/app/src/main/java/com/fastaccess/ui/base/BaseActivity.java +++ b/app/src/main/java/com/fastaccess/ui/base/BaseActivity.java @@ -33,7 +33,6 @@ import com.fastaccess.helper.AppHelper; import com.fastaccess.helper.BundleConstant; import com.fastaccess.helper.Bundler; import com.fastaccess.helper.InputHelper; -import com.fastaccess.helper.Logger; import com.fastaccess.helper.PrefGetter; import com.fastaccess.helper.RxHelper; import com.fastaccess.helper.ViewHelper; @@ -270,6 +269,9 @@ public abstract class BaseActivity implements MainMvp.Presenter { MainPresenter() { - checkBlackListed(); setEnterprise(PrefGetter.isEnterprise()); manageDisposable(RxHelper.getObservable(RestProvider.getUserService(isEnterprise()).getUser()) .flatMap(login -> { @@ -141,28 +133,4 @@ public class MainPresenter extends BasePresenter implements MainMv } @Override public void onMenuItemReselect(@IdRes int id, int position, boolean fromUser) {} - - private void checkBlackListed() { - manageDisposable(RxHelper.getSingle(RxFirebaseDatabase - .data(FirebaseDatabase.getInstance().getReference().child("black_listed"))) - .map(dataSnapshot -> { - boolean exists = false; - Login login = Login.getUser(); - Logger.e(dataSnapshot); - if (login != null) { - if (dataSnapshot != null && dataSnapshot.exists()) { - List values = dataSnapshot.getValue(new GenericTypeIndicator>() {}); - if (values != null && !values.isEmpty()) { - exists = values.contains(Login.getUser().getLogin()); - } - } - } - return exists; - }) - .subscribe(exists -> { - if (exists) { - sendToView(MainMvp.View::onUserIsBlackListed); - } - }, Throwable::printStackTrace)); - } } diff --git a/app/src/main/java/com/fastaccess/ui/modules/search/code/SearchCodePresenter.java b/app/src/main/java/com/fastaccess/ui/modules/search/code/SearchCodePresenter.java index c4a2ba67..bde4b898 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/search/code/SearchCodePresenter.java +++ b/app/src/main/java/com/fastaccess/ui/modules/search/code/SearchCodePresenter.java @@ -4,6 +4,7 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.view.View; +import com.fastaccess.R; import com.fastaccess.data.dao.SearchCodeModel; import com.fastaccess.provider.rest.RestProvider; import com.fastaccess.ui.base.mvp.presenter.BasePresenter; @@ -52,7 +53,12 @@ class SearchCodePresenter extends BasePresenter implements S lastPage = response.getLast(); sendToView(view -> { view.onNotifyAdapter(response.isIncompleteResults() ? null : response.getItems(), page); - view.onSetTabCount(response.getTotalCount()); + if (!response.isIncompleteResults()) { + view.onSetTabCount(response.getTotalCount()); + } else { + view.onSetTabCount(0); + view.showMessage(R.string.error, R.string.search_results_warning); + } }); }); return true; diff --git a/app/src/main/java/com/fastaccess/ui/modules/search/issues/SearchIssuesPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/search/issues/SearchIssuesPresenter.java index 7c00ae35..66717907 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/search/issues/SearchIssuesPresenter.java +++ b/app/src/main/java/com/fastaccess/ui/modules/search/issues/SearchIssuesPresenter.java @@ -4,6 +4,7 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.view.View; +import com.fastaccess.R; import com.fastaccess.data.dao.model.Issue; import com.fastaccess.provider.rest.RestProvider; import com.fastaccess.provider.scheme.SchemeParser; @@ -53,7 +54,12 @@ class SearchIssuesPresenter extends BasePresenter implemen lastPage = response.getLast(); sendToView(view -> { view.onNotifyAdapter(response.isIncompleteResults() ? null : response.getItems(), page); - view.onSetTabCount(response.getTotalCount()); + if (!response.isIncompleteResults()) { + view.onSetTabCount(response.getTotalCount()); + } else { + view.onSetTabCount(0); + view.showMessage(R.string.error, R.string.search_results_warning); + } }); }); return true; diff --git a/app/src/main/java/com/fastaccess/ui/modules/search/repos/SearchReposPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/search/repos/SearchReposPresenter.java index 66f5b19f..6cfc79e4 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/search/repos/SearchReposPresenter.java +++ b/app/src/main/java/com/fastaccess/ui/modules/search/repos/SearchReposPresenter.java @@ -4,6 +4,7 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.view.View; +import com.fastaccess.R; import com.fastaccess.data.dao.model.Repo; import com.fastaccess.provider.rest.RestProvider; import com.fastaccess.provider.scheme.SchemeParser; @@ -53,7 +54,12 @@ class SearchReposPresenter extends BasePresenter implements lastPage = response.getLast(); sendToView(view -> { view.onNotifyAdapter(response.isIncompleteResults() ? null : response.getItems(), page); - view.onSetTabCount(response.getTotalCount()); + if (!response.isIncompleteResults()) { + view.onSetTabCount(response.getTotalCount()); + } else { + view.onSetTabCount(0); + view.showMessage(R.string.error, R.string.search_results_warning); + } }); }); return true; diff --git a/app/src/main/java/com/fastaccess/ui/modules/search/users/SearchUsersPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/search/users/SearchUsersPresenter.java index c9f7099c..68704e81 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/search/users/SearchUsersPresenter.java +++ b/app/src/main/java/com/fastaccess/ui/modules/search/users/SearchUsersPresenter.java @@ -4,6 +4,7 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.view.View; +import com.fastaccess.R; import com.fastaccess.data.dao.model.User; import com.fastaccess.provider.rest.RestProvider; import com.fastaccess.ui.base.mvp.presenter.BasePresenter; @@ -52,7 +53,12 @@ class SearchUsersPresenter extends BasePresenter implements lastPage = response.getLast(); sendToView(view -> { view.onNotifyAdapter(response.isIncompleteResults() ? null : response.getItems(), page); - view.onSetTabCount(response.getTotalCount()); + if (!response.isIncompleteResults()) { + view.onSetTabCount(response.getTotalCount()); + } else { + view.onSetTabCount(0); + view.showMessage(R.string.error, R.string.search_results_warning); + } }); }); return true; diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4959f291..4c9955e8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -612,4 +612,5 @@ Restore Purchases Include Forks The comment is too far to paginate + Please be more specific with your search