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 22d5dc232..376e1b1f4 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 @@ -19,6 +19,7 @@ import org.mediawiki.api.ApiResult; import org.mediawiki.api.MWApi; import fr.free.nrw.commons.CommonsApplication; import fr.free.nrw.commons.R; +import fr.free.nrw.commons.upload.MwVolleyApi; import java.io.IOException; import java.util.ArrayList; @@ -117,6 +118,7 @@ public class CategorizationFragment extends SherlockFragment{ //TODO: Remove this later Log.d("Cat", "I am still called when upload is commented out"); + categoriesAdapter.setItems(items); categoriesAdapter.notifyDataSetInvalidated(); categoriesSearchInProgress.setVisibility(View.GONE); @@ -137,6 +139,8 @@ public class CategorizationFragment extends SherlockFragment{ protected ArrayList doInBackground(Void... voids) { if(TextUtils.isEmpty(filter)) { ArrayList items = new ArrayList(); + ArrayList mergedItems= new ArrayList(); + try { Cursor cursor = client.query( CategoryContentProvider.BASE_URI, @@ -149,11 +153,21 @@ public class CategorizationFragment extends SherlockFragment{ Category cat = Category.fromCursor(cursor); items.add(cat.getName()); } - } catch (RemoteException e) { + + if (MwVolleyApi.gpsCatExists){ + Log.d("Cat", "GPS cats found in CategorizationFragment.java" + MwVolleyApi.getGpsCat().toString()); + ArrayList gpsItems = new ArrayList(); + + mergedItems.addAll(items); + mergedItems.addAll(gpsItems); + } + + } + catch (RemoteException e) { // faaaail throw new RuntimeException(e); } - return items; + return mergedItems; } if(categoriesCache.containsKey(filter)) { return categoriesCache.get(filter); diff --git a/commons/src/main/java/fr/free/nrw/commons/upload/MwVolleyApi.java b/commons/src/main/java/fr/free/nrw/commons/upload/MwVolleyApi.java index dba1f4e50..f91d55f93 100644 --- a/commons/src/main/java/fr/free/nrw/commons/upload/MwVolleyApi.java +++ b/commons/src/main/java/fr/free/nrw/commons/upload/MwVolleyApi.java @@ -40,7 +40,7 @@ public class MwVolleyApi { } //To get the list of categories for display - public ArrayList getGpsCat() { + public static ArrayList getGpsCat() { ArrayList list = new ArrayList(categorySet); return list; } diff --git a/commons/src/main/java/fr/free/nrw/commons/upload/UploadController.java b/commons/src/main/java/fr/free/nrw/commons/upload/UploadController.java index 58665dae2..0826aef5f 100644 --- a/commons/src/main/java/fr/free/nrw/commons/upload/UploadController.java +++ b/commons/src/main/java/fr/free/nrw/commons/upload/UploadController.java @@ -140,7 +140,7 @@ public class UploadController { @Override protected void onPostExecute(Contribution contribution) { super.onPostExecute(contribution); - //uploadService.queue(UploadService.ACTION_UPLOAD_FILE, contribution); + uploadService.queue(UploadService.ACTION_UPLOAD_FILE, contribution); onComplete.onUploadStarted(contribution); } });