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

Add filterYears method

Browse source
This commit is contained in:
misaochan 2016-10-27 16:09:47 +13:00
parent aaf91ac264
commit bff5ce96b0
2 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -222,16 +222,7 @@ 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
ArrayList<String> mergedItemsList = new ArrayList<String>(mergedItems);
//Copy to Iterator to prevent ConcurrentModificationException when removing item
for(Iterator<String> item = mergedItemsList.iterator(); item.hasNext();) {
String s = item.next();
//Check if s contains a 4-digit word anywhere within the string (.* is wildcard)
if(s.matches(".*(19|20)\\d{2}.*")) {
Log.d(TAG, "Filtering out year " + s);
item.remove();
}
}
Log.d(TAG, "Merged item list: " + mergedItemsList);
return mergedItemsList;

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

@ -10,6 +10,7 @@ import org.mediawiki.api.MWApi;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
import javax.net.ssl.SSLPeerUnverifiedException;
@ -41,6 +42,21 @@ public class PrefixUpdater extends AsyncTask<Void, Void, ArrayList<String>> {
catFragment.categoriesSkip.setVisibility(View.GONE);
}
protected ArrayList<String> filterYears(ArrayList<String> items) {
//Copy to Iterator to prevent ConcurrentModificationException when removing item
for(Iterator<String> item = items.iterator(); item.hasNext();) {
String s = item.next();
//Check if s contains a 4-digit word anywhere within the string (.* is wildcard)
if(s.matches(".*(19|20)\\d{2}.*")) {
Log.d(TAG, "Filtering out year " + s);
item.remove();
}
}
return items;
}
@Override
protected ArrayList<String> doInBackground(Void... voids) {
//If user hasn't typed anything in yet, get GPS and recent items