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-03-24 19:37:41 +0100
committerParménides GV <parmegv@sdf.org>2015-03-24 19:37:41 +0100
commit6954d5a4d7739b472ba74bacac76d30aa9e065c9 (patch)
tree86fddd58a06fb4d57a2f8cd34b017ed86969bdc0 /app/src/androidTest/java/se/leap/bitmaskclient/test/FromAssets.java
parentfb4f332e4a0c669fa559aee0dba159b82c9d28c7 (diff)
parent9e5d0f1a2399787b1a57349e0e3b5ad596fcbf8f (diff)
Merge branch 'bug/Clean-logs-and-indentation-#6810' into develop
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;