aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/layout/configure_activity.xml14
-rw-r--r--app/src/main/res/layout/configure_tools_configuration_access_fragment.xml86
-rw-r--r--app/src/main/res/values-ru-rRU/strings.xml10
-rw-r--r--app/src/main/res/values/strings.xml10
4 files changed, 2 insertions, 118 deletions
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 @@
2 2
3<!-- 3<!--
4 * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon 4 * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
5 * Copyright (C) 2017-2020 Pacien TRAN-GIRARD 5 * Copyright (C) 2017-2023 Pacien TRAN-GIRARD
6 * 6 *
7 * This program is free software: you can redistribute it and/or modify 7 * This program is free software: you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by 8 * it under the terms of the GNU General Public License as published by
@@ -28,17 +28,7 @@
28 android:layout_height="wrap_content" 28 android:layout_height="wrap_content"
29 android:orientation="vertical"> 29 android:orientation="vertical">
30 30
31 <TextView 31 <TextView
32 style="@style/AppTheme.SectionTitle"
33 android:text="@string/configure_activity_title_configuration_access"/>
34
35 <fragment
36 android:id="@+id/configure_activity_configuration_sftp_server_fragment"
37 android:name="org.pacien.tincapp.activities.configure.ConfigurationAccessServerFragment"
38 android:layout_width="match_parent"
39 android:layout_height="wrap_content"/>
40
41 <TextView
42 style="@style/AppTheme.SectionTitle" 32 style="@style/AppTheme.SectionTitle"
43 android:text="@string/configure_activity_title_tools"/> 33 android:text="@string/configure_activity_title_tools"/>
44 34
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 @@
1<?xml version="1.0" encoding="utf-8"?>
2
3<!--
4 * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
5 * Copyright (C) 2017-2020 Pacien TRAN-GIRARD
6 *
7 * This program is free software: you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by
9 * the Free Software Foundation, either version 3 of the License, or
10 * (at your option) any later version.
11 *
12 * This program is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 * GNU General Public License for more details.
16 *
17 * You should have received a copy of the GNU General Public License
18 * along with this program. If not, see <https://www.gnu.org/licenses/>.
19-->
20
21<layout xmlns:android="http://schemas.android.com/apk/res/android">
22
23 <data>
24
25 <variable
26 name="ftpEnabled"
27 type="boolean" />
28
29 <variable
30 name="ftpUsername"
31 type="String" />
32
33 <variable
34 name="ftpPassword"
35 type="String" />
36
37 <variable
38 name="ftpPort"
39 type="int" />
40
41 <variable
42 name="toggleFtpState"
43 type="kotlin.jvm.functions.Function0&lt;kotlin.Unit>" />
44
45 </data>
46
47 <LinearLayout style="@style/AppTheme.List">
48
49 <LinearLayout
50 style="@style/AppTheme.ListBlock.Clickable"
51 android:onClick="@{() -> toggleFtpState.invoke()}"
52 android:orientation="horizontal">
53
54 <LinearLayout
55 android:layout_width="wrap_content"
56 android:layout_height="wrap_content"
57 android:layout_weight="1"
58 android:orientation="vertical">
59
60 <TextView
61 style="@style/AppTheme.BlockTitle"
62 android:layout_width="wrap_content"
63 android:layout_height="wrap_content"
64 android:text="@string/configure_configuration_server_ftp_access" />
65
66 <TextView
67 style="@style/AppTheme.BlockContent"
68 android:layout_width="wrap_content"
69 android:layout_height="wrap_content"
70 android:text="@{ftpEnabled ? @string/configure_configuration_server_ftp_access_endpoint_format(ftpUsername, ftpPassword, ftpPort) : @string/configure_configuration_server_ftp_access_not_active}"
71 android:textIsSelectable="@{ftpEnabled}" />
72
73 </LinearLayout>
74
75 <androidx.appcompat.widget.SwitchCompat
76 android:layout_width="wrap_content"
77 android:layout_height="match_parent"
78 android:layout_weight="0"
79 android:checked="@{ftpEnabled}"
80 android:onClick="@{() -> toggleFtpState.invoke()}" />
81
82 </LinearLayout>
83
84 </LinearLayout>
85
86</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 @@
57 <string name="notification_error_channel_name">Ошибки</string> 57 <string name="notification_error_channel_name">Ошибки</string>
58 <string name="notification_error_action_open_manual">Открыть руководство</string> 58 <string name="notification_error_action_open_manual">Открыть руководство</string>
59 <string name="notification_error_title_unable_to_start_tinc">Не удалось запустить tinc</string> 59 <string name="notification_error_title_unable_to_start_tinc">Не удалось запустить tinc</string>
60 <string name="notification_error_title_unable_to_start_ftp_server">Не удалось запустить FTP-сервер</string>
61 <string name="notification_error_message_could_not_read_private_key_format">Не удалось прочитать закрытые ключи tinc:\n%1$s</string> 60 <string name="notification_error_message_could_not_read_private_key_format">Не удалось прочитать закрытые ключи tinc:\n%1$s</string>
62 <string name="notification_error_message_could_not_read_network_configuration_format">Не удалось прочитать конфигурацию сетевого интерфейса:\n%1$s</string> 61 <string name="notification_error_message_could_not_read_network_configuration_format">Не удалось прочитать конфигурацию сетевого интерфейса:\n%1$s</string>
63 <string name="notification_error_message_could_not_bind_iface">Не удалось привязать сетевой интерфейс. Запущен другой VPN?</string> 62 <string name="notification_error_message_could_not_bind_iface">Не удалось привязать сетевой интерфейс. Запущен другой VPN?</string>
@@ -70,10 +69,6 @@
70 <string name="notification_error_message_network_config_invalid_format">Недопустимая конфигурация сети в network.conf:\n%1$s</string> 69 <string name="notification_error_message_network_config_invalid_format">Недопустимая конфигурация сети в network.conf:\n%1$s</string>
71 <string name="notification_error_message_could_not_decrypt_private_keys_format">Не удалось расшифровать закрытые ключи:\n%1$s</string> 70 <string name="notification_error_message_could_not_decrypt_private_keys_format">Не удалось расшифровать закрытые ключи:\n%1$s</string>
72 71
73 <string name="notification_config_access_channel_name">Доступ к конфигурации</string>
74 <string name="notification_config_access_server_running_title">Сервер доступа к конфигурации активен</string>
75 <string name="notification_config_access_server_running_message">Каталог конфигурации доступен через FTP.</string>
76
77 <!-- Start activity --> 72 <!-- Start activity -->
78 <string name="start_activity_menu_configure">Конфигурировать</string> 73 <string name="start_activity_menu_configure">Конфигурировать</string>
79 <string name="start_network_list_warning_text">Трафик с этого устройства будет частично или полностью перенаправляться в выбранную сеть и через нее в соответствии с вашей конфигурацией. Никогда не подключайтесь к сети tinc, которой вы не доверяете.</string> 74 <string name="start_network_list_warning_text">Трафик с этого устройства будет частично или полностью перенаправляться в выбранную сеть и через нее в соответствии с вашей конфигурацией. Никогда не подключайтесь к сети tinc, которой вы не доверяете.</string>
@@ -85,11 +80,6 @@
85 <string name="configure_tools_message_invalid_network_name">Недопустимое имя сети.</string> 80 <string name="configure_tools_message_invalid_network_name">Недопустимое имя сети.</string>
86 <string name="configure_tools_message_network_configuration_written">Записана конфигурация сети.</string> 81 <string name="configure_tools_message_network_configuration_written">Записана конфигурация сети.</string>
87 82
88 <string name="configure_activity_title_configuration_access">Доступ к конфигурации</string>
89 <string name="configure_configuration_server_ftp_access">Доступ по FTP</string>
90 <string name="configure_configuration_server_ftp_access_endpoint_format">Пользователь: %1$s, пароль: %2$s, порт: %3$d</string>
91 <string name="configure_configuration_server_ftp_access_not_active">Не активный</string>
92
93 <string name="configure_activity_title_internal_paths_info">Информация о внутренних путях</string> 83 <string name="configure_activity_title_internal_paths_info">Информация о внутренних путях</string>
94 <string name="configure_path_info_title_configuration_directory">Каталог конфигурации</string> 84 <string name="configure_path_info_title_configuration_directory">Каталог конфигурации</string>
95 <string name="configure_path_info_title_log_directory">Каталог журналов</string> 85 <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 @@
62 <string name="notification_error_channel_name">Errors</string> 62 <string name="notification_error_channel_name">Errors</string>
63 <string name="notification_error_action_open_manual">Open manual</string> 63 <string name="notification_error_action_open_manual">Open manual</string>
64 <string name="notification_error_title_unable_to_start_tinc">Could not start tinc</string> 64 <string name="notification_error_title_unable_to_start_tinc">Could not start tinc</string>
65 <string name="notification_error_title_unable_to_start_ftp_server">Could not start FTP server</string>
66 <string name="notification_error_message_could_not_read_private_key_format">Could not read private tinc keys:\n%1$s</string> 65 <string name="notification_error_message_could_not_read_private_key_format">Could not read private tinc keys:\n%1$s</string>
67 <string name="notification_error_message_could_not_read_network_configuration_format">Could not read network interface configuration:\n%1$s</string> 66 <string name="notification_error_message_could_not_read_network_configuration_format">Could not read network interface configuration:\n%1$s</string>
68 <string name="notification_error_message_could_not_bind_iface">Could not bind network interface. Is another VPN running?</string> 67 <string name="notification_error_message_could_not_bind_iface">Could not bind network interface. Is another VPN running?</string>
@@ -75,10 +74,6 @@
75 <string name="notification_error_message_network_config_invalid_format">Invalid network configuration in network.conf:\n%1$s</string> 74 <string name="notification_error_message_network_config_invalid_format">Invalid network configuration in network.conf:\n%1$s</string>
76 <string name="notification_error_message_could_not_decrypt_private_keys_format">Could not decrypt private keys:\n%1$s</string> 75 <string name="notification_error_message_could_not_decrypt_private_keys_format">Could not decrypt private keys:\n%1$s</string>
77 76
78 <string name="notification_config_access_channel_name">Configuration access</string>
79 <string name="notification_config_access_server_running_title">Configuration access server active</string>
80 <string name="notification_config_access_server_running_message">The configuration directory is accessible through FTP.</string>
81
82 <!-- Start activity --> 77 <!-- Start activity -->