From db1e1a2045a2e6456d54765be3cf95186ce987f7 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Fri, 24 May 2019 18:01:03 +0200 Subject: squashed commit for Pluggable Transports * implement handling of different provider API version (v1 and v2) * detect provider's obfs support * shapeshifter-dispatcher installation * necessary changes to control shapeshifter-dispatcher from Bitmask * route openvpn traffic over shapeshifter-dispatcher --- .../java/se.leap.bitmaskclient/testutils/TestSetupHelper.java | 3 +++ 1 file changed, 3 insertions(+) (limited to 'app/src/sharedTest/java/se.leap.bitmaskclient') diff --git a/app/src/sharedTest/java/se.leap.bitmaskclient/testutils/TestSetupHelper.java b/app/src/sharedTest/java/se.leap.bitmaskclient/testutils/TestSetupHelper.java index 8835b75d..02a575ea 100644 --- a/app/src/sharedTest/java/se.leap.bitmaskclient/testutils/TestSetupHelper.java +++ b/app/src/sharedTest/java/se.leap.bitmaskclient/testutils/TestSetupHelper.java @@ -40,6 +40,9 @@ public class TestSetupHelper { while (line != null) { sb.append(line); line = br.readLine(); + if (line != null) { + sb.append("\n"); + } } return sb.toString(); -- cgit v1.2.3