Index: libadblockplus-android/src/org/adblockplus/libadblockplus/android/Utils.java |
diff --git a/libadblockplus-android/src/org/adblockplus/android/Utils.java b/libadblockplus-android/src/org/adblockplus/libadblockplus/android/Utils.java |
similarity index 59% |
rename from libadblockplus-android/src/org/adblockplus/android/Utils.java |
rename to libadblockplus-android/src/org/adblockplus/libadblockplus/android/Utils.java |
index 47b7c663c5adb7458de98766d84eacf463d4af0e..949f206f32ea879b5a91587f7e45d0c6e5464fa3 100644 |
--- a/libadblockplus-android/src/org/adblockplus/android/Utils.java |
+++ b/libadblockplus-android/src/org/adblockplus/libadblockplus/android/Utils.java |
@@ -15,20 +15,17 @@ |
* along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. |
*/ |
-package org.adblockplus.android; |
+package org.adblockplus.libadblockplus.android; |
import java.io.BufferedReader; |
+import java.io.IOException; |
+import java.io.InputStream; |
import java.io.InputStreamReader; |
+import java.util.List; |
-import org.adblockplus.libadblockplus.JsValue; |
-import org.adblockplus.libadblockplus.Subscription; |
-import org.apache.commons.lang.StringUtils; |
+import org.json.JSONArray; |
-import android.app.Notification; |
-import android.app.NotificationManager; |
-import android.app.PendingIntent; |
import android.content.Context; |
-import android.content.Intent; |
public final class Utils |
{ |
@@ -80,4 +77,51 @@ public final class Utils |
// Ignored for now |
} |
} |
+ |
+ public static String stringListToJsonArray(List<String> list) |
+ { |
+ JSONArray array = new JSONArray(); |
+ |
+ if (list != null) |
+ { |
+ for (String eachString : list) |
+ { |
+ if (eachString != null) |
+ { |
+ array.put(eachString); |
+ } |
+ } |
+ } |
+ |
+ return array.toString(); |
+ } |
+ |
+ public static String readAssetAsString(Context context, String filename) throws IOException |
+ { |
+ BufferedReader in = null; |
+ try { |
+ StringBuilder buf = new StringBuilder(); |
+ InputStream is = context.getAssets().open(filename); |
+ in = new BufferedReader(new InputStreamReader(is)); |
+ |
+ String str; |
+ boolean isFirst = true; |
+ while ( (str = in.readLine()) != null ) { |
+ if (isFirst) |
+ isFirst = false; |
+ else |
+ buf.append('\n'); |
+ buf.append(str); |
+ } |
+ return buf.toString(); |
+ } finally { |
+ if (in != null) { |
+ try { |
+ in.close(); |
+ } catch (IOException e) { |
+ // ignored |
+ } |
+ } |
+ } |
+ } |
} |