aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/app/src/main/java/com/wireguard/config/Config.java
diff options
context:
space:
mode:
authorEric Kuck <eric@bluelinelabs.com>2018-07-24 12:32:40 -0500
committerJason A. Donenfeld <Jason@zx2c4.com>2018-07-25 02:05:11 +0200
commit2087a10f5533e4b61811a3cb4e5019dcf2560d81 (patch)
tree570f81ddc7b189e2a736f2ba669ab8ed553586d3 /app/src/main/java/com/wireguard/config/Config.java
parenttools: Bump wireguard submodule (diff)
downloadwireguard-android-2087a10f5533e4b61811a3cb4e5019dcf2560d81.tar.xz
wireguard-android-2087a10f5533e4b61811a3cb4e5019dcf2560d81.zip
Added QR code scanner as tunnel import method
Diffstat (limited to '')
-rw-r--r--app/src/main/java/com/wireguard/config/Config.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/app/src/main/java/com/wireguard/config/Config.java b/app/src/main/java/com/wireguard/config/Config.java
index 0599dec3..db8c2fc7 100644
--- a/app/src/main/java/com/wireguard/config/Config.java
+++ b/app/src/main/java/com/wireguard/config/Config.java
@@ -20,6 +20,7 @@ import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.io.StringReader;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
@@ -32,6 +33,10 @@ public class Config {
private final Interface interfaceSection = new Interface();
private List<Peer> peers = new ArrayList<>();
+ public static Config from(final String string) throws IOException {
+ return from(new BufferedReader(new StringReader(string)));
+ }
+
public static Config from(final InputStream stream) throws IOException {
return from(new BufferedReader(new InputStreamReader(stream, StandardCharsets.UTF_8)));
}