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

Refactor recentCatQuery into two separate functions

Browse source
This commit is contained in:
misaochan 2016-10-08 17:53:26 +13:00
parent 2abe8a279f
commit 9d50b4706c
1 changed files with 20 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -115,12 +115,11 @@ public class CategorizationFragment extends Fragment {
//TODO: Probably add 'suggest from filename' cats here. We want it to be displayed at start, not upon typing //TODO: Probably add 'suggest from filename' cats here. We want it to be displayed at start, not upon typing
//TODO: Search using MethodA query, but can't use MethodAUpdater because we don't want it updating when user types //TODO: Search using MethodA query, but can't use MethodAUpdater because we don't want it updating when user types
/** /**
* Retrieves recently-used categories and nearby categories, and merges them without duplicates. * Retrieves recently-used categories
* @return a list containing these categories * @return a list containing recent categories
*/ */
protected ArrayList<String> recentCatQuery() { protected ArrayList<String> recentCatQuery() {
ArrayList<String> items = new ArrayList<String>(); ArrayList<String> items = new ArrayList<String>();
Set<String> mergedItems = new LinkedHashSet<String>();
try { try {
Cursor cursor = client.query( Cursor cursor = client.query(
@ -135,21 +134,29 @@ public class CategorizationFragment extends Fragment {
items.add(cat.getName()); items.add(cat.getName());
} }
cursor.close(); cursor.close();
if (MwVolleyApi.GpsCatExists.getGpsCatExists() == true) {
//Log.d(TAG, "GPS cats found in CategorizationFragment.java" + MwVolleyApi.getGpsCat().toString());
List<String> gpsItems = new ArrayList<String>(MwVolleyApi.getGpsCat());
//Log.d(TAG, "GPS items: " + gpsItems.toString());
mergedItems.addAll(gpsItems);
}
mergedItems.addAll(items);
} }
catch (RemoteException e) { catch (RemoteException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
return items;
}
/**
* Merges recently-used categories and nearby categories without duplicates.
* @return a list containing merged categories
*/
protected ArrayList<String> mergeItems() {
Set<String> mergedItems = new LinkedHashSet<String>();
if (MwVolleyApi.GpsCatExists.getGpsCatExists()) {
List<String> gpsItems = new ArrayList<String>(MwVolleyApi.getGpsCat());
mergedItems.addAll(gpsItems);
}
List<String> recentItems = new ArrayList<String>(recentCatQuery());
mergedItems.addAll(recentItems);
//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);
return mergedItemsList; return mergedItemsList;