Merge pull request #4676 from wordpress-mobile/issue/64-remove-vectors

Replace Vectors with ArrayLists

Author: mzorz

WordPress/src/main/java/org/wordpress/android/WordPressDB.java

@@ -565,7 +565,7 @@ public List<Map<String, Object>> getBlogsBy(String byString, String[] extraField
     public List<Map<String, Object>> getBlogsBy(String byString, String[] extraFields,
                                                 int limit, boolean hideJetpackWithoutCredentials) {
         if (db == null) {
-            return new Vector<>();
+            return new ArrayList<>();
         }
 
         if (hideJetpackWithoutCredentials) {
@@ -591,7 +591,7 @@ public List<Map<String, Object>> getBlogsBy(String byString, String[] extraField
         Cursor c = db.query(BLOGS_TABLE, allFields, byString, null, null, null, null, limitStr);
         int numRows = c.getCount();
         c.moveToFirst();
-        List<Map<String, Object>> blogs = new Vector<>();
+        List<Map<String, Object>> blogs = new ArrayList<>();
         for (int i = 0; i < numRows; i++) {
             int id = c.getInt(0);
             String blogName = c.getString(1);
@@ -947,16 +947,16 @@ public List<String> loadStatsLogin(int id) {
 
         c.moveToFirst();
 
-        List<String> returnVector = new Vector<String>();
+        List<String> list = new ArrayList<>();
         if (c.getString(0) != null) {
-            returnVector.add(c.getString(0));
-            returnVector.add(decryptPassword(c.getString(1)));
+            list.add(c.getString(0));
+            list.add(decryptPassword(c.getString(1)));
         } else {
-            returnVector = null;
+            list = null;
         }
         c.close();
 
-        return returnVector;
+        return list;
     }
 
     /*
@@ -1397,17 +1397,17 @@ public List<String> loadCategories(int id) {
                 "category_name" }, "blog_id=" + Integer.toString(id), null, null, null, null);
         int numRows = c.getCount();
         c.moveToFirst();
-        List<String> returnVector = new Vector<String>();
+        List<String> list = new ArrayList<>();
         for (int i = 0; i < numRows; ++i) {
             String category_name = c.getString(2);
             if (category_name != null) {
-                returnVector.add(category_name);
+                list.add(category_name);
             }
             c.moveToNext();
         }
         c.close();
 
-        return returnVector;
+        return list;
     }
 
     public int getCategoryId(int id, String category) {
@@ -1468,12 +1468,12 @@ public List<Map<String, Object>> getQuickPressShortcuts(int blogId) {
         String id, name;
         int numRows = c.getCount();
         c.moveToFirst();
-        List<Map<String, Object>> blogs = new Vector<Map<String, Object>>();
+        List<Map<String, Object>> blogs = new ArrayList<>();
         for (int i = 0; i < numRows; i++) {
             id = c.getString(0);
             name = c.getString(2);
             if (id != null) {
-                Map<String, Object> thisHash = new HashMap<String, Object>();
+                Map<String, Object> thisHash = new HashMap<>();
 
                 thisHash.put("id", id);
                 thisHash.put("name", name);

WordPress/src/main/java/org/wordpress/android/ui/AddQuickPressShortcutActivity.java

@@ -31,9 +31,9 @@
 import org.wordpress.android.util.GravatarUtils;
 import org.wordpress.android.util.StringUtils;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Vector;
 
 public class AddQuickPressShortcutActivity extends ListActivity {
     static final int ADD_ACCOUNT_REQUEST = 0;
@@ -43,7 +43,7 @@ public class AddQuickPressShortcutActivity extends ListActivity {
     public int[] accountIDs;
     public String[] accountUsers;
     public String[] blavatars;
-    public List<String> accountNames = new Vector<String>();
+    public List<String> accountNames = new ArrayList<>();
 
     @Override
     public void onCreate(Bundle savedInstanceState) {

libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/WPHtmlTagHandler.java

@@ -7,53 +7,62 @@
 
 import org.xml.sax.XMLReader;
 
-import java.util.Vector;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Handle tags that the Html class doesn't understand
  * Tweaked from source at http://stackoverflow.com/questions/4044509/android-how-to-use-the-html-taghandler
  */
 public class WPHtmlTagHandler implements Html.TagHandler {
+
+    private static final int SPAN_INDENT_WIDTH = 15;
+
     private int mListItemCount = 0;
-    private Vector<String> mListParents = new Vector<String>();
+    private List<String> mListParents = new ArrayList<>();
 
     @Override
     public void handleTag(final boolean opening, final String tag, Editable output,
                           final XMLReader xmlReader) {
-        if (tag.equals("ul") || tag.equals("ol") || tag.equals("dd")) {
-            if (opening) {
-                mListParents.add(tag);
-            } else {
-                mListParents.remove(tag);
+        if (tag != null) {
+            if (tag.equals("ul") || tag.equals("ol") || tag.equals("dd")) {
+                if (opening) {
+                    mListParents.add(tag);
+                } else {
+                    mListParents.remove(tag);
+                }
+                mListItemCount = 0;
+            } else if (tag.equals("li") && !opening) {
+                handleListTag(output);
             }
-            mListItemCount = 0;
-        } else if (tag.equals("li") && !opening) {
-            handleListTag(output);
         }
     }
 
     private void handleListTag(Editable output) {
-        if (mListParents.lastElement().equals("ul")) {
-            output.append("\n");
-            String[] split = output.toString().split("\n");
-            int start = 0;
-            if (split.length != 1) {
-                int lastIndex = split.length - 1;
-                start = output.length() - split[lastIndex].length() - 1;
-            }
-            output.setSpan(new BulletSpan(15 * mListParents.size()), start, output.length(), 0);
-        } else if (mListParents.lastElement().equals("ol")) {
-            mListItemCount++;
-            output.append("\n");
-            String[] split = output.toString().split("\n");
-            int start = 0;
-            if (split.length != 1) {
-                int lastIndex = split.length - 1;
-                start = output.length() - split[lastIndex].length() - 1;
+        int size = mListParents.size();
+        if (size > 0 && output != null) {
+            if ("ul".equals(mListParents.get(size - 1))) {
+                output.append("\n");
+                String[] split = output.toString().split("\n");
+                int start = 0;
+                if (split.length != 1) {
+                    int lastIndex = split.length - 1;
+                    start = output.length() - split[lastIndex].length() - 1;
+                }
+                output.setSpan(new BulletSpan(SPAN_INDENT_WIDTH * mListParents.size()), start, output.length(), 0);
+            } else if ("ol".equals(mListParents.get(size - 1))) {
+                mListItemCount++;
+                output.append("\n");
+                String[] split = output.toString().split("\n");
+                int start = 0;
+                if (split.length != 1) {
+                    int lastIndex = split.length - 1;
+                    start = output.length() - split[lastIndex].length() - 1;
+                }
+                output.insert(start, mListItemCount + ". ");
+                output.setSpan(new LeadingMarginSpan.Standard(SPAN_INDENT_WIDTH * mListParents.size()), start,
+                        output.length(), 0);
             }
-            output.insert(start, mListItemCount + ". ");
-            output.setSpan(new LeadingMarginSpan.Standard(15 * mListParents.size()), start,
-                    output.length(), 0);
         }
     }
 }