From cd868bc9972eb7af9fd67c244aff9c0a86ae6a62 Mon Sep 17 00:00:00 2001
From: Samuel Holland <samuel@sholland.org>
Date: Thu, 24 Aug 2017 02:01:19 -0500
Subject: ConfigEditFragment: Add a field for the optional pre-shared key

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 app/src/main/res/layout/config_edit_peer.xml | 19 ++++++++++++++++++-
 app/src/main/res/values/strings.xml          |  2 ++
 2 files changed, 20 insertions(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/src/main/res/layout/config_edit_peer.xml b/app/src/main/res/layout/config_edit_peer.xml
index 6bb13047..18c2eec1 100644
--- a/app/src/main/res/layout/config_edit_peer.xml
+++ b/app/src/main/res/layout/config_edit_peer.xml
@@ -62,10 +62,27 @@
             app:filter="@{KeyInputFilter.newInstance()}" />
 
         <TextView
-            android:id="@+id/allowed_ips_label"
+            android:id="@+id/pre_shared_key_label"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@+id/public_key_text"
+            android:labelFor="@+id/pre_shared_key_text"
+            android:text="@string/pre_shared_key" />
+
+        <EditText
+            android:id="@+id/pre_shared_key_text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/pre_shared_key_label"
+            android:hint="@string/hint_optional"
+            android:inputType="textNoSuggestions"
+            android:text="@={item.preSharedKey}" />
+
+        <TextView
+            android:id="@+id/allowed_ips_label"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/pre_shared_key_text"
             android:labelFor="@+id/allowed_ips_text"
             android:text="@string/allowed_ips" />
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7c707f11..62e4fa4e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -19,6 +19,7 @@
     <string name="generate">Generate</string>
     <string name="hint_automatic">(auto)</string>
     <string name="hint_generated">(generated)</string>
+    <string name="hint_optional">(optional)</string>
     <string name="hint_random">(random)</string>
     <string name="iface">Interface</string>
     <string name="listen_port">Listen port</string>
@@ -28,6 +29,7 @@
     <string name="peer">Peer</string>
     <string name="persistent_keepalive">Persistent keepalive</string>
     <string name="placeholder_text">No configuration selected</string>
+    <string name="pre_shared_key">Pre-shared key</string>
     <string name="primary_config">Primary configuration</string>
     <string name="primary_config_summary">This configuration will be controlled by the quick settings tile</string>
     <string name="private_key">Private key</string>
-- 
cgit v1.2.3