6 files changed, 86 insertions, 4 deletions

diff --git a/app/src/main/res/layout/dialog_decrypt_keys.xml b/app/src/main/res/layout/dialog_decrypt_keys.xml
new file mode 100644
index 0000000..b8a3586
--- /dev/null
+++ b/app/src/main/res/layout/dialog_decrypt_keys.xml
@@ -0,0 +1,17 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                          android:layout_width="match_parent"
+                          android:layout_height="wrap_content"
+                          android:orientation="vertical"
+                          android:paddingBottom="@dimen/dialog_vertical_margin"
+                          android:paddingLeft="@dimen/dialog_horizontal_margin"
+                          android:paddingRight="@dimen/dialog_horizontal_margin"
+                          android:paddingTop="@dimen/dialog_vertical_margin">
+
+        <EditText
+                android:id="@+id/passphrase"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:hint="@string/field_passphrase"
+                android:inputType="textPassword"/>
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/dialog_encrypt_decrypt_keys.xml b/app/src/main/res/layout/dialog_encrypt_decrypt_keys.xml
new file mode 100644
index 0000000..1f20d9b
--- /dev/null
+++ b/app/src/main/res/layout/dialog_encrypt_decrypt_keys.xml
@@ -0,0 +1,30 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                          android:layout_width="match_parent"
+                          android:layout_height="wrap_content"
+                          android:orientation="vertical"
+                          android:paddingBottom="@dimen/dialog_vertical_margin"
+                          android:paddingLeft="@dimen/dialog_horizontal_margin"
+                          android:paddingRight="@dimen/dialog_horizontal_margin"
+                          android:paddingTop="@dimen/dialog_vertical_margin">
+
+        <EditText
+                android:id="@+id/enc_dec_net_name"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/field_net_name"/>
+
+        <EditText
+                android:id="@+id/enc_dec_current_passphrase"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:hint="@string/field_current_passphrase"
+                android:inputType="textVisiblePassword"/>
+
+        <EditText
+                android:id="@+id/enc_dec_new_passphrase"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:hint="@string/field_new_passphrase"
+                android:inputType="textVisiblePassword"/>
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/dialog_network_generate.xml b/app/src/main/res/layout/dialog_network_generate.xml
index cc51b7b..d849ca1 100644
--- a/app/src/main/res/layout/dialog_network_generate.xml
+++ b/app/src/main/res/layout/dialog_network_generate.xml
@@ -19,4 +19,11 @@
                 android:layout_height="match_parent"
                 android:hint="@string/field_node_name"/>
 
+        <EditText
+                android:id="@+id/new_passphrase"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:hint="@string/field_optional_passphrase"
+                android:inputType="textVisiblePassword"/>
+
 </LinearLayout>
diff --git a/app/src/main/res/layout/dialog_network_join.xml b/app/src/main/res/layout/dialog_network_join.xml
index 2d23d4b..7bc8804 100644
--- a/app/src/main/res/layout/dialog_network_join.xml
+++ b/app/src/main/res/layout/dialog_network_join.xml
@@ -34,4 +34,11 @@
 
         </LinearLayout>
 
+        <EditText
+                android:id="@+id/join_passphrase"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:hint="@string/field_optional_passphrase"
+                android:inputType="textVisiblePassword"/>
+
 </LinearLayout>
diff --git a/app/src/main/res/layout/page_configure.xml b/app/src/main/res/layout/page_configure.xml
index e094f7e..4f92b07 100644
--- a/app/src/main/res/layout/page_configure.xml
+++ b/app/src/main/res/layout/page_configure.xml
@@ -26,7 +26,7 @@
                                 <TextView
                                         android:id="@+id/text_configuration_directory"
                                         style="@style/AppTheme.BlockContent"
-                                        android:textIsSelectable="true" />
+                                        android:textIsSelectable="true"/>
 
                         </LinearLayout>
 
@@ -39,7 +39,7 @@
                                 <TextView
                                         android:id="@+id/text_log_directory"
                                         style="@style/AppTheme.BlockContent"
-                                        android:textIsSelectable="true" />
+                                        android:textIsSelectable="true"/>
 
                         </LinearLayout>
 
@@ -52,7 +52,7 @@
                                 <TextView
                                         android:id="@+id/text_tinc_binary"
                                         style="@style/AppTheme.BlockContent"
-                                        android:textIsSelectable="true" />
+                                        android:textIsSelectable="true"/>
 
                         </LinearLayout>
 
@@ -84,6 +84,16 @@
 
                         </LinearLayout>
 
+                        <LinearLayout
+                                style="@style/AppTheme.ListBlock.Clickable"
+                                android:onClick="openEncryptDecryptPrivateKeyDialog">
+
+                                <TextView
+                                        style="@style/AppTheme.BlockTitle"
+                                        android:text="@string/action_encrypt_decrypt_private_keys"/>
+
+                        </LinearLayout>
+
                 </LinearLayout>
 
         </LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c909933..dcb415b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -18,6 +18,10 @@
         <string name="field_net_name">Tinc network name</string>
         <string name="field_node_name">Name of this node</string>
         <string name="field_invitation_url">Invitation URL</string>
+        <string name="field_current_passphrase">Current passphrase\n(leave empty if none)</string>
+        <string name="field_new_passphrase">New passphrase\n(leave empty to decrypt)</string>
+        <string name="field_optional_passphrase">Passphrase (optional)</string>
+        <string name="field_passphrase">Passphrase</string>
 
         <string name="title_connect_to_network">Connect to network</string>
         <string name="title_request_vpn_permissions">Request VPN permissions</string>
@@ -41,6 +45,8 @@
         <string name="title_new_network">New network</string>
         <string name="title_join_network">Join network</string>
         <string name="title_unable_to_start_tinc">Unable to start tinc</string>
+        <string name="title_private_keys_encryption">Private keys encryption</string>
+        <string name="title_unlock_private_keys">Unlock tinc private keys</string>
 
         <string name="action_close">Close</string>
         <string name="action_cancel">Cancel</string>
@@ -52,17 +58,22 @@
         <string name="action_open_manual">Open manual</string>
         <string name="action_scan_qr_code">Scan QR code</string>
         <string name="action_install">Install</string>
+        <string name="action_unlock">Unlock</string>
+        <string name="action_apply">Apply</string>
+        <string name="action_encrypt_decrypt_private_keys">Encrypt or decrypt private keys</string>
 
         <string name="message_no_network_configuration_found">No network configuration has been found.</string>
         <string name="message_no_known_node">No known node</string>
         <string name="message_generating_configuration">Generating node configuration…</string>
         <string name="message_joining_network">Joining network…</string>
-        <string name="message_network_configuration_created">Network configuration successfully created.</string>
+        <string name="message_network_configuration_written">Network configuration successfully written.</string>
         <string name="message_no_network_name_provided">No network name has been provided.</string>
         <string name="message_no_configuration_for_network_format">No configuration has been found for network \"%1$s\".</string>
         <string name="message_network_config_not_found_format">Network configuration file not found at \"%1$s\".</string>
         <string name="message_network_config_invalid_format">Invalid network configuration:\n\n%1$s</string>
         <string name="message_no_qr_code_scanner">No scanner could be started.\n\nInstall Barcode Scanner?</string>
+        <string name="message_encrypting_decrypting_private_keys">Encrypting/decrypting private keys</string>
+        <string name="message_could_not_decrypt_private_keys_format">Could not decrypt private keys:\n\n%1$s</string>
 
         <string name="value_none">none</string>
         <string name="value_yes">yes</string>