7 files changed, 110 insertions, 12 deletions

diff --git a/app/src/main/res/layout/configure_activity.xml b/app/src/main/res/layout/configure_activity.xml
index 6097384..2fde4a2 100644
--- a/app/src/main/res/layout/configure_activity.xml
+++ b/app/src/main/res/layout/configure_activity.xml
@@ -2,7 +2,7 @@
 
 <!--
  * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
- * Copyright (C) 2017-2018 Pacien TRAN-GIRARD
+ * Copyright (C) 2017-2020 Pacien TRAN-GIRARD
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,23 +28,33 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
+        <TextView
+            style="@style/AppTheme.SectionTitle"
+            android:text="@string/configure_activity_title_configuration_server"/>
+
+        <fragment
+            android:id="@+id/configure_activity_configuration_sftp_server_fragment"
+            android:name="org.pacien.tincapp.activities.configure.ConfigurationFtpServerFragment"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+
                 <TextView
                         style="@style/AppTheme.SectionTitle"
-                        android:text="@string/configure_activity_title_path_info"/>
+                        android:text="@string/configure_activity_title_tools"/>
 
                 <fragment
-                        android:id="@+id/configure_activity_path_info_fragment"
-                        android:name="org.pacien.tincapp.activities.configure.PathInfoFragment"
+                        android:id="@+id/configure_activity_tools_fragment"
+                        android:name="org.pacien.tincapp.activities.configure.ToolsFragment"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"/>
 
                 <TextView
                         style="@style/AppTheme.SectionTitle"
-                        android:text="@string/configure_activity_title_tools"/>
+                        android:text="@string/configure_activity_title_internal_paths_info"/>
 
                 <fragment
-                        android:id="@+id/configure_activity_tools_fragment"
-                        android:name="org.pacien.tincapp.activities.configure.ToolsFragment"
+                        android:id="@+id/configure_activity_path_info_fragment"
+                        android:name="org.pacien.tincapp.activities.configure.PathInfoFragment"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"/>
 
diff --git a/app/src/main/res/layout/configure_tools_configuration_ftp_server_fragment.xml b/app/src/main/res/layout/configure_tools_configuration_ftp_server_fragment.xml
new file mode 100644
index 0000000..24f3c36
--- /dev/null
+++ b/app/src/main/res/layout/configure_tools_configuration_ftp_server_fragment.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+ * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
+ * Copyright (C) 2017-2020 Pacien TRAN-GIRARD
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+-->
+
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <data>
+
+        <variable
+            name="ftpEnabled"
+            type="boolean" />
+
+        <variable
+            name="ftpUsername"
+            type="String" />
+
+        <variable
+            name="ftpPassword"
+            type="String" />
+
+        <variable
+            name="ftpPort"
+            type="int" />
+
+        <variable
+            name="toggleFtpState"
+            type="kotlin.jvm.functions.Function0&lt;kotlin.Unit>" />
+
+    </data>
+
+    <LinearLayout style="@style/AppTheme.List">
+
+        <LinearLayout
+            style="@style/AppTheme.ListBlock.Clickable"
+            android:onClick="@{() -> toggleFtpState.invoke()}"
+            android:orientation="horizontal">
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:orientation="vertical">
+
+                <TextView
+                    style="@style/AppTheme.BlockTitle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/configure_configuration_server_ftp_access" />
+
+                <TextView
+                    style="@style/AppTheme.BlockContent"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@{ftpEnabled ? @string/configure_configuration_server_ftp_access_endpoint_format(ftpUsername, ftpPassword, ftpPort) : @string/configure_configuration_server_ftp_access_not_active}"
+                    android:textIsSelectable="@{ftpEnabled}" />
+
+            </LinearLayout>
+
+            <androidx.appcompat.widget.SwitchCompat
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_weight="0"
+                android:checked="@{ftpEnabled}"
+                android:onClick="@{() -> toggleFtpState.invoke()}" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</layout>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index 9c330a7..346a2d1 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -80,7 +80,6 @@
         <string name="configure_tools_message_invalid_network_name">Ugyldig nettverksnavn.</string>
         <string name="configure_tools_message_network_configuration_written">Nettverksoppsett skrevet.</string>
 
-        <string name="configure_activity_title_path_info">Sti-info</string>
         <string name="configure_path_info_title_configuration_directory">Oppsettsmappe</string>
         <string name="configure_path_info_title_log_directory">Loggingsmappe</string>
         <string name="configure_path_info_title_tinc_binary">tinc-binærfil</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index b5d12b1..536403e 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -80,7 +80,6 @@
         <string name="configure_tools_message_invalid_network_name">网络名称无效。</string>
         <string name="configure_tools_message_network_configuration_written">网络配置写入成功。</string>
 
-        <string name="configure_activity_title_path_info">路径信息</string>
         <string name="configure_path_info_title_configuration_directory">配置目录</string>
         <string name="configure_path_info_title_log_directory">日志目录</string>
         <string name="configure_path_info_title_tinc_binary">Tinc 二进制文件</string>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index bddb004..e9c48d2 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -80,7 +80,6 @@
         <string name="configure_tools_message_invalid_network_name">網絡名稱無效。</string>
         <string name="configure_tools_message_network_configuration_written">網絡配置寫入成功。</string>
 
-        <string name="configure_activity_title_path_info">路徑信息</string>
         <string name="configure_path_info_title_configuration_directory">配置目錄</string>
         <string name="configure_path_info_title_log_directory">日誌目錄</string>
         <string name="configure_path_info_title_tinc_binary">Tinc 二進制文件</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index c423b15..82eec1d 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -80,7 +80,6 @@