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

Add Iterator to fix ConcurrentModificationException

Browse source
This commit is contained in:
misaochan 2016-10-25 17:17:38 +13:00
parent 3894d5f7b4
commit c118d31a6f
1 changed files with 27 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -41,6 +41,7 @@ import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
@ -218,16 +219,35 @@ public class CategorizationFragment extends Fragment {
mergedItems.addAll(recentItems); mergedItems.addAll(recentItems);
Log.d(TAG, "Adding recent items: " + recentItems); Log.d(TAG, "Adding recent items: " + recentItems);
for (String item : mergedItems) {
Log.d(TAG, "Filtering item: " + item);
if (item.contains("(19|20)\\d{2}")) {
Log.d(TAG, "Filtering out year " + item);
mergedItems.remove(item);
}
}
//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);
//"(19|20)\\d{2}"
//"\\b(19|20)\\d{2}\\b"
for(Iterator<String> item = mergedItemsList.iterator(); item.hasNext();) {
String s = item.next();
if(s.contains("2016")) {
Log.d(TAG, "Filtering out year " + item);
item.remove();
}
}
/*
for (String item : mergedItemsList) {
Log.d(TAG, "Filtering item: " + item);
//"(19|20)\\d{2}"
//"\\b(19|20)\\d{2}\\b"
if (item.contains("2016")) {
Log.d(TAG, "Filtering out year " + item);
mergedItemsList.remove(item);
}
}
*/
Log.d(TAG, "Merged item list: " + mergedItemsList); Log.d(TAG, "Merged item list: " + mergedItemsList);
return mergedItemsList; return mergedItemsList;