From 303238ab302de99c305dfc7b2d8c85da036467f3 Mon Sep 17 00:00:00 2001
From: Nathan Froyd <froydnj@mozilla.com>
Date: Fri, 16 Aug 2013 10:42:27 -0400
Subject: [PATCH] Bug 906088 - part 1b - add ArrayList getPrefs method to
 PrefsHelper; r=bnicholson

---
 mobile/android/base/GeckoPreferences.java | 4 +---
 mobile/android/base/PrefsHelper.java      | 9 +++++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/mobile/android/base/GeckoPreferences.java b/mobile/android/base/GeckoPreferences.java
index e6c197ef666..374733f197f 100644
--- a/mobile/android/base/GeckoPreferences.java
+++ b/mobile/android/base/GeckoPreferences.java
@@ -664,9 +664,7 @@ public class GeckoPreferences
 
     // Initialize preferences by requesting the preference values from Gecko
     private int getGeckoPreferences(final PreferenceGroup screen, ArrayList<String> prefs) {
-        JSONArray jsonPrefs = new JSONArray(prefs);
-
-        return PrefsHelper.getPrefs(jsonPrefs, new PrefsHelper.PrefHandlerBase() {
+        return PrefsHelper.getPrefs(prefs, new PrefsHelper.PrefHandlerBase() {
             private Preference getField(String prefName) {
                 return screen.findPreference(prefName);
             }
diff --git a/mobile/android/base/PrefsHelper.java b/mobile/android/base/PrefsHelper.java
index d2a1538a440..2e5211c38ab 100644
--- a/mobile/android/base/PrefsHelper.java
+++ b/mobile/android/base/PrefsHelper.java
@@ -13,6 +13,7 @@ import org.json.JSONObject;
 
 import android.util.Log;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -40,6 +41,14 @@ public final class PrefsHelper {
         return getPrefs(prefs, callback);
     }
 
+    public static int getPrefs(ArrayList<String> prefNames, PrefHandler callback) {
+        JSONArray prefs = new JSONArray();
+        for (String p : prefNames) {
+            prefs.put(p);
+        }
+        return getPrefs(prefs, callback);
+    }
+
     public static int getPrefs(JSONArray prefNames, PrefHandler callback) {
         int requestId;
         synchronized (PrefsHelper.class) {