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

Minor changes

Browse source
This commit is contained in:
misaochan 2015-12-25 20:09:01 +13:00
parent 8c979cf751
commit 8d4787e493
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -154,23 +154,24 @@ public class CategorizationFragment extends SherlockFragment{
items.add(cat.getName()); items.add(cat.getName());
} }
mergedItems.addAll(items);
if (MwVolleyApi.gpsCatExists){ if (MwVolleyApi.gpsCatExists){
Log.d("Cat", "GPS cats found in CategorizationFragment.java" + MwVolleyApi.getGpsCat().toString()); Log.d("Cat", "GPS cats found in CategorizationFragment.java" + MwVolleyApi.getGpsCat().toString());
ArrayList<String> gpsItems = new ArrayList<String>(MwVolleyApi.getGpsCat()); ArrayList<String> gpsItems = new ArrayList<String>(MwVolleyApi.getGpsCat());
Log.d("Cat", "GPS items: " + gpsItems.toString()); Log.d("Cat", "GPS items: " + gpsItems.toString());
mergedItems.addAll(items);
mergedItems.addAll(gpsItems); mergedItems.addAll(gpsItems);
Log.d("Cat", "Merged items: " + mergedItems.toString());
} }
} }
catch (RemoteException e) { catch (RemoteException e) {
// faaaail // faaaail
throw new RuntimeException(e); throw new RuntimeException(e);
} }
Log.d("Cat", "Merged items: " + mergedItems.toString());
return mergedItems; return mergedItems;
} }
if(categoriesCache.containsKey(filter)) { if(categoriesCache.containsKey(filter)) {
return categoriesCache.get(filter); return categoriesCache.get(filter);
} }