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

Getting results but only from either method

Browse source
This commit is contained in:
misaochan 2016-01-24 20:35:12 +13:00
parent 0203a9cdec
commit a51f4252bb
1 changed files with 61 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -46,14 +46,15 @@ public class CategorizationFragment extends SherlockFragment{
TextView categoriesSkip; TextView categoriesSkip;
CategoriesAdapter categoriesAdapter; CategoriesAdapter categoriesAdapter;
PrefixUpdater lastUpdater = null;
MethodAUpdater methodAUpdater = null;
ScheduledThreadPoolExecutor executor = new ScheduledThreadPoolExecutor(2); ScheduledThreadPoolExecutor executor = new ScheduledThreadPoolExecutor(2);
private OnCategoriesSaveHandler onCategoriesSaveHandler; private OnCategoriesSaveHandler onCategoriesSaveHandler;
protected HashMap<String, ArrayList<String>> categoriesCache; protected HashMap<String, ArrayList<String>> categoriesCache;
private final Set<String> results = new LinkedHashSet<String>(); private final Set<String> results = new LinkedHashSet<String>();
PrefixUpdaterSub prefixUpdaterSub = null;
MethodAUpdaterSub methodAUpdaterSub = null;
private ContentProviderClient client; private ContentProviderClient client;
@ -110,6 +111,7 @@ public class CategorizationFragment extends SherlockFragment{
Category cat = Category.fromCursor(cursor); Category cat = Category.fromCursor(cursor);
items.add(cat.getName()); items.add(cat.getName());
} }
cursor.close();
if (MwVolleyApi.GpsCatExists.getGpsCatExists() == true){ if (MwVolleyApi.GpsCatExists.getGpsCatExists() == true){
//Log.d(TAG, "GPS cats found in CategorizationFragment.java" + MwVolleyApi.getGpsCat().toString()); //Log.d(TAG, "GPS cats found in CategorizationFragment.java" + MwVolleyApi.getGpsCat().toString());
@ -145,17 +147,10 @@ public class CategorizationFragment extends SherlockFragment{
} }
} }
//TODO: This will set items twice in Adapter. Need to be able to 'add' items to adapter instead? Need to convert LinkedHashSet to ArrayList first?
//TODO: Maybe DON'T call this Adapter method. Instead make an add(items) method that will build up the LinkedHashSet. Then move this whole thing to bottom
categoriesAdapter.setItems(items); categoriesAdapter.setItems(items);
categoriesAdapter.notifyDataSetInvalidated(); categoriesAdapter.notifyDataSetInvalidated();
categoriesSearchInProgress.setVisibility(View.GONE); categoriesSearchInProgress.setVisibility(View.GONE);
/*
itemSet.addAll(items);
Log.d(TAG, "Item Set" + itemSet.toString());
*/
if (categories.size() == 0) { if (categories.size() == 0) {
if(TextUtils.isEmpty(filter)) { if(TextUtils.isEmpty(filter)) {
// If we found no recent cats, show the skip message! // If we found no recent cats, show the skip message!
@ -335,74 +330,74 @@ public class CategorizationFragment extends SherlockFragment{
return rootView; return rootView;
} }
final CountDownLatch latch = new CountDownLatch(1);
class PrefixUpdaterSub extends PrefixUpdater {
public PrefixUpdaterSub() {
super(CategorizationFragment.this);
}
@Override
protected ArrayList<String> doInBackground(Void... voids) {
ArrayList<String> result = new ArrayList<String>();
try {
result = super.doInBackground();
latch.await();
}
catch (InterruptedException e) {
Log.w(TAG, e);
Thread.currentThread().interrupt();
}
return result;
}
@Override
protected void onPostExecute(ArrayList<String> result) {
super.onPostExecute(result);
results.addAll(result);
Log.d(TAG, "Prefix result: " + result);
categoriesAdapter.notifyDataSetChanged();
}
}
class MethodAUpdaterSub extends MethodAUpdater {
public MethodAUpdaterSub() {
super(CategorizationFragment.this);
}
@Override
protected void onPostExecute(ArrayList<String> result) {
results.clear();
super.onPostExecute(result);
results.addAll(result);
Log.d(TAG, "Method A result: " + result);
categoriesAdapter.notifyDataSetChanged();
latch.countDown();
}
}
private void startUpdatingCategoryList() { private void startUpdatingCategoryList() {
if (prefixUpdaterSub != null) {
final CountDownLatch latch = new CountDownLatch(1); prefixUpdaterSub.cancel(true);
class PrefixUpdaterSub extends PrefixUpdater {
public PrefixUpdaterSub() {
super(CategorizationFragment.this);
}
@Override
protected ArrayList<String> doInBackground(Void... voids) {
ArrayList<String> result = new ArrayList<String>();
try {
result = super.doInBackground();
latch.await();
}
catch (InterruptedException e) {
Log.w(TAG, e);
}
return result;
}
@Override
protected void onPostExecute(ArrayList<String> result) {
super.onPostExecute(result);
results.addAll(result);
categoriesAdapter.notifyDataSetChanged();
}
} }
if (methodAUpdaterSub != null) {
class MethodAUpdaterSub extends MethodAUpdater { methodAUpdaterSub.cancel(true);
public MethodAUpdaterSub() {
super(CategorizationFragment.this);
}
@Override
protected void onPostExecute(ArrayList<String> result) {
super.onPostExecute(result);
results.clear();
results.addAll(result);
categoriesAdapter.notifyDataSetChanged();
latch.countDown();
}
} }
if (lastUpdater != null) { prefixUpdaterSub = new PrefixUpdaterSub();
lastUpdater.cancel(true); methodAUpdaterSub = new MethodAUpdaterSub();
}
if (methodAUpdater != null) {
methodAUpdater.cancel(true);
}
PrefixUpdaterSub prefixUpdaterSub = new PrefixUpdaterSub();
MethodAUpdaterSub methodAUpdaterSub = new MethodAUpdaterSub();
Utils.executeAsyncTask(prefixUpdaterSub); Utils.executeAsyncTask(prefixUpdaterSub);
Utils.executeAsyncTask(methodAUpdaterSub); Utils.executeAsyncTask(methodAUpdaterSub);
Log.d(TAG, "Final results: " + results);
} }