Merge pull request #312 from misaochan/fix-categories

Fix issue with categories not being added

Author: misaochan

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

@@ -76,6 +76,8 @@ public static interface OnCategoriesSaveHandler {
 
     protected HashMap<String, ArrayList<String>> categoriesCache;
 
+    private ArrayList<String> selectedCategories = new ArrayList<String>();
+
     // LHS guarantees ordered insertions, allowing for prioritized method A results
     private final Set<String> results = new LinkedHashSet<String>();
     PrefixUpdater prefixUpdaterSub;
@@ -584,7 +586,7 @@ public void onSaveInstanceState(Bundle outState) {
     public boolean onOptionsItemSelected(MenuItem menuItem) {
         switch(menuItem.getItemId()) {
             case R.id.menu_save_categories:
-                ArrayList<String> selectedCategories = new ArrayList<String>();
+
                 int numberSelected = 0;
 
                 for(CategoryItem item: categoriesAdapter.getItems()) {
@@ -594,9 +596,6 @@ public boolean onOptionsItemSelected(MenuItem menuItem) {
                     }
                 }
 
-                //Need to reassign to a final variable to use in inner class
-                final ArrayList<String> finalCategories = selectedCategories;
-
                 //If no categories selected, display warning to user
                 if (numberSelected == 0) {
                     AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
@@ -612,7 +611,7 @@ public void onClick(DialogInterface dialog, int id) {
                     builder.setNegativeButton("Yes, submit", new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialog, int id) {
                             //Proceed to submission
-                            onCategoriesSaveHandler.onCategoriesSave(finalCategories);
+                            onCategoriesSaveHandler.onCategoriesSave(selectedCategories);
                             return;
                         }
                     });
@@ -621,7 +620,7 @@ public void onClick(DialogInterface dialog, int id) {
                     dialog.show();
                 } else {
                     //Proceed to submission
-                    onCategoriesSaveHandler.onCategoriesSave(finalCategories);
+                    onCategoriesSaveHandler.onCategoriesSave(selectedCategories);
                     return true;
                 }
         }