Merge branch 'post_release_work' into 'master'

post release tweaks and fixes

Closes #9150 and #8983

See merge request leap/bitmask_android!264

2 files changed, 42 insertions, 0 deletions

diff --git a/app/src/test/java/android/util/Base64.java b/app/src/test/java/android/util/Base64.java
new file mode 100644
index 00000000..da40e9c4
--- /dev/null
+++ b/app/src/test/java/android/util/Base64.java
@@ -0,0 +1,19 @@
+package android.util;
+
+import java.util.Arrays;
+
+public class Base64 {
+
+    /**
+     * Base64-encode the given data and return a newly allocated
+     * String with the result.
+     *
+     * @param input  the data to encode
+     * @param flags  controls certain features of the encoded output.
+     *               Passing {@code DEFAULT} results in output that
+     *               adheres to RFC 2045.
+     */
+    public static String encodeToString(byte[] input, int flags) {
+        return Arrays.toString(java.util.Base64.getEncoder().encode(input));
+    }
+}
diff --git a/app/src/test/java/android/util/Log.java b/app/src/test/java/android/util/Log.java
new file mode 100644
index 00000000..b3162d10
--- /dev/null
+++ b/app/src/test/java/android/util/Log.java
@@ -0,0 +1,23 @@
+package android.util;
+
+public class Log {
+    public static int d(String tag, String msg) {
+        System.out.println("DEBUG: " + tag + ": " + msg);
+        return 0;
+    }
+
+    public static int i(String tag, String msg) {
+        System.out.println("INFO: " + tag + ": " + msg);
+        return 0;
+    }
+
+    public static int w(String tag, String msg) {
+        System.out.println("WARN: " + tag + ": " + msg);
+        return 0;
+    }
+
+    public static int e(String tag, String msg) {
+        System.out.println("ERROR: " + tag + ": " + msg);
+        return 0;
+    }
+}
\ No newline at end of file