10 files changed, 3 insertions, 434 deletions

diff --git a/app/build.gradle b/app/build.gradle
index 5d2da3f..5d49965 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -71,17 +71,6 @@ android {
     dataBinding = true
   }
 
-  packagingOptions {
-    resources {
-      excludes += [
-        'META-INF/DEPENDENCIES',
-        'META-INF/spring.schemas',
-        'META-INF/spring.handlers',
-        'META-INF/license.txt',
-      ]
-    }
-  }
-
   namespace 'org.pacien.tincapp'
 }
 
@@ -101,7 +90,6 @@ dependencies {
   implementation('org.apache.commons:commons-configuration2:2.3') { exclude group: 'commons-logging', module: 'commons-logging' }
   implementation('commons-beanutils:commons-beanutils:1.9.3') { exclude group: 'commons-logging', module: 'commons-logging' }
   implementation('commons-io:commons-io:2.6') { exclude group: 'commons-logging', module: 'commons-logging' }
-  implementation('org.apache.ftpserver:ftpserver:1.1.1') { exclude group: 'org.slf4j', module: 'slf4j-log4j12' }
 }
 
 repositories {
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index ffbb3e3..2bb4a71 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -1,5 +1,5 @@
 # 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
@@ -15,8 +15,6 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 -keep class org.apache.commons.** { *; }
--keep class org.apache.mina.** { *; }
--keep class org.apache.ftpserver.** { *; }
 -keep class org.bouncycastle.**
 -keep class ch.qos.** { *; }
 -keep class org.slf4j.** { *; }
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
         ))