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 current and prev year to PrefixUpdater

Browse source
This commit is contained in:
misaochan 2016-10-27 16:55:16 +13:00
parent 9a475ef3c9
commit a380082008
1 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
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.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
@ -49,12 +50,21 @@ public class PrefixUpdater extends AsyncTask<Void, Void, ArrayList<String>> {
Iterator<String> iterator; Iterator<String> iterator;
Calendar now = Calendar.getInstance();
int year = now.get(Calendar.YEAR);
String yearInString = String.valueOf(year);
int prevYear = year - 1;
String prevYearInString = String.valueOf(prevYear);
//Copy to Iterator to prevent ConcurrentModificationException when removing item //Copy to Iterator to prevent ConcurrentModificationException when removing item
for(iterator = items.iterator(); iterator.hasNext();) { for(iterator = items.iterator(); iterator.hasNext();) {
String s = iterator.next(); String s = iterator.next();
//Check if s contains a 4-digit word anywhere within the string (.* is wildcard) //Check if s contains a 4-digit word anywhere within the string (.* is wildcard)
if(s.matches(".*(19|20)\\d{2}.*")) { //And that s does not equal the current year or previous year
if(s.matches(".*(19|20)\\d{2}.*") && !s.equals(yearInString) && !s.equals(prevYearInString)) {
Log.d(TAG, "Filtering out year " + s); Log.d(TAG, "Filtering out year " + s);
iterator.remove(); iterator.remove();
} }