mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 04:43:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Separating MethodAUpdater and PrefixUpdater into their own files

Browse source
This commit is contained in:
misaochan 2016-01-22 21:12:59 +13:00
parent 329a880035
commit c638a211d5
4 changed files with 164 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

4
commons/src/main/java/fr/free/nrw/commons/category/AsyncResponse.java Normal file
View file

@ -0,0 +1,4 @@
package fr.free.nrw.commons.category;
public interface AsyncResponse {
}

133
commons/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java
View file

@ -37,24 +37,24 @@ public class CategorizationFragment extends SherlockFragment{
} }
ListView categoriesList; ListView categoriesList;
EditText categoriesFilter; protected EditText categoriesFilter;
ProgressBar categoriesSearchInProgress; ProgressBar categoriesSearchInProgress;
TextView categoriesNotFoundView; TextView categoriesNotFoundView;
TextView categoriesSkip; TextView categoriesSkip;
CategoriesAdapter categoriesAdapter; CategoriesAdapter categoriesAdapter;
CategoriesUpdater lastUpdater = null; PrefixUpdater lastUpdater = null;
MethodAUpdater methodAUpdater = null; MethodAUpdater methodAUpdater = null;
ScheduledThreadPoolExecutor executor = new ScheduledThreadPoolExecutor(2); ScheduledThreadPoolExecutor executor = new ScheduledThreadPoolExecutor(2);
private OnCategoriesSaveHandler onCategoriesSaveHandler; private OnCategoriesSaveHandler onCategoriesSaveHandler;
private HashMap<String, ArrayList<String>> categoriesCache; protected HashMap<String, ArrayList<String>> categoriesCache;
LinkedHashSet<CategoryItem> itemSet = new LinkedHashSet<CategoryItem>(); LinkedHashSet<CategoryItem> itemSet = new LinkedHashSet<CategoryItem>();
private ContentProviderClient client; private ContentProviderClient client;
private final int SEARCH_CATS_LIMIT = 25; protected final int SEARCH_CATS_LIMIT = 25;
private static final String TAG = CategorizationFragment.class.getName(); private static final String TAG = CategorizationFragment.class.getName();
public static class CategoryItem implements Parcelable { public static class CategoryItem implements Parcelable {
@ -91,7 +91,7 @@ public class CategorizationFragment extends SherlockFragment{
} }
} }
private ArrayList<String> recentCatQuery() { protected ArrayList<String> recentCatQuery() {
ArrayList<String> items = new ArrayList<String>(); ArrayList<String> items = new ArrayList<String>();
ArrayList<String> mergedItems= new ArrayList<String>(); ArrayList<String> mergedItems= new ArrayList<String>();
@ -125,127 +125,8 @@ public class CategorizationFragment extends SherlockFragment{
return mergedItems; return mergedItems;
} }
private class MethodAUpdater extends AsyncTask<Void, Void, ArrayList<String>> {
private String filter; protected void setCatsAfterAsync(ArrayList<String> categories, String filter) {
@Override
protected void onPreExecute() {
super.onPreExecute();
filter = categoriesFilter.getText().toString();
categoriesSearchInProgress.setVisibility(View.VISIBLE);
categoriesNotFoundView.setVisibility(View.GONE);
categoriesSkip.setVisibility(View.GONE);
}
@Override
protected void onPostExecute(ArrayList<String> categories) {
super.onPostExecute(categories);
setCatsAfterAsync(categories, filter);
}
@Override
protected ArrayList<String> doInBackground(Void... voids) {
if(TextUtils.isEmpty(filter)) {
return recentCatQuery();
}
if(categoriesCache.containsKey(filter)) {
return categoriesCache.get(filter);
}
MWApi api = CommonsApplication.createMWApi();
ApiResult result;
ArrayList<String> categories = new ArrayList<String>();
//URL https://commons.wikimedia.org/w/api.php?action=query&format=xml&list=search&srwhat=text&srenablerewrites=1&srnamespace=14&srlimit=10&srsearch=
try {
result = api.action("query")
.param("format", "xml")
.param("list", "search")
.param("srwhat", "text")
.param("srnamespace", "14")
.param("srlimit", SEARCH_CATS_LIMIT)
.param("srsearch", filter)
.get();
Log.d(TAG, "Method A URL filter" + result.toString());
} catch (IOException e) {
throw new RuntimeException(e);
}
ArrayList<ApiResult> categoryNodes = result.getNodes("/api/query/search/p/@title");
for(ApiResult categoryNode: categoryNodes) {
String cat = categoryNode.getDocument().getTextContent();
String catString = cat.replace("Category:", "");
categories.add(catString);
}
categoriesCache.put(filter, categories);
return categories;
}
}
private class CategoriesUpdater extends AsyncTask<Void, Void, ArrayList<String>> {
private String filter;
@Override
protected void onPreExecute() {
super.onPreExecute();
filter = categoriesFilter.getText().toString();
categoriesSearchInProgress.setVisibility(View.VISIBLE);
categoriesNotFoundView.setVisibility(View.GONE);
categoriesSkip.setVisibility(View.GONE);
}
@Override
protected void onPostExecute(ArrayList<String> categories) {
super.onPostExecute(categories);
setCatsAfterAsync(categories, filter);
}
@Override
protected ArrayList<String> doInBackground(Void... voids) {
//If user hasn't typed anything in yet, get GPS and recent items
if(TextUtils.isEmpty(filter)) {
return recentCatQuery();
}
//if user types in something that is in cache, return cached category
if(categoriesCache.containsKey(filter)) {
return categoriesCache.get(filter);
}
//otherwise if user has typed something in that isn't in cache, search API for matching categories
MWApi api = CommonsApplication.createMWApi();
ApiResult result;
ArrayList<String> categories = new ArrayList<String>();
try {
result = api.action("query")
.param("list", "allcategories")
.param("acprefix", filter)
.param("aclimit", SEARCH_CATS_LIMIT)
.get();
Log.d(TAG, "Prefix URL filter" + result.toString());
} catch (IOException e) {
throw new RuntimeException(e);
}
ArrayList<ApiResult> categoryNodes = result.getNodes("/api/query/allcategories/c");
for(ApiResult categoryNode: categoryNodes) {
categories.add(categoryNode.getDocument().getTextContent());
}
categoriesCache.put(filter, categories);
return categories;
}
}
private void setCatsAfterAsync(ArrayList<String> categories, String filter) {
ArrayList<CategoryItem> items = new ArrayList<CategoryItem>(); ArrayList<CategoryItem> items = new ArrayList<CategoryItem>();
HashSet<String> existingKeys = new HashSet<String>(); HashSet<String> existingKeys = new HashSet<String>();
@ -461,7 +342,7 @@ public class CategorizationFragment extends SherlockFragment{
ArrayList<CategoryItem> itemList = new ArrayList<CategoryItem>(itemSet); ArrayList<CategoryItem> itemList = new ArrayList<CategoryItem>(itemSet);
methodAUpdater = new MethodAUpdater(); methodAUpdater = new MethodAUpdater();
lastUpdater = new CategoriesUpdater(); lastUpdater = new PrefixUpdater();
Utils.executeAsyncTask(lastUpdater, executor); Utils.executeAsyncTask(lastUpdater, executor);
Utils.executeAsyncTask(methodAUpdater, executor); Utils.executeAsyncTask(methodAUpdater, executor);

78
commons/src/main/java/fr/free/nrw/commons/category/MethodAUpdater.java Normal file
View file

@ -0,0 +1,78 @@
package fr.free.nrw.commons.category;
import android.os.AsyncTask;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
import org.mediawiki.api.ApiResult;
import org.mediawiki.api.MWApi;
import java.io.IOException;
import java.util.ArrayList;
import fr.free.nrw.commons.CommonsApplication;
public class MethodAUpdater extends AsyncTask<Void, Void, ArrayList<String>> {
private String filter;
private static final String TAG = MethodAUpdater.class.getName();
CategorizationFragment catFragment = new CategorizationFragment();
@Override
protected void onPreExecute() {
super.onPreExecute();
filter = catFragment.categoriesFilter.getText().toString();
catFragment.categoriesSearchInProgress.setVisibility(View.VISIBLE);
catFragment.categoriesNotFoundView.setVisibility(View.GONE);
catFragment.categoriesSkip.setVisibility(View.GONE);
}
@Override
protected void onPostExecute(ArrayList<String> categories) {
super.onPostExecute(categories);
catFragment.setCatsAfterAsync(categories, filter);
}
@Override
protected ArrayList<String> doInBackground(Void... voids) {
if(TextUtils.isEmpty(filter)) {
return catFragment.recentCatQuery();
}
if(catFragment.categoriesCache.containsKey(filter)) {
return catFragment.categoriesCache.get(filter);
}
MWApi api = CommonsApplication.createMWApi();
ApiResult result;
ArrayList<String> categories = new ArrayList<String>();
//URL https://commons.wikimedia.org/w/api.php?action=query&format=xml&list=search&srwhat=text&srenablerewrites=1&srnamespace=14&srlimit=10&srsearch=
try {
result = api.action("query")
.param("format", "xml")
.param("list", "search")
.param("srwhat", "text")
.param("srnamespace", "14")
.param("srlimit", catFragment.SEARCH_CATS_LIMIT)
.param("srsearch", filter)
.get();
Log.d(TAG, "Method A URL filter" + result.toString());
} catch (IOException e) {
throw new RuntimeException(e);
}
ArrayList<ApiResult> categoryNodes = result.getNodes("/api/query/search/p/@title");
for(ApiResult categoryNode: categoryNodes) {
String cat = categoryNode.getDocument().getTextContent();
String catString = cat.replace("Category:", "");
categories.add(catString);
}
catFragment.categoriesCache.put(filter, categories);
return categories;
}
}

75
commons/src/main/java/fr/free/nrw/commons/category/PrefixUpdater.java Normal file
View file

@ -0,0 +1,75 @@
package fr.free.nrw.commons.category;
import android.os.AsyncTask;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
import org.mediawiki.api.ApiResult;
import org.mediawiki.api.MWApi;
import java.io.IOException;
import java.util.ArrayList;
import fr.free.nrw.commons.CommonsApplication;
public class PrefixUpdater extends AsyncTask<Void, Void, ArrayList<String>> {
//TODO: Return type?
private String filter;
private static final String TAG = PrefixUpdater.class.getName();
CategorizationFragment catFragment = new CategorizationFragment();
@Override
protected void onPreExecute() {
super.onPreExecute();
filter = catFragment.categoriesFilter.getText().toString();
catFragment.categoriesSearchInProgress.setVisibility(View.VISIBLE);
catFragment.categoriesNotFoundView.setVisibility(View.GONE);
catFragment.categoriesSkip.setVisibility(View.GONE);
}
@Override
protected void onPostExecute(ArrayList<String> categories) {
super.onPostExecute(categories);
catFragment.setCatsAfterAsync(categories, filter);
//TODO: Return its own List
}
@Override
protected ArrayList<String> doInBackground(Void... voids) {
//If user hasn't typed anything in yet, get GPS and recent items
if(TextUtils.isEmpty(filter)) {
return catFragment.recentCatQuery();
}
//if user types in something that is in cache, return cached category
if(catFragment.categoriesCache.containsKey(filter)) {
return catFragment.categoriesCache.get(filter);
}
//otherwise if user has typed something in that isn't in cache, search API for matching categories
MWApi api = CommonsApplication.createMWApi();
ApiResult result;
ArrayList<String> categories = new ArrayList<String>();
try {
result = api.action("query")
.param("list", "allcategories")
.param("acprefix", filter)
.param("aclimit", catFragment.SEARCH_CATS_LIMIT)
.get();
Log.d(TAG, "Prefix URL filter" + result.toString());
} catch (IOException e) {
throw new RuntimeException(e);
}
ArrayList<ApiResult> categoryNodes = result.getNodes("/api/query/allcategories/c");
for(ApiResult categoryNode: categoryNodes) {
categories.add(categoryNode.getDocument().getTextContent());
}
catFragment.categoriesCache.put(filter, categories);
return categories;
}
}