From 8d8002fcf703766f7c9c45ddab64a9e817c2faab Mon Sep 17 00:00:00 2001 From: misaochan Date: Sat, 30 Jan 2016 16:59:55 +1300 Subject: [PATCH 1/2] Fix repeat categories bug --- .../free/nrw/commons/category/CategorizationFragment.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/commons/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java b/commons/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java index a11dc369a..fa856f7a9 100644 --- a/commons/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java +++ b/commons/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java @@ -98,7 +98,7 @@ public class CategorizationFragment extends SherlockFragment{ protected ArrayList recentCatQuery() { ArrayList items = new ArrayList(); - ArrayList mergedItems= new ArrayList(); + LinkedHashSet mergedItems = new LinkedHashSet(); try { Cursor cursor = client.query( @@ -127,8 +127,10 @@ public class CategorizationFragment extends SherlockFragment{ catch (RemoteException e) { throw new RuntimeException(e); } - //Log.d(TAG, "Merged items: " + mergedItems.toString()); - return mergedItems; + + //Needs to be an ArrayList and not a List unless we want to modify a big portion of preexisting code + ArrayList mergedItemsList = new ArrayList(mergedItems); + return mergedItemsList; } From 66aca81b593d06182377aa322c84c0b2cb84f9a7 Mon Sep 17 00:00:00 2001 From: misaochan Date: Sat, 30 Jan 2016 18:24:15 +1300 Subject: [PATCH 2/2] Changed LHS to Set --- .../fr/free/nrw/commons/category/CategorizationFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commons/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java b/commons/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java index fa856f7a9..3b412b46b 100644 --- a/commons/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java +++ b/commons/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java @@ -98,7 +98,7 @@ public class CategorizationFragment extends SherlockFragment{ protected ArrayList recentCatQuery() { ArrayList items = new ArrayList(); - LinkedHashSet mergedItems = new LinkedHashSet(); + Set mergedItems = new LinkedHashSet(); try { Cursor cursor = client.query(