Replace HashMap with ArrayMap

7 files changed, 26 insertions, 23 deletions

diff --git a/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/model/GpodnetEpisodeActionPostResponse.java b/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/model/GpodnetEpisodeActionPostResponse.java
index e06a88d5c..5f096db14 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/model/GpodnetEpisodeActionPostResponse.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/model/GpodnetEpisodeActionPostResponse.java
@@ -1,12 +1,13 @@
 package de.danoeh.antennapod.core.gpoddernet.model;
 
+import android.support.v4.util.ArrayMap;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.util.HashMap;
 import java.util.Map;
 
 public class GpodnetEpisodeActionPostResponse {
@@ -36,8 +37,8 @@ public class GpodnetEpisodeActionPostResponse {
     public static GpodnetEpisodeActionPostResponse fromJSONObject(String objectString) throws JSONException {
         final JSONObject object = new JSONObject(objectString);
         final long timestamp = object.getLong("timestamp");
-        Map<String, String> updatedUrls = new HashMap<String, String>();
         JSONArray urls = object.getJSONArray("update_urls");
+        Map<String, String> updatedUrls = new ArrayMap<String, String>(urls.length());
         for (int i = 0; i < urls.length(); i++) {
             JSONArray urlPair = urls.getJSONArray(i);
             updatedUrls.put(urlPair.getString(0), urlPair.getString(1));
diff --git a/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/model/GpodnetUploadChangesResponse.java b/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/model/GpodnetUploadChangesResponse.java
index 5a37efa5e..9bd1881e4 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/model/GpodnetUploadChangesResponse.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/model/GpodnetUploadChangesResponse.java
@@ -1,10 +1,11 @@
 package de.danoeh.antennapod.core.gpoddernet.model;
 
+import android.support.v4.util.ArrayMap;
+
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -37,7 +38,7 @@ public class GpodnetUploadChangesResponse {
     public static GpodnetUploadChangesResponse fromJSONObject(String objectString) throws JSONException {
         final JSONObject object = new JSONObject(objectString);
         final long timestamp = object.getLong("timestamp");
-        Map<String, String> updatedUrls = new HashMap<String, String>();
+        Map<String, String> updatedUrls = new ArrayMap<>();
         JSONArray urls = object.getJSONArray("update_urls");
         for (int i = 0; i < urls.length(); i++) {
             JSONArray urlPair = urls.getJSONArray(i);
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/GpodnetSyncService.java b/core/src/main/java/de/danoeh/antennapod/core/service/GpodnetSyncService.java
index d5660f67e..0b90cef6c 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/GpodnetSyncService.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/GpodnetSyncService.java
@@ -8,12 +8,12 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.IBinder;
 import android.support.v4.app.NotificationCompat;
+import android.support.v4.util.ArrayMap;
 import android.util.Log;
 import android.util.Pair;
 
 import java.util.Collection;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -226,7 +226,7 @@ public class GpodnetSyncService extends Service {
         if(remoteActions.size() == 0) {
             return;
         }
-        Map<Pair<String, String>, GpodnetEpisodeAction> localMostRecentPlayAction = new HashMap<Pair<String, String>, GpodnetEpisodeAction>();
+        Map<Pair<String, String>, GpodnetEpisodeAction> localMostRecentPlayAction = new ArrayMap<>();
         for(GpodnetEpisodeAction action : localActions) {
             Pair key = new Pair(action.getPodcast(), action.getEpisode());
             GpodnetEpisodeAction mostRecent = localMostRecentPlayAction.get(key);
@@ -238,7 +238,7 @@ public class GpodnetSyncService extends Service {
         }
 
         // make sure more recent local actions are not overwritten by older remote actions
-        Map<Pair<String, String>, GpodnetEpisodeAction> mostRecentPlayAction = new HashMap<Pair<String, String>, GpodnetEpisodeAction>();
+        Map<Pair<String, String>, GpodnetEpisodeAction> mostRecentPlayAction = new ArrayMap<>();
         for (GpodnetEpisodeAction action : remoteActions) {
             switch (action.getAction()) {
                 case NEW:
diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java b/core/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java
index c34515118..fe5b177ab 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java
@@ -1,13 +1,13 @@
 package de.danoeh.antennapod.core.storage;
 
 import android.database.Cursor;
+import android.support.v4.util.ArrayMap;
 import android.util.Log;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -229,7 +229,7 @@ public final class DBReader {
         for(int i=0, len=itemIds.length; i < len; i++) {
             ids[i] = String.valueOf(itemIds[i]);
         }
-        Map<Long,FeedMedia> result = new HashMap<>(itemIds.length);
+        Map<Long,FeedMedia> result = new ArrayMap<>(itemIds.length);
         Cursor cursor = adapter.getFeedMediaCursor(ids);
         try {
             if (cursor.moveToFirst()) {
@@ -871,7 +871,7 @@ public final class DBReader {
             ids[i] = String.valueOf(imageIds[i]);
         }
         Cursor cursor = adapter.getImageCursor(ids);
-        Map<Long, FeedImage> result = new HashMap<>(cursor.getCount());
+        Map<Long, FeedImage> result = new ArrayMap<>(cursor.getCount());
         try {
             if ((cursor.getCount() == 0) || !cursor.moveToFirst()) {
                 return Collections.emptyMap();
diff --git a/core/src/main/java/de/danoeh/antennapod/core/syndication/handler/HandlerState.java b/core/src/main/java/de/danoeh/antennapod/core/syndication/handler/HandlerState.java
index 413a11f8e..9280db8a3 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/syndication/handler/HandlerState.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/syndication/handler/HandlerState.java
@@ -1,8 +1,8 @@
 package de.danoeh.antennapod.core.syndication.handler;
 
+import android.support.v4.util.ArrayMap;
+
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Stack;
 
@@ -32,7 +32,7 @@ public class HandlerState {
     /**
      * Namespaces that have been defined so far.
      */
-    protected HashMap<String, Namespace> namespaces;
+    protected Map<String, Namespace> namespaces;
     protected Stack<Namespace> defaultNamespaces;
     /**
      * Buffer for saving characters.
@@ -42,16 +42,16 @@ public class HandlerState {
     /**
      * Temporarily saved objects.
      */
-    protected HashMap<String, Object> tempObjects;
+    protected Map<String, Object> tempObjects;
 
     public HandlerState(Feed feed) {
         this.feed = feed;
-        alternateUrls = new LinkedHashMap<String, String>();
+        alternateUrls = new ArrayMap<>();
         items = new ArrayList<FeedItem>();
         tagstack = new Stack<SyndElement>();
-        namespaces = new HashMap<String, Namespace>();
+        namespaces = new ArrayMap<>();
         defaultNamespaces = new Stack<Namespace>();
-        tempObjects = new HashMap<String, Object>();
+        tempObjects = new ArrayMap<>();
     }
 
     public Feed getFeed() {
@@ -105,7 +105,7 @@ public class HandlerState {
         alternateUrls.put(url, title);
     }
 
-    public HashMap<String, Object> getTempObjects() {
+    public Map<String, Object> getTempObjects() {
         return tempObjects;
     }
 }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/LangUtils.java b/core/src/main/java/de/danoeh/antennapod/core/util/LangUtils.java
index 07432d28a..287ec4d0c 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/LangUtils.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/LangUtils.java
@@ -1,14 +1,15 @@
 package de.danoeh.antennapod.core.util;
 
+import android.support.v4.util.ArrayMap;
+
 import java.nio.charset.Charset;
-import java.util.HashMap;
 
 public class LangUtils {
 	public static final Charset UTF_8 = Charset.forName("UTF-8");
 
-	private static HashMap<String, String> languages;
+	private static ArrayMap<String, String> languages;
 	static {
-		languages = new HashMap<String, String>();
+		languages = new ArrayMap<>();
 		languages.put("af", "Afrikaans");
 		languages.put("sq", "Albanian");
 		languages.put("sq", "Albanian");
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/syndication/FeedDiscoverer.java b/core/src/main/java/de/danoeh/antennapod/core/util/syndication/FeedDiscoverer.java
index d148419fd..13cb9f002 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/syndication/FeedDiscoverer.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/syndication/FeedDiscoverer.java
@@ -1,6 +1,7 @@
 package de.danoeh.antennapod.core.util.syndication;
 
 import android.net.Uri;
+import android.support.v4.util.ArrayMap;
 import android.text.TextUtils;
 
 import org.jsoup.Jsoup;
@@ -10,7 +11,6 @@ import org.jsoup.select.Elements;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.LinkedHashMap;
 import java.util.Map;
 
 /**
@@ -46,7 +46,7 @@ public class FeedDiscoverer {
     }
 
     private Map<String, String> findLinks(Document document, String baseUrl) {
-        Map<String, String> res = new LinkedHashMap<String, String>();
+        Map<String, String> res = new ArrayMap<>();
         Elements links = document.head().getElementsByTag("link");
         for (Element link : links) {
             String rel = link.attr("rel");