Merge branch 'develop' into release-0.9.3

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;