From dfb26a0d2c95d56f69f5e1e0c255d9d5d6788120 Mon Sep 17 00:00:00 2001
From: pacien
Date: Sat, 29 Jul 2023 23:03:12 +0200
Subject: storage: remove embedded FTP server

Moving back the configuration files and logs to the user-accessible
storage. Everything should be accessible through a file manager using
the "USB storage" mode. The embedded FTP server is no longer
necessary.
---
 app/src/main/res/layout/configure_activity.xml     | 14 +---
 ...nfigure_tools_configuration_access_fragment.xml | 86 ----------------------
 app/src/main/res/values-ru-rRU/strings.xml         | 10 ---
 app/src/main/res/values/strings.xml                | 10 ---
 4 files changed, 2 insertions(+), 118 deletions(-)
 delete mode 100644 app/src/main/res/layout/configure_tools_configuration_access_fragment.xml

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout/configure_activity.xml b/app/src/main/res/layout/configure_activity.xml
index 08f29af..5d796fb 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-2020 Pacien TRAN-GIRARD
+ * Copyright (C) 2017-2023 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,17 +28,7 @@
 		android:layout_height="wrap_content"
 		android:orientation="vertical">
 
-        <TextView
-            style="@style/AppTheme.SectionTitle"
-            android:text="@string/configure_activity_title_configuration_access"/>
-
-        <fragment
-            android:id="@+id/configure_activity_configuration_sftp_server_fragment"
-            android:name="org.pacien.tincapp.activities.configure.ConfigurationAccessServerFragment"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"/>
-
-		<TextView
+ 		<TextView
 			style="@style/AppTheme.SectionTitle"
 			android:text="@string/configure_activity_title_tools"/>
 
diff --git a/app/src/main/res/layout/configure_tools_configuration_access_fragment.xml b/app/src/main/res/layout/configure_tools_configuration_access_fragment.xml
deleted file mode 100644
index 24f3c36..0000000
--- a/app/src/main/res/layout/configure_tools_configuration_access_fragment.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?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-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 260caaa..1adbe0f 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -57,7 +57,6 @@
 	<string name="notification_error_channel_name">Ошибки</string>
 	<string name="notification_error_action_open_manual">Открыть руководство</string>
 	<string name="notification_error_title_unable_to_start_tinc">Не удалось запустить tinc</string>
-	<string name="notification_error_title_unable_to_start_ftp_server">Не удалось запустить FTP-сервер</string>
 	<string name="notification_error_message_could_not_read_private_key_format">Не удалось прочитать закрытые ключи tinc:\n%1$s</string>
 	<string name="notification_error_message_could_not_read_network_configuration_format">Не удалось прочитать конфигурацию сетевого интерфейса:\n%1$s</string>
 	<string name="notification_error_message_could_not_bind_iface">Не удалось привязать сетевой интерфейс. Запущен другой VPN?</string>
@@ -70,10 +69,6 @@
 	<string name="notification_error_message_network_config_invalid_format">Недопустимая конфигурация сети в network.conf:\n%1$s</string>
 	<string name="notification_error_message_could_not_decrypt_private_keys_format">Не удалось расшифровать закрытые ключи:\n%1$s</string>
 
-	<string name="notification_config_access_channel_name">Доступ к конфигурации</string>
-	<string name="notification_config_access_server_running_title">Сервер доступа к конфигурации активен</string>
-	<string name="notification_config_access_server_running_message">Каталог конфигурации доступен через FTP.</string>
-
 	<!-- Start activity -->
 	<string name="start_activity_menu_configure">Конфигурировать</string>
 	<string name="start_network_list_warning_text">Трафик с этого устройства будет частично или полностью перенаправляться в выбранную сеть и через нее в соответствии с вашей конфигурацией. Никогда не подключайтесь к сети tinc, которой вы не доверяете.</string>
@@ -85,11 +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_configuration_access">Доступ к конфигурации</string>
-	<string name="configure_configuration_server_ftp_access">Доступ по FTP</string>
-	<string name="configure_configuration_server_ftp_access_endpoint_format">Пользователь: %1$s, пароль: %2$s, порт: %3$d</string>
-	<string name="configure_configuration_server_ftp_access_not_active">Не активный</string>
-
 	<string name="configure_activity_title_internal_paths_info">Информация о внутренних путях</string>
 	<string name="configure_path_info_title_configuration_directory">Каталог конфигурации</string>
 	<string name="configure_path_info_title_log_directory">Каталог журналов</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e124055..c4384a7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -62,7 +62,6 @@
 	<string name="notification_error_channel_name">Errors</string>
 	<string name="notification_error_action_open_manual">Open manual</string>
 	<string name="notification_error_title_unable_to_start_tinc">Could not start tinc</string>
-	<string name="notification_error_title_unable_to_start_ftp_server">Could not start FTP server</string>
 	<string name="notification_error_message_could_not_read_private_key_format">Could not read private tinc keys:\n%1$s</string>
 	<string name="notification_error_message_could_not_read_network_configuration_format">Could not read network interface configuration:\n%1$s</string>
 	<string name="notification_error_message_could_not_bind_iface">Could not bind network interface. Is another VPN running?</string>
@@ -75,10 +74,6 @@
 	<string name="notification_error_message_network_config_invalid_format">Invalid network configuration in network.conf:\n%1$s</string>
 	<string name="notification_error_message_could_not_decrypt_private_keys_format">Could not decrypt private keys:\n%1$s</string>
 
-	<string name="notification_config_access_channel_name">Configuration access</string>
-	<string name="notification_config_access_server_running_title">Configuration access server active</string>
-	<string name="notification_config_access_server_running_message">The configuration directory is accessible through FTP.</string>
-
 	<!-- Start activity -->
 	<string name="start_activity_menu_configure">Configure</string>
 	<string name="start_network_list_warning_text">Traffic from this device will be partially or fully routed to and through the selected network in accordance with your configuration. Never connect to a tinc network which you do not trust.</string>
@@ -90,11 +85,6 @@
 	<string name="configure_tools_message_invalid_network_name">Invalid network name.</string>
 	<string name="configure_tools_message_network_configuration_written">Network configuration written.</string>
 
-	<string name="configure_activity_title_configuration_access">Configuration access</string>
-	<string name="configure_configuration_server_ftp_access">FTP access</string>
-	<string name="configure_configuration_server_ftp_access_endpoint_format">User: %1$s, password: %2$s, port: %3$d</string>
-	<string name="configure_configuration_server_ftp_access_not_active">Not active</string>
-
 	<string name="configure_activity_title_internal_paths_info">Internal paths info</string>
 	<string name="configure_path_info_title_configuration_directory">Configuration directory</string>
 	<string name="configure_path_info_title_log_directory">Log directory</string>
-- 
cgit v1.2.3