From bd8bd44d6fa3a2f4515c9c627513ff134acdbe6e Mon Sep 17 00:00:00 2001 From: misaochan Date: Sat, 5 Nov 2016 15:21:05 +1300 Subject: [PATCH 01/13] Rearrange CategorizationFragment --- .../category/CategorizationFragment.java | 144 +++++++++--------- 1 file changed, 72 insertions(+), 72 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java index 342f225c2..1f76ad176 100644 --- a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java @@ -312,6 +312,78 @@ public class CategorizationFragment extends Fragment { } } + /** + * Makes asynchronous calls to the Commons MediaWiki API via anonymous subclasses of + * 'MethodAUpdater' and 'PrefixUpdater'. Some of their methods are overridden in order to + * aggregate the results. A CountDownLatch is used to ensure that MethodA results are shown + * above Prefix results. + */ + private void requestSearchResults() { + + final CountDownLatch latch = new CountDownLatch(1); + + prefixUpdaterSub = new PrefixUpdater(this) { + @Override + protected ArrayList doInBackground(Void... voids) { + ArrayList result = new ArrayList(); + try { + result = super.doInBackground(); + latch.await(); + } + catch (InterruptedException e) { + Log.w(TAG, e); + //Thread.currentThread().interrupt(); + } + return result; + } + + @Override + protected void onPostExecute(ArrayList result) { + super.onPostExecute(result); + + results.addAll(result); + Log.d(TAG, "Prefix result: " + result); + + String filter = categoriesFilter.getText().toString(); + ArrayList resultsList = new ArrayList(results); + categoriesCache.put(filter, resultsList); + Log.d(TAG, "Final results List: " + resultsList); + + categoriesAdapter.notifyDataSetChanged(); + setCatsAfterAsync(resultsList, filter); + } + }; + + methodAUpdaterSub = new MethodAUpdater(this) { + @Override + protected void onPostExecute(ArrayList result) { + results.clear(); + super.onPostExecute(result); + + results.addAll(result); + Log.d(TAG, "Method A result: " + result); + categoriesAdapter.notifyDataSetChanged(); + + latch.countDown(); + } + }; + Utils.executeAsyncTask(prefixUpdaterSub); + Utils.executeAsyncTask(methodAUpdaterSub); + } + + private void startUpdatingCategoryList() { + + if (prefixUpdaterSub != null) { + prefixUpdaterSub.cancel(true); + } + + if (methodAUpdaterSub != null) { + methodAUpdaterSub.cancel(true); + } + + requestSearchResults(); + } + public int getCurrentSelectedCount() { int count = 0; for(CategoryItem item: categoriesAdapter.getItems()) { @@ -434,78 +506,6 @@ public class CategorizationFragment extends Fragment { return rootView; } - /** - * Makes asynchronous calls to the Commons MediaWiki API via anonymous subclasses of - * 'MethodAUpdater' and 'PrefixUpdater'. Some of their methods are overridden in order to - * aggregate the results. A CountDownLatch is used to ensure that MethodA results are shown - * above Prefix results. - */ - private void requestSearchResults() { - - final CountDownLatch latch = new CountDownLatch(1); - - prefixUpdaterSub = new PrefixUpdater(this) { - @Override - protected ArrayList doInBackground(Void... voids) { - ArrayList result = new ArrayList(); - try { - result = super.doInBackground(); - latch.await(); - } - catch (InterruptedException e) { - Log.w(TAG, e); - //Thread.currentThread().interrupt(); - } - return result; - } - - @Override - protected void onPostExecute(ArrayList result) { - super.onPostExecute(result); - - results.addAll(result); - Log.d(TAG, "Prefix result: " + result); - - String filter = categoriesFilter.getText().toString(); - ArrayList resultsList = new ArrayList(results); - categoriesCache.put(filter, resultsList); - Log.d(TAG, "Final results List: " + resultsList); - - categoriesAdapter.notifyDataSetChanged(); - setCatsAfterAsync(resultsList, filter); - } - }; - - methodAUpdaterSub = new MethodAUpdater(this) { - @Override - protected void onPostExecute(ArrayList result) { - results.clear(); - super.onPostExecute(result); - - results.addAll(result); - Log.d(TAG, "Method A result: " + result); - categoriesAdapter.notifyDataSetChanged(); - - latch.countDown(); - } - }; - Utils.executeAsyncTask(prefixUpdaterSub); - Utils.executeAsyncTask(methodAUpdaterSub); - } - - private void startUpdatingCategoryList() { - - if (prefixUpdaterSub != null) { - prefixUpdaterSub.cancel(true); - } - - if (methodAUpdaterSub != null) { - methodAUpdaterSub.cancel(true); - } - - requestSearchResults(); - } - @Override public void onCreateOptionsMenu(Menu menu, android.view.MenuInflater inflater) { menu.clear(); From 14fa56c2017cf2c37a998c28e29e8105edbc4a7b Mon Sep 17 00:00:00 2001 From: misaochan Date: Sat, 5 Nov 2016 16:31:27 +1300 Subject: [PATCH 02/13] Add getViewTypeCount() and getItemViewType() --- .../nrw/commons/category/CategorizationFragment.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java index 1f76ad176..be7ae2f8c 100644 --- a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java @@ -293,6 +293,16 @@ public class CategorizationFragment extends Fragment { return i; } + @Override + public int getItemViewType(int position) { + return sectionHeader.contains(position) ? TYPE_SEPARATOR : TYPE_ITEM; + } + + @Override + public int getViewTypeCount() { + return 2; + } + public View getView(int i, View view, ViewGroup viewGroup) { CheckedTextView checkedView; From e0bda6e64dc2ae6ea4c891c26c715ff3b4cbe865 Mon Sep 17 00:00:00 2001 From: misaochan Date: Sat, 5 Nov 2016 16:33:22 +1300 Subject: [PATCH 03/13] Add vars to CategoriesAdapter --- .../fr/free/nrw/commons/category/CategorizationFragment.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java index be7ae2f8c..905117bdd 100644 --- a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java @@ -39,6 +39,7 @@ import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; import java.util.Set; +import java.util.TreeSet; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.TimeUnit; @@ -268,6 +269,10 @@ public class CategorizationFragment extends Fragment { private Context context; private ArrayList items; + private static final int TYPE_ITEM = 0; + private static final int TYPE_SEPARATOR = 1; + private TreeSet sectionHeader = new TreeSet(); + private CategoriesAdapter(Context context, ArrayList items) { this.context = context; this.items = items; From 6a6413bd3e8ce5b92a29b71895e5d71376044e56 Mon Sep 17 00:00:00 2001 From: misaochan Date: Sat, 5 Nov 2016 16:38:09 +1300 Subject: [PATCH 04/13] Add comment --- .../fr/free/nrw/commons/category/CategorizationFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java index 905117bdd..c7f11c935 100644 --- a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java @@ -265,7 +265,6 @@ public class CategorizationFragment extends Fragment { } private class CategoriesAdapter extends BaseAdapter { - private Context context; private ArrayList items; @@ -300,6 +299,7 @@ public class CategorizationFragment extends Fragment { @Override public int getItemViewType(int position) { + // If type is 1, the line is a header, otherwise it is an item return sectionHeader.contains(position) ? TYPE_SEPARATOR : TYPE_ITEM; } From 8008c279c96488b3509d9f9a7e403118661461ca Mon Sep 17 00:00:00 2001 From: misaochan Date: Sat, 5 Nov 2016 16:44:19 +1300 Subject: [PATCH 05/13] Copy getView() method and move CategoriesAdapter to new class --- .../commons/category/CategoriesAdapter.java | 107 ++++++++++++++++++ .../category/CategorizationFragment.java | 62 ---------- 2 files changed, 107 insertions(+), 62 deletions(-) create mode 100644 app/src/main/java/fr/free/nrw/commons/category/CategoriesAdapter.java diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategoriesAdapter.java b/app/src/main/java/fr/free/nrw/commons/category/CategoriesAdapter.java new file mode 100644 index 000000000..c46f3dcc2 --- /dev/null +++ b/app/src/main/java/fr/free/nrw/commons/category/CategoriesAdapter.java @@ -0,0 +1,107 @@ +package fr.free.nrw.commons.category; + + +import android.content.Context; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.CheckedTextView; +import android.widget.TextView; + +import java.util.ArrayList; +import java.util.TreeSet; + +import fr.free.nrw.commons.R; + +public class CategoriesAdapter extends BaseAdapter { + private Context context; + private ArrayList items; + + private static final int TYPE_ITEM = 0; + private static final int TYPE_SEPARATOR = 1; + private TreeSet sectionHeader = new TreeSet(); + + private CategoriesAdapter(Context context, ArrayList items) { + this.context = context; + this.items = items; + } + + public int getCount() { + return items.size(); + } + + public Object getItem(int i) { + return items.get(i); + } + + public ArrayList getItems() { + return items; + } + + public void setItems(ArrayList items) { + this.items = items; + } + + public long getItemId(int i) { + return i; + } + + @Override + public int getItemViewType(int position) { + // If type is 1, the line is a header, otherwise it is an item + return sectionHeader.contains(position) ? TYPE_SEPARATOR : TYPE_ITEM; + } + + @Override + public int getViewTypeCount() { + return 2; + } + + public View getView(int i, View view, ViewGroup viewGroup) { + CheckedTextView checkedView; + + if(view == null) { + checkedView = (CheckedTextView) getActivity().getLayoutInflater().inflate(R.layout.layout_categories_item, null); + + } else { + checkedView = (CheckedTextView) view; + } + + CategorizationFragment.CategoryItem item = (CategorizationFragment.CategoryItem) this.getItem(i); + checkedView.setChecked(item.selected); + checkedView.setText(item.name); + checkedView.setTag(i); + + return checkedView; + } + + // TODO: Separator getView reference + public View getView(int position, View convertView, ViewGroup parent) { + ViewHolder holder = null; + int rowType = getItemViewType(position); + + if (convertView == null) { + holder = new ViewHolder(); + switch (rowType) { + case TYPE_ITEM: + convertView = mInflater.inflate(R.layout.snippet_item1, null); + holder.textView = (TextView) convertView.findViewById(R.id.text); + break; + case TYPE_SEPARATOR: + convertView = mInflater.inflate(R.layout.snippet_item2, null); + holder.textView = (TextView) convertView.findViewById(R.id.textSeparator); + break; + } + convertView.setTag(holder); + } else { + holder = (ViewHolder) convertView.getTag(); + } + holder.textView.setText(mData.get(position)); + + return convertView; + } + + public static class ViewHolder { + public TextView textView; + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java index c7f11c935..869311684 100644 --- a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java @@ -264,68 +264,6 @@ public class CategorizationFragment extends Fragment { } } - private class CategoriesAdapter extends BaseAdapter { - private Context context; - private ArrayList items; - - private static final int TYPE_ITEM = 0; - private static final int TYPE_SEPARATOR = 1; - private TreeSet sectionHeader = new TreeSet(); - - private CategoriesAdapter(Context context, ArrayList items) { - this.context = context; - this.items = items; - } - - public int getCount() { - return items.size(); - } - - public Object getItem(int i) { - return items.get(i); - } - - public ArrayList getItems() { - return items; - } - - public void setItems(ArrayList items) { - this.items = items; - } - - public long getItemId(int i) { - return i; - } - - @Override - public int getItemViewType(int position) { - // If type is 1, the line is a header, otherwise it is an item - return sectionHeader.contains(position) ? TYPE_SEPARATOR : TYPE_ITEM; - } - - @Override - public int getViewTypeCount() { - return 2; - } - - public View getView(int i, View view, ViewGroup viewGroup) { - CheckedTextView checkedView; - - if(view == null) { - checkedView = (CheckedTextView) getActivity().getLayoutInflater().inflate(R.layout.layout_categories_item, null); - - } else { - checkedView = (CheckedTextView) view; - } - - CategoryItem item = (CategoryItem) this.getItem(i); - checkedView.setChecked(item.selected); - checkedView.setText(item.name); - checkedView.setTag(i); - - return checkedView; - } - } /** * Makes asynchronous calls to the Commons MediaWiki API via anonymous subclasses of From 39909817108d0e77b336712034dfa8e32e080e4b Mon Sep 17 00:00:00 2001 From: misaochan Date: Sat, 5 Nov 2016 16:46:37 +1300 Subject: [PATCH 06/13] Make constructor public --- .../java/fr/free/nrw/commons/category/CategoriesAdapter.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategoriesAdapter.java b/app/src/main/java/fr/free/nrw/commons/category/CategoriesAdapter.java index c46f3dcc2..55627a0c8 100644 --- a/app/src/main/java/fr/free/nrw/commons/category/CategoriesAdapter.java +++ b/app/src/main/java/fr/free/nrw/commons/category/CategoriesAdapter.java @@ -2,6 +2,7 @@ package fr.free.nrw.commons.category; import android.content.Context; +import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.BaseAdapter; @@ -17,11 +18,13 @@ public class CategoriesAdapter extends BaseAdapter { private Context context; private ArrayList items; + private LayoutInflater mInflater; + private static final int TYPE_ITEM = 0; private static final int TYPE_SEPARATOR = 1; private TreeSet sectionHeader = new TreeSet(); - private CategoriesAdapter(Context context, ArrayList items) { + public CategoriesAdapter(Context context, ArrayList items) { this.context = context; this.items = items; } From a34d1217c33889e86e06442b21b4be3f57a5e38d Mon Sep 17 00:00:00 2001 From: misaochan Date: Sat, 5 Nov 2016 16:51:25 +1300 Subject: [PATCH 07/13] Add mInflator, rearrange class vars in CategoriesAdapter --- .../nrw/commons/category/CategoriesAdapter.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategoriesAdapter.java b/app/src/main/java/fr/free/nrw/commons/category/CategoriesAdapter.java index 55627a0c8..f4e685903 100644 --- a/app/src/main/java/fr/free/nrw/commons/category/CategoriesAdapter.java +++ b/app/src/main/java/fr/free/nrw/commons/category/CategoriesAdapter.java @@ -15,18 +15,21 @@ import java.util.TreeSet; import fr.free.nrw.commons.R; public class CategoriesAdapter extends BaseAdapter { - private Context context; - private ArrayList items; - - private LayoutInflater mInflater; - private static final int TYPE_ITEM = 0; private static final int TYPE_SEPARATOR = 1; + + private Context context; + private LayoutInflater mInflater; + + //FIXME: Might have issue here, headers need to be a String type so you can't just add them to an ArrayList of CategoryItem + private ArrayList items; + private TreeSet sectionHeader = new TreeSet(); public CategoriesAdapter(Context context, ArrayList items) { this.context = context; this.items = items; + mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); } public int getCount() { From 264f5de4c2e0a62632f85a4d550b258ee8ec75f4 Mon Sep 17 00:00:00 2001 From: misaochan Date: Sat, 5 Nov 2016 16:55:19 +1300 Subject: [PATCH 08/13] Successful refactor of CategoriesAdapter into separate file --- .../java/fr/free/nrw/commons/category/CategoriesAdapter.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategoriesAdapter.java b/app/src/main/java/fr/free/nrw/commons/category/CategoriesAdapter.java index f4e685903..1fd402830 100644 --- a/app/src/main/java/fr/free/nrw/commons/category/CategoriesAdapter.java +++ b/app/src/main/java/fr/free/nrw/commons/category/CategoriesAdapter.java @@ -67,7 +67,7 @@ public class CategoriesAdapter extends BaseAdapter { CheckedTextView checkedView; if(view == null) { - checkedView = (CheckedTextView) getActivity().getLayoutInflater().inflate(R.layout.layout_categories_item, null); + checkedView = (CheckedTextView) mInflater.inflate(R.layout.layout_categories_item, null); } else { checkedView = (CheckedTextView) view; @@ -81,6 +81,7 @@ public class CategoriesAdapter extends BaseAdapter { return checkedView; } + /* // TODO: Separator getView reference public View getView(int position, View convertView, ViewGroup parent) { ViewHolder holder = null; @@ -110,4 +111,5 @@ public class CategoriesAdapter extends BaseAdapter { public static class ViewHolder { public TextView textView; } + */ } \ No newline at end of file From 4489b1169cefeb728dcd83f196b2a912613c7b79 Mon Sep 17 00:00:00 2001 From: misaochan Date: Wed, 9 Nov 2016 19:31:12 +1300 Subject: [PATCH 09/13] DEBUG MODE ON --- .../main/java/fr/free/nrw/commons/upload/UploadController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java index 070c68271..512e90a2b 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java @@ -154,7 +154,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); } }); From 0f467d88a42a39f6acc8abf2dc550c66910589d7 Mon Sep 17 00:00:00 2001 From: misaochan Date: Mon, 14 Nov 2016 19:23:38 +1300 Subject: [PATCH 10/13] Remove comment and separator --- .../commons/category/CategoriesAdapter.java | 46 ------------------- 1 file changed, 46 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategoriesAdapter.java b/app/src/main/java/fr/free/nrw/commons/category/CategoriesAdapter.java index 1fd402830..ad6658527 100644 --- a/app/src/main/java/fr/free/nrw/commons/category/CategoriesAdapter.java +++ b/app/src/main/java/fr/free/nrw/commons/category/CategoriesAdapter.java @@ -21,11 +21,8 @@ public class CategoriesAdapter extends BaseAdapter { private Context context; private LayoutInflater mInflater; - //FIXME: Might have issue here, headers need to be a String type so you can't just add them to an ArrayList of CategoryItem private ArrayList items; - private TreeSet sectionHeader = new TreeSet(); - public CategoriesAdapter(Context context, ArrayList items) { this.context = context; this.items = items; @@ -52,17 +49,6 @@ public class CategoriesAdapter extends BaseAdapter { return i; } - @Override - public int getItemViewType(int position) { - // If type is 1, the line is a header, otherwise it is an item - return sectionHeader.contains(position) ? TYPE_SEPARATOR : TYPE_ITEM; - } - - @Override - public int getViewTypeCount() { - return 2; - } - public View getView(int i, View view, ViewGroup viewGroup) { CheckedTextView checkedView; @@ -80,36 +66,4 @@ public class CategoriesAdapter extends BaseAdapter { return checkedView; } - - /* - // TODO: Separator getView reference - public View getView(int position, View convertView, ViewGroup parent) { - ViewHolder holder = null; - int rowType = getItemViewType(position); - - if (convertView == null) { - holder = new ViewHolder(); - switch (rowType) { - case TYPE_ITEM: - convertView = mInflater.inflate(R.layout.snippet_item1, null); - holder.textView = (TextView) convertView.findViewById(R.id.text); - break; - case TYPE_SEPARATOR: - convertView = mInflater.inflate(R.layout.snippet_item2, null); - holder.textView = (TextView) convertView.findViewById(R.id.textSeparator); - break; - } - convertView.setTag(holder); - } else { - holder = (ViewHolder) convertView.getTag(); - } - holder.textView.setText(mData.get(position)); - - return convertView; - } - - public static class ViewHolder { - public TextView textView; - } - */ } \ No newline at end of file From 9871da97ea0ea6f30d3ed6eca51ecf4aab44d25d Mon Sep 17 00:00:00 2001 From: misaochan Date: Mon, 14 Nov 2016 19:25:00 +1300 Subject: [PATCH 11/13] Remove unused vars --- .../java/fr/free/nrw/commons/category/CategoriesAdapter.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategoriesAdapter.java b/app/src/main/java/fr/free/nrw/commons/category/CategoriesAdapter.java index ad6658527..66818942d 100644 --- a/app/src/main/java/fr/free/nrw/commons/category/CategoriesAdapter.java +++ b/app/src/main/java/fr/free/nrw/commons/category/CategoriesAdapter.java @@ -15,8 +15,6 @@ import java.util.TreeSet; import fr.free.nrw.commons.R; public class CategoriesAdapter extends BaseAdapter { - private static final int TYPE_ITEM = 0; - private static final int TYPE_SEPARATOR = 1; private Context context; private LayoutInflater mInflater; From 33710dd48c6b1e97cf62113d03d300b58cdcb7af Mon Sep 17 00:00:00 2001 From: misaochan Date: Mon, 14 Nov 2016 19:38:02 +1300 Subject: [PATCH 12/13] Remove unnecessary calls in MethodAUpdater --- .../free/nrw/commons/category/MethodAUpdater.java | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/category/MethodAUpdater.java b/app/src/main/java/fr/free/nrw/commons/category/MethodAUpdater.java index 32f8660bf..bc9a8092d 100644 --- a/app/src/main/java/fr/free/nrw/commons/category/MethodAUpdater.java +++ b/app/src/main/java/fr/free/nrw/commons/category/MethodAUpdater.java @@ -79,21 +79,6 @@ public class MethodAUpdater extends AsyncTask> { @Override protected ArrayList doInBackground(Void... voids) { - //If user hasn't typed anything in yet, get GPS and recent items - if(TextUtils.isEmpty(filter)) { - ArrayList mergedItems = new ArrayList(catFragment.mergeItems()); - Log.d(TAG, "Merged items, waiting for filter"); - ArrayList filteredItems = new ArrayList(filterYears(mergedItems)); - return filteredItems; - } - - //if user types in something that is in cache, return cached category - if(catFragment.categoriesCache.containsKey(filter)) { - ArrayList cachedItems = new ArrayList(catFragment.categoriesCache.get(filter)); - Log.d(TAG, "Found cache items, waiting for filter"); - ArrayList filteredItems = new ArrayList(filterYears(cachedItems)); - return filteredItems; - } //otherwise if user has typed something in that isn't in cache, search API for matching categories MWApi api = CommonsApplication.createMWApi(); From 8b4de66b7aec4ca36c1280e3e153f92806f3ce3b Mon Sep 17 00:00:00 2001 From: misaochan Date: Mon, 14 Nov 2016 19:39:01 +1300 Subject: [PATCH 13/13] DEBUG MODE OFF --- .../main/java/fr/free/nrw/commons/upload/UploadController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java index 512e90a2b..070c68271 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java @@ -154,7 +154,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); } });