Brion VIBBER has uploaded a new change for review.
https://gerrit.wikimedia.org/r/95700
Change subject: work in progress -- search task tweaks
......................................................................
work in progress -- search task tweaks
Change-Id: If62d5e790702ce1707e62c50ce39752ac7d979b3
---
M wikipedia/src/main/java/org/wikimedia/wikipedia/SearchArticlesTask.java
1 file changed, 8 insertions(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/00/95700/1
diff --git
a/wikipedia/src/main/java/org/wikimedia/wikipedia/SearchArticlesTask.java
b/wikipedia/src/main/java/org/wikimedia/wikipedia/SearchArticlesTask.java
index 08256e1..5d40d6d 100644
--- a/wikipedia/src/main/java/org/wikimedia/wikipedia/SearchArticlesTask.java
+++ b/wikipedia/src/main/java/org/wikimedia/wikipedia/SearchArticlesTask.java
@@ -4,30 +4,25 @@
import org.json.JSONArray;
import org.mediawiki.api.json.Api;
import org.mediawiki.api.json.ApiResult;
-import org.wikimedia.wikipedia.concurrency.ExecutorService;
-import org.wikimedia.wikipedia.concurrency.SaneAsyncTask;
import java.util.ArrayList;
import java.util.List;
-public class SearchArticlesTask extends SaneAsyncTask<List<PageTitle>>{
- private Site site;
+public class SearchArticlesTask extends ApiTask<List<PageTitle>>{
private String prefix;
- private WikipediaApp app;
-
- private ApiResult result;
public SearchArticlesTask(Context context, Site site, String prefix) {
- super(ExecutorService.getSingleton().getExecutor(PageFetchTask.class,
2));
- this.app = (WikipediaApp)context.getApplicationContext();
- this.site = site;
+ super(context, site);
this.prefix = prefix;
}
@Override
- public List<PageTitle> performTask() throws Throwable {
- Api api = app.getAPIForSite(site);
- result = api.action("opensearch").param("search",
prefix).param("limit", "5").get();
+ public ApiResult buildRequest(Api api) {
+ return api.action("opensearch").param("search", prefix).param("limit",
"5").get();
+ }
+
+ @Override
+ public List<PageTitle> processResult(ApiResult result) throws Throwable {
JSONArray searchResults = result.asArray().optJSONArray(1);
ArrayList<PageTitle> pageTitles = new ArrayList<PageTitle>();
@@ -36,13 +31,5 @@
}
return pageTitles;
- }
-
- @Override
- public void cancel() {
- super.cancel();
- if (result != null) {
- result.cancel();
- }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/95700
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If62d5e790702ce1707e62c50ce39752ac7d979b3
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Brion VIBBER <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
