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

Added PrefixUpdaterSub and MethodAUpdaterSub

Browse source
This commit is contained in:
misaochan 2016-01-24 16:31:54 +13:00
parent 8fb27ce9ad
commit 73c6cbcc75
3 changed files with 61 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -336,6 +336,49 @@ public class CategorizationFragment extends SherlockFragment{
} }
final CountDownLatch latch = new CountDownLatch(1);
private class PrefixUpdaterSub extends PrefixUpdater {
public PrefixUpdaterSub() {
super(CategorizationFragment.this);
}
@Override
void doInBackground() {
super.doInBackground();
latch.await();
}
@Override
void onPostExecute(ResultSet result) {
super.onPostExecute(result):
results.addAll(result);
adapter.notifyDataSetComplete();
}
}
private class MethodAUpdaterSub extends MethodAUpdater {
public MethodAUpdaterSub() {
super(CategorizationFragment.this);
}
@Override
void onPostExecute(ResultSet result) {
super.onPostExecute(result):
results.clear();
results.addAll(result);
adapter.notifyDataSetComplete();
latch.countDown();
}
}
private void startUpdatingCategoryList() { private void startUpdatingCategoryList() {
if (lastUpdater != null) { if (lastUpdater != null) {
lastUpdater.cancel(true); lastUpdater.cancel(true);
@ -346,6 +389,12 @@ public class CategorizationFragment extends SherlockFragment{
} }
PrefixUpdaterSub prefixUpdaterSub = new PrefixUpdaterSub();
MethodAUpdaterSub methodAUpdaterSub = new MethodAUpdaterSub();
Utils.executeAsyncTask(prefixUpdaterSub);
Utils.executeAsyncTask(methodAUpdaterSub);
/*
ArrayList<CategoryItem> itemList = new ArrayList<CategoryItem>(itemSet); ArrayList<CategoryItem> itemList = new ArrayList<CategoryItem>(itemSet);
methodAUpdater = new MethodAUpdater(); methodAUpdater = new MethodAUpdater();
@ -353,8 +402,7 @@ public class CategorizationFragment extends SherlockFragment{
Utils.executeAsyncTask(lastUpdater, executor); Utils.executeAsyncTask(lastUpdater, executor);
Utils.executeAsyncTask(methodAUpdater, executor); Utils.executeAsyncTask(methodAUpdater, executor);
*/
} }

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

@ -18,7 +18,11 @@ public class MethodAUpdater extends AsyncTask<Void, Void, ArrayList<String>> {
private String filter; private String filter;
private static final String TAG = MethodAUpdater.class.getName(); private static final String TAG = MethodAUpdater.class.getName();
CategorizationFragment catFragment = new CategorizationFragment(); CategorizationFragment catFragment;
public MethodAUpdater(CategorizationFragment catFragment) {
this.catFragment = catFragment;
}
@Override @Override
protected void onPreExecute() { protected void onPreExecute() {

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

@ -18,7 +18,12 @@ public class PrefixUpdater extends AsyncTask<Void, Void, ArrayList<String>> {
private String filter; private String filter;
private static final String TAG = PrefixUpdater.class.getName(); private static final String TAG = PrefixUpdater.class.getName();
CategorizationFragment catFragment = new CategorizationFragment(); CategorizationFragment catFragment;
public PrefixUpdater(CategorizationFragment catFragment) {
this.catFragment = catFragment;
}
@Override @Override
protected void onPreExecute() { protected void onPreExecute() {
super.onPreExecute(); super.onPreExecute();