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/AndroidManifest.xml                   |   7 -
 .../configure/ConfigurationAccessServerFragment.kt |  77 --------
 .../tincapp/context/AppNotificationManager.kt      |  13 --
 .../tincapp/service/ConfigurationAccessService.kt  | 204 ---------------------
 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 -
 8 files changed, 2 insertions(+), 419 deletions(-)
 delete mode 100644 app/src/main/java/org/pacien/tincapp/activities/configure/ConfigurationAccessServerFragment.kt
 delete mode 100644 app/src/main/java/org/pacien/tincapp/service/ConfigurationAccessService.kt
 delete mode 100644 app/src/main/res/layout/configure_tools_configuration_access_fragment.xml

(limited to 'app/src')

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8d71109..827f421 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -26,9 +26,6 @@
     <!-- required for VPN service error reporting, since API 33 -->
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 
-    <!-- needed for the configuration FTP server -->
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-
     <!-- workaround for broken file permissions on some Android ROMs -->
     <uses-permission-sdk-23 android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
@@ -91,10 +88,6 @@
             </intent-filter>
         </service>
 
-        <service
-            android:name="org.pacien.tincapp.service.ConfigurationAccessService">
-        </service>
-
     </application>
 
 </manifest>
diff --git a/app/src/main/java/org/pacien/tincapp/activities/configure/ConfigurationAccessServerFragment.kt b/app/src/main/java/org/pacien/tincapp/activities/configure/ConfigurationAccessServerFragment.kt
deleted file mode 100644
index c90299a..0000000
--- a/app/src/main/java/org/pacien/tincapp/activities/configure/ConfigurationAccessServerFragment.kt
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * 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/>.
- */
-
-package org.pacien.tincapp.activities.configure
-
-import android.content.Intent
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.databinding.Observable
-import androidx.databinding.ObservableBoolean
-import org.pacien.tincapp.activities.BaseFragment
-import org.pacien.tincapp.databinding.ConfigureToolsConfigurationAccessFragmentBinding
-import org.pacien.tincapp.service.ConfigurationAccessService
-
-/**
- * @author pacien
- */
-class ConfigurationAccessServerFragment : BaseFragment() {
-  private val ftpServerStartListener = object : Observable.OnPropertyChangedCallback() {
-    override fun onPropertyChanged(sender: Observable, propertyId: Int) {
-      binding.ftpEnabled = (sender as ObservableBoolean).get()
-    }
-  }
-
-  private lateinit var binding: ConfigureToolsConfigurationAccessFragmentBinding
-
-  override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-    binding = ConfigureToolsConfigurationAccessFragmentBinding.inflate(inflater, container, false)
-    binding.toggleFtpState = { toggleServer() }
-    setConnectionInfo()
-    return binding.root
-  }
-
-  override fun onResume() {
-    super.onResume()
-    setConnectionInfo()
-    ConfigurationAccessService.runningState.addOnPropertyChangedCallback(ftpServerStartListener)
-    binding.ftpEnabled = ConfigurationAccessService.runningState.get()
-  }
-
-  override fun onPause() {
-    ConfigurationAccessService.runningState.removeOnPropertyChangedCallback(ftpServerStartListener)
-    super.onPause()
-  }
-
-  private fun setConnectionInfo() {
-    binding.ftpUsername = ConfigurationAccessService.getFtpUsername()
-    binding.ftpPassword = ConfigurationAccessService.getFtpPassword()
-    binding.ftpPort = ConfigurationAccessService.getFtpPort()
-  }
-
-  private fun toggleServer() {
-    val targetServiceIntent = Intent(requireContext(), ConfigurationAccessService::class.java)
-
-    if (binding.ftpEnabled)
-      requireContext().stopService(targetServiceIntent)
-    else
-      requireContext().startService(targetServiceIntent)
-  }
-}
diff --git a/app/src/main/java/org/pacien/tincapp/context/AppNotificationManager.kt b/app/src/main/java/org/pacien/tincapp/context/AppNotificationManager.kt
index 5b01a54..d6e21f5 100644
--- a/app/src/main/java/org/pacien/tincapp/context/AppNotificationManager.kt
+++ b/app/src/main/java/org/pacien/tincapp/context/AppNotificationManager.kt
@@ -36,10 +36,7 @@ import org.pacien.tincapp.utils.PendingIntentUtils
 class AppNotificationManager(private val context: Context) {
   companion object {
     private const val ERROR_CHANNEL_ID = "org.pacien.tincapp.notification.channels.error"
-    private const val CONFIG_ACCESS_CHANNEL_ID = "org.pacien.tincapp.notification.channels.configuration"
-
     const val ERROR_NOTIFICATION_ID = 0
-    const val CONFIG_ACCESS_NOTIFICATION_ID = 1
   }
 
   init {
@@ -65,9 +62,6 @@ class AppNotificationManager(private val context: Context) {
     NotificationManagerCompat.from(context).cancelAll()
   }
 
-  fun newConfigurationAccessNotificationBuilder() =
-    NotificationCompat.Builder(context, CONFIG_ACCESS_CHANNEL_ID)
-
   @RequiresApi(Build.VERSION_CODES.O)
   private fun registerChannels() {
     context.getSystemService(NotificationManager::class.java)
@@ -78,13 +72,6 @@ class AppNotificationManager(private val context: Context) {
           NotificationManager.IMPORTANCE_HIGH
         ))
       }
-      .apply {
-        createNotificationChannel(NotificationChannel(
-          CONFIG_ACCESS_CHANNEL_ID,
-          context.getString(R.string.notification_config_access_channel_name),
-          NotificationManager.IMPORTANCE_MIN
-        ))
-      }
   }
 
   private fun NotificationCompat.Builder.setHighPriority() = apply {
diff --git a/app/src/main/java/org/pacien/tincapp/service/ConfigurationAccessService.kt b/app/src/main/java/org/pacien/tincapp/service/ConfigurationAccessService.kt
deleted file mode 100644
index 916f19d..0000000
--- a/app/src/main/java/org/pacien/tincapp/service/ConfigurationAccessService.kt
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
- * 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
- * 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/>.
- */
-
-package org.pacien.tincapp.service
-
-import android.app.Service
-import android.content.Context
-import android.content.Intent
-import android.os.IBinder
-import androidx.databinding.ObservableBoolean
-import ch.qos.logback.classic.Level
-import ch.qos.logback.classic.Logger
-import org.apache.ftpserver.ConnectionConfigFactory
-import org.apache.ftpserver.DataConnectionConfigurationFactory
-import org.apache.ftpserver.FtpServer
-import org.apache.ftpserver.FtpServerFactory
-import org.apache.ftpserver.ftplet.*
-import org.apache.ftpserver.listener.ListenerFactory
-import org.apache.ftpserver.usermanager.UsernamePasswordAuthentication
-import org.apache.ftpserver.usermanager.impl.WritePermission
-import org.pacien.tincapp.R
-import org.pacien.tincapp.activities.configure.ConfigureActivity
-import org.pacien.tincapp.context.App
-import org.pacien.tincapp.context.AppNotificationManager
-import org.pacien.tincapp.extensions.Java.defaultMessage
-import org.pacien.tincapp.utils.PendingIntentUtils
-import org.slf4j.LoggerFactory
-import java.io.IOException
-
-/**
- * FTP server service allowing a remote and local user to access and modify configuration files in
- * the application's context.
- *
- * @author pacien
- */
-class ConfigurationAccessService : Service() {
-  companion object {
-    // Apache Mina FtpServer's INFO log level is actually VERBOSE.
-    // The object holds static references to those loggers so that they stay around.
-    @Suppress("unused")
-    private val MINA_FTP_LOGGER_OVERRIDER = MinaLoggerOverrider(Level.WARN)
-
-    private val context by lazy { App.getContext() }
-    private val store by lazy { context.getSharedPreferences("${this::class.java.`package`!!.name}.ftp", Context.MODE_PRIVATE)!! }
-    val runningState = ObservableBoolean(false)
-
-    fun getFtpHomeDir(): String = context.applicationInfo.dataDir!!
-    fun getFtpUsername() = storeGetOrInsertString("username") { "tincapp" }
-    fun getFtpPassword() = storeGetOrInsertString("password") { generateRandomString(8) }
-    fun getFtpPort() = storeGetOrInsertInt("port") { 65521 } // tinc port `concat` FTP port
-    fun getFtpPassiveDataPorts() = storeGetOrInsertString("passive-range") { "65522-65532" }
-
-    private fun storeGetOrInsertString(key: String, defaultGenerator: () -> String): String = synchronized(store) {
-      if (!store.contains(key)) store.edit().putString(key, defaultGenerator()).apply()
-      return store.getString(key, null)!!
-    }
-
-    private fun storeGetOrInsertInt(key: String, defaultGenerator: () -> Int): Int = synchronized(store) {
-      if (!store.contains(key)) store.edit().putInt(key, defaultGenerator()).apply()
-      return store.getInt(key, 0)
-    }
-
-    private fun generateRandomString(length: Int): String {
-      val alphabet = ('a'..'z') + ('A'..'Z') + ('0'..'9')
-      return List(length) { alphabet.random() }.joinToString("")
-    }
-  }
-
-  private val log by lazy { LoggerFactory.getLogger(this.javaClass)!! }
-  private val notificationManager by lazy { App.notificationManager }
-  private var sftpServer: FtpServer? = null
-
-  override fun onBind(intent: Intent): IBinder? = null // non-bindable service
-
-  override fun onDestroy() {
-    sftpServer?.stop()
-    sftpServer = null
-    runningState.set(false)
-    log.info("Stopped FTP server")
-    super.onDestroy()
-  }
-
-  override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
-    val ftpUser = StaticFtpUser(getFtpUsername(), getFtpPassword(), getFtpHomeDir(), listOf(WritePermission()))
-    sftpServer = setupSingleUserServer(ftpUser, getFtpPort(), getFtpPassiveDataPorts()).also {
-      try {
-        it.start()
-        runningState.set(true)
-        log.info("Started FTP server on port {}", getFtpPort())
-        pinInForeground()
-      } catch (e: IOException) {
-        log.error("Could not start FTP server", e)
-        App.alert(R.string.notification_error_title_unable_to_start_ftp_server, e.defaultMessage())
-      }
-    }
-
-    return START_NOT_STICKY
-  }
-
-  /**
-   * Pins the service in the foreground so that it doesn't get stopped by the system when the
-   * application's activities are put in the background, which is the case when the user sets the
-   * focus on an FTP client app for example.
-   */
-  private fun pinInForeground() {
-    startForeground(
-      AppNotificationManager.CONFIG_ACCESS_NOTIFICATION_ID,
-      notificationManager.newConfigurationAccessNotificationBuilder()
-        .setSmallIcon(R.drawable.ic_baseline_folder_open_primary_24dp)
-        .setContentTitle(resources.getString(R.string.notification_config_access_server_running_title))
-        .setContentText(resources.getString(R.string.notification_config_access_server_running_message))
-        .setContentIntent(Intent(this, ConfigureActivity::class.java).let {
-          PendingIntentUtils.getActivity(this, 0, it, 0)
-        })
-        .build()
-    )
-  }
-
-  private fun setupSingleUserServer(ftpUser: User, ftpPort: Int, ftpPassivePorts: String): FtpServer =
-    FtpServerFactory()
-      .apply {
-        addListener("default", ListenerFactory()
-          .apply {
-            connectionConfig = ConnectionConfigFactory()
-              .apply { maxThreads = 1 } // library has issues with multiple threads
-              .createConnectionConfig()
-          }
-          .apply { port = ftpPort }
-          .apply {
-            dataConnectionConfiguration = DataConnectionConfigurationFactory()
-              .apply { passivePorts = ftpPassivePorts }
-              .createDataConnectionConfiguration()
-          }
-          .createListener()
-        )
-      }
-      .apply { userManager = StaticFtpUserManager(listOf(ftpUser)) }
-      .createServer()
-
-  private class StaticFtpUserManager(users: List<User>) : UserManager {
-    private val userMap: Map<String, User> = users.map { it.name to it }.toMap()
-    override fun getUserByName(username: String?): User? = userMap[username]
-    override fun getAllUserNames(): Array<String> = userMap.keys.toTypedArray()
-    override fun doesExist(username: String?): Boolean = username in userMap
-    override fun delete(username: String?) = throw UnsupportedOperationException()
-    override fun save(user: User?) = throw UnsupportedOperationException()
-    override fun getAdminName(): String = throw UnsupportedOperationException()
-    override fun isAdmin(username: String?): Boolean = throw UnsupportedOperationException()
-    override fun authenticate(authentication: Authentication?): User = when (authentication) {
-      is UsernamePasswordAuthentication -> getUserByName(authentication.username).let {
-        if (it != null && authentication.password == it.password) it
-        else throw AuthenticationFailedException()
-      }
-      else -> throw IllegalArgumentException()
-    }
-  }
-
-  private data class StaticFtpUser(
-    private val name: String,
-    private val password: String,
-    private val homeDirectory: String,
-    private val authorities: List<Authority>
-  ) : User {
-    override fun getName(): String = name
-    override fun getPassword(): String = password
-    override fun getAuthorities(): List<Authority> = authorities
-    override fun getAuthorities(clazz: Class<out Authority>): List<Authority> = authorities.filter(clazz::isInstance)
-    override fun getMaxIdleTime(): Int = 0 // unlimited
-    override fun getEnabled(): Boolean = true
-    override fun getHomeDirectory(): String = homeDirectory
-    override fun authorize(request: AuthorizationRequest?): AuthorizationRequest? =
-      authorities.filter { it.canAuthorize(request) }.fold(request) { req, auth -> auth.authorize(req) }
-  }
-
-  /**
-   * This registers package loggers filtering the output of the Mina FtpServer.
-   * The object holds static references to those loggers so that they stay around.
-   */
-  private class MinaLoggerOverrider(logLevel: Level) {
-    @Suppress("unused")
-    private val ftpServerLogger = forceLogLevel("org.apache.ftpserver", logLevel)
-
-    @Suppress("unused")
-    private val minaLogger = forceLogLevel("org.apache.mina", logLevel)
-
-    private fun forceLogLevel(pkgName: String, logLevel: Level) =
-      (LoggerFactory.getLogger(pkgName) as Logger).apply { level = logLevel }
-  }
-}
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