Skip to content

Commit a482e96

Browse files
authored
Merge pull request #1130 from Meisolsson/issue-1125
Fix searching issues in repository
2 parents c8a4861 + fd90152 commit a482e96

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

app/src/main/java/com/github/pockethub/android/ui/issue/SearchIssueListFragment.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import android.view.View;
2121
import android.widget.ListView;
2222

23+
import com.github.pockethub.android.util.InfoUtils;
2324
import com.meisolsson.githubsdk.core.ServiceGenerator;
2425
import com.meisolsson.githubsdk.model.Issue;
2526
import com.meisolsson.githubsdk.model.Repository;
@@ -95,13 +96,16 @@ public List<Issue> loadData() throws Exception {
9596
return Collections.emptyList();
9697
}
9798
List<Issue> matches = new ArrayList<>();
99+
// We need to add the repo parameter to allow us to search only the repo issues
100+
String searchQuery = query + "+repo:" + InfoUtils.createRepoId(repository);
98101

99-
SearchService service = ServiceGenerator.createService(getActivity(), SearchService.class);
102+
SearchService service = ServiceGenerator.createService(getActivity(),
103+
SearchService.class);
100104

101105
int current = 1;
102106
int last = 0;
103107
while (current != last) {
104-
SearchPage<Issue> page = service.searchIssues(query, null, null, current)
108+
SearchPage<Issue> page = service.searchIssues(searchQuery, null, null, current)
105109
.blockingGet()
106110
.body();
107111

@@ -129,6 +133,6 @@ protected SingleTypeAdapter<Issue> createAdapter(
129133

130134
@Override
131135
public int compare(Issue lhs, Issue rhs) {
132-
return (int) (rhs.number() - lhs.number());
136+
return rhs.number() - lhs.number();
133137
}
134138
}

0 commit comments

Comments
 (0)