From 8c6046fedaa277bc1d4462a74f6e70a23d761ae3 Mon Sep 17 00:00:00 2001
From: misaochan <josephinelim86@gmail.com>
Date: Fri, 28 Oct 2016 16:56:14 +1300
Subject: [PATCH 1/2] Remove unnecessary var re-assignment

---
 .../nrw/commons/category/CategorizationFragment.java     | 9 +++------
 1 file changed, 3 insertions(+), 6 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 ca8300172..7a3de48a6 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
@@ -584,7 +584,7 @@ public class CategorizationFragment extends Fragment {
     public boolean onOptionsItemSelected(MenuItem menuItem) {
         switch(menuItem.getItemId()) {
             case R.id.menu_save_categories:
-                ArrayList<String> selectedCategories = new ArrayList<String>();
+                final ArrayList<String> selectedCategories = new ArrayList<String>();
                 int numberSelected = 0;
 
                 for(CategoryItem item: categoriesAdapter.getItems()) {
@@ -594,9 +594,6 @@ public class CategorizationFragment extends Fragment {
                     }
                 }
 
-                //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 +609,7 @@ public class CategorizationFragment extends Fragment {
                     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 +618,7 @@ public class CategorizationFragment extends Fragment {
                     dialog.show();
                 } else {
                     //Proceed to submission
-                    onCategoriesSaveHandler.onCategoriesSave(finalCategories);
+                    onCategoriesSaveHandler.onCategoriesSave(selectedCategories);
                     return true;
                 }
         }

From 85d6e9885b65ffc2b674e357b1a6362668e2646d Mon Sep 17 00:00:00 2001
From: misaochan <josephinelim86@gmail.com>
Date: Fri, 28 Oct 2016 17:16:26 +1300
Subject: [PATCH 2/2] Remove final variable

---
 .../fr/free/nrw/commons/category/CategorizationFragment.java  | 4 +++-
 1 file changed, 3 insertions(+), 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 7a3de48a6..bc1c6803c 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
@@ -76,6 +76,8 @@ public class CategorizationFragment extends Fragment {
 
     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 class CategorizationFragment extends Fragment {
     public boolean onOptionsItemSelected(MenuItem menuItem) {
         switch(menuItem.getItemId()) {
             case R.id.menu_save_categories:
-                final ArrayList<String> selectedCategories = new ArrayList<String>();
+
                 int numberSelected = 0;
 
                 for(CategoryItem item: categoriesAdapter.getItems()) {