summaryrefslogtreecommitdiff
path: root/app/src/androidTest/java/se/leap/bitmaskclient/test/FromAssets.java
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2015-04-10 11:19:03 +0200
committerParménides GV <parmegv@sdf.org>2015-04-10 11:19:03 +0200
commit1f41fec6765e49838141ad29151713c7ac3dd17c (patch)
treed4c63d5bbb8e51d91d75179ad01abd9a7565badc /app/src/androidTest/java/se/leap/bitmaskclient/test/FromAssets.java
parentc198dbd9dd583d980ae7e70118f67d09bed8de55 (diff)
parentfe95b7693f0f1f90d23ba2596ad3b11195efb11d (diff)
Merge branch 'develop'0.9.3
Diffstat (limited to 'app/src/androidTest/java/se/leap/bitmaskclient/test/FromAssets.java')
-rw-r--r--app/src/androidTest/java/se/leap/bitmaskclient/test/FromAssets.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/app/src/androidTest/java/se/leap/bitmaskclient/test/FromAssets.java b/app/src/androidTest/java/se/leap/bitmaskclient/test/FromAssets.java
index 4f771922..6a4c1ee2 100644
--- a/app/src/androidTest/java/se/leap/bitmaskclient/test/FromAssets.java
+++ b/app/src/androidTest/java/se/leap/bitmaskclient/test/FromAssets.java
@@ -1,11 +1,10 @@
package se.leap.bitmaskclient.test;
-import android.content.Context;
+import android.content.*;
-import org.json.JSONException;
+import org.json.*;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
public class FromAssets {
@@ -14,11 +13,12 @@ public class FromAssets {
public FromAssets(Context context) {
this.context = context;
}
+
public String toString(String filename) throws IOException, JSONException {
String result = "";
InputStream is = context.getAssets().open(filename);
byte[] bytes = new byte[is.available()];
- if(is.read(bytes) > 0) {
+ if (is.read(bytes) > 0) {
result = new String(bytes);
}
return result;