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

Add logs and additional var filteredItems to store list

Browse source
This commit is contained in:
misaochan 2016-10-27 16:21:21 +13:00
parent 37bd557a06
commit 464d6e0bac
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -222,8 +222,6 @@ public class CategorizationFragment extends Fragment {
//Needs to be an ArrayList and not a List unless we want to modify a big portion of preexisting code //Needs to be an ArrayList and not a List unless we want to modify a big portion of preexisting code
ArrayList<String> mergedItemsList = new ArrayList<String>(mergedItems); ArrayList<String> mergedItemsList = new ArrayList<String>(mergedItems);
Log.d(TAG, "Merged item list: " + mergedItemsList); Log.d(TAG, "Merged item list: " + mergedItemsList);
return mergedItemsList; return mergedItemsList;
} }

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

@ -43,6 +43,7 @@ public class PrefixUpdater extends AsyncTask<Void, Void, ArrayList<String>> {
} }
protected ArrayList<String> filterYears(ArrayList<String> items) { protected ArrayList<String> filterYears(ArrayList<String> items) {
//Copy to Iterator to prevent ConcurrentModificationException when removing item //Copy to Iterator to prevent ConcurrentModificationException when removing item
for(Iterator<String> item = items.iterator(); item.hasNext();) { for(Iterator<String> item = items.iterator(); item.hasNext();) {
String s = item.next(); String s = item.next();
@ -54,7 +55,8 @@ public class PrefixUpdater extends AsyncTask<Void, Void, ArrayList<String>> {
} }
} }
return items; ArrayList<String> filteredItems = new ArrayList<String>(items);
return filteredItems;
} }
@Override @Override
@ -62,6 +64,7 @@ public class PrefixUpdater extends AsyncTask<Void, Void, ArrayList<String>> {
//If user hasn't typed anything in yet, get GPS and recent items //If user hasn't typed anything in yet, get GPS and recent items
if(TextUtils.isEmpty(filter)) { if(TextUtils.isEmpty(filter)) {
ArrayList<String> mergedItems = new ArrayList<String>(catFragment.mergeItems()); ArrayList<String> mergedItems = new ArrayList<String>(catFragment.mergeItems());
Log.d(TAG, "Merged items, waiting for filter");
ArrayList<String> filteredItems = new ArrayList<String>(filterYears(mergedItems)); ArrayList<String> filteredItems = new ArrayList<String>(filterYears(mergedItems));
return filteredItems; return filteredItems;
} }