From be8310350ec21b050c027ee42e774b2a0a4e9f0c Mon Sep 17 00:00:00 2001 From: "adi.bk" Date: Thu, 1 Jun 2017 19:14:49 -0700 Subject: [PATCH] Clean up --- .../com/fastaccess/data/dao/model/FilterOptionsModel.java | 1 + .../ui/modules/profile/org/repos/OrgReposFragment.java | 1 - .../profile/repos/ProfileReposFilterBottomSheetDialog.java | 5 ----- .../ui/modules/profile/repos/ProfileReposPresenter.java | 2 +- 4 files changed, 2 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/fastaccess/data/dao/model/FilterOptionsModel.java b/app/src/main/java/com/fastaccess/data/dao/model/FilterOptionsModel.java index 14243950..47528634 100644 --- a/app/src/main/java/com/fastaccess/data/dao/model/FilterOptionsModel.java +++ b/app/src/main/java/com/fastaccess/data/dao/model/FilterOptionsModel.java @@ -74,6 +74,7 @@ public class FilterOptionsModel implements Parcelable { queryMap.clear(); } queryMap.put(TYPE, type.toLowerCase()); + //Not supported for organization repo if (!isOrg) { if (sort.contains(" ")) { //full name should be full_name diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/org/repos/OrgReposFragment.java b/app/src/main/java/com/fastaccess/ui/modules/profile/org/repos/OrgReposFragment.java index 137cd47d..2785d226 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/profile/org/repos/OrgReposFragment.java +++ b/app/src/main/java/com/fastaccess/ui/modules/profile/org/repos/OrgReposFragment.java @@ -134,7 +134,6 @@ refresh.setRefreshing(true); @Override public void onRepoFilterClicked() { dialog.setCurrentFilterOptions(getPresenter().getFilterOptions()); - dialog.setOrg(true); dialog.show(getChildFragmentManager(), "OrgReposFragment"); } diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/repos/ProfileReposFilterBottomSheetDialog.java b/app/src/main/java/com/fastaccess/ui/modules/profile/repos/ProfileReposFilterBottomSheetDialog.java index 7699d9e6..c6377d17 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/profile/repos/ProfileReposFilterBottomSheetDialog.java +++ b/app/src/main/java/com/fastaccess/ui/modules/profile/repos/ProfileReposFilterBottomSheetDialog.java @@ -32,7 +32,6 @@ public class ProfileReposFilterBottomSheetDialog extends BaseBottomSheetDialog { private ProfileReposFilterChangeListener listener; private FilterOptionsModel currentFilterOptions; - private boolean isOrg; @Override protected int layoutRes() { @@ -115,10 +114,6 @@ public class ProfileReposFilterBottomSheetDialog extends BaseBottomSheetDialog { this.currentFilterOptions = currentFilterOptions; } - public void setOrg(boolean org) { - isOrg = org; - } - public interface ProfileReposFilterChangeListener { void onFilterApply(); void onTypeSelected(String selectedType); diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/repos/ProfileReposPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/profile/repos/ProfileReposPresenter.java index 5cd61e5e..81908004 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/profile/repos/ProfileReposPresenter.java +++ b/app/src/main/java/com/fastaccess/ui/modules/profile/repos/ProfileReposPresenter.java @@ -75,7 +75,7 @@ class ProfileReposPresenter extends BasePresenter implemen filterOptions.setIsPersonalProfile(TextUtils.equals(currentLoggedIn, username)); makeRestCall(TextUtils.equals(currentLoggedIn, username) ? RestProvider.getUserService().getRepos(filterOptions.getQueryMap(), page) - : RestProvider.getUserService().getRepos(filterOptions.getQueryMap(), parameter, page), + : RestProvider.getUserService().getRepos(parameter, filterOptions.getQueryMap(), page), repoModelPageable -> { lastPage = repoModelPageable.getLast(); if (getCurrentPage() == 1) {