Merge branch 'origin_0.9.8' into 8823_cw_tablet_layout

1 files changed, 0 insertions, 26 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
deleted file mode 100644
index 6a4c1ee2..00000000
--- a/app/src/androidTest/java/se/leap/bitmaskclient/test/FromAssets.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package se.leap.bitmaskclient.test;
-
-import android.content.*;
-
-import org.json.*;
-
-import java.io.*;
-
-public class FromAssets {
-
-    Context context;
-
-    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) {
-            result = new String(bytes);
-        }
-        return result;
-    }
-}