Make FTP server a separate module by TranceLove · Pull Request #4602 · TeamAmaze/AmazeFileManager

TranceLove · 2026-04-11T01:50:43Z

Description

Make FTP server a separate module, coupled via another server-core module, for facilitating integrations in the future.

Issue tracker

Automatic tests

Added test cases

Manual tests

Done

Build tasks success

Successfully running following tasks on local:

./gradlew assembledebug
./gradlew spotlessCheck

- Replace EventBus with kotlinx.coroutines - FtpServerFragment update code to recommended

This enables future integration of other file services more easier.

Copilot

Pull request overview

This PR modularizes the FTP server feature by extracting it from the app module into a dedicated ftpserver library, coupled through a new server-core abstraction module to support future pluggable server implementations.

Changes:

Added new Gradle modules: server-core (server abstractions/registry) and ftpserver (FTP implementation: engine, service/receiver base classes, filesystem adapters, UI, resources).
Updated app integration to use the new FTP module (new AppFtpService/AppFtpReceiver, updated fragment/tile/notification to reference FtpPreferences/FtpServerEngine).
Added unit tests for FTP custom commands (AVBL/FEAT/PWD) and updated Kotlin stdlib version.

Reviewed changes

Copilot reviewed 62 out of 63 changed files in this pull request and generated 15 comments.

Show a summary per file

File	Description
settings.gradle	Includes the new `server-core` and `ftpserver` modules.
server-core/**	Introduces server abstractions (types, preferences/notification interfaces, registry, events) and module Gradle config.
ftpserver/**	New FTP module: engine/service base, filesystem implementations, UI/resources, and unit tests.
app/**	Wires the app to the new FTP module (service/receiver, fragment, tile, notification) and adds a WebDAV certificate callable/test.
gradle/libs.versions.toml	Updates Kotlin stdlib version used by the project.
file_operations/src/test/**	Adds/updates a (currently empty/commented) test helper class.
app/play/release/output-metadata.json	Adds a generated build artifact (should likely not be committed).
plan-modularizeFtpServer.prompt.md	Planning documentation for the modularization work.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

SshAuthenticationTaskTest.prepareSshConnectionPool() was storing a raw SSHClient Mockito mock directly into NetCopyClientConnectionPool.connections without wrapping it in SSHClientImpl. This caused a ClassCastException when shutdown() was called in AbstractSftpServerTest.tearDown(), since the lambda tried to cast the raw SSHClient (which is not a NetCopyClient) to NetCopyClient. The unhandled exception from the fire-and-forget runInBackground call was then rethrown as OnErrorNotImplementedException, leaving connections un-cleared. On the next test's setUp() call, the stale connection from SshAuthenticationTaskTest was still present in the pool. When validate() found it invalid and tried to reconnect via createSshClient(url), it required a DB lookup that found no matching entry (because the SshAuthenticationTaskTest connection used a different URL), causing FilesOnSshdTest.testListFilesWithSpecialChars to time out waiting for SFTP results. Fixes: - Wrap mock SSHClient in SSHClientImpl in prepareSshConnectionPool() so the connections map always holds proper NetCopyClient instances - Add tearDown() to SshAuthenticationTaskTest to reset sshClientFactory and clear the connections map after each test, preventing state leakage - Add sshClientFactory reset in AbstractSftpServerTest.setUp() as an additional safeguard against contamination from any preceding test class - Minor: refactor FilesOnSshdTest to use SAM lambda syntax for OnFileFound callbacks; extend atMost timeout to 120 seconds for testListFilesWithSpecialChars

To complete the registry base approach

Bambooin · 2026-04-18T04:11:56Z

Verified in Android 16 with daily FTP usage.

EmmanuelMess

I still need to check some files and all the tests.
Also, I am not quite understanding the separation of concerns between app, ftpserver and server-core or if the server-core functionality is actually completely already in use.

EmmanuelMess · 2026-04-18T16:27:50Z

+/**
+ * [TypeConverter] between [JSONObject] as object and String representation.
+ */
+object JsonTypeConverter {


This seems reduntant?

EmmanuelMess · 2026-04-18T16:29:39Z

+    /**
+     * Get the FTP service class to start/stop
+     */
+    abstract fun getFtpServiceClass(): Class<*>


This should be out FtpServerService.

EmmanuelMess · 2026-04-18T16:30:16Z

+        context: Context,
+        intent: Intent,
+    ) {
+        logger.debug("Received: ${intent.action}")


Remove all debug logs

EmmanuelMess · 2026-04-18T16:33:51Z

+ */
+class AppFtpService : FtpServerService() {
+    private val serverNotification
+        get() = ServerRegistry.getProvider(ServerType.FTP)!!.getNotification()


Please don't use !! in new code.

EmmanuelMess · 2026-04-18T16:36:59Z

+        return getString(R.string.ftp_command_FEAT)
+    }
+
+    companion object {


Companion object should be on top.

EmmanuelMess · 2026-04-18T17:56:49Z

+ *
+ * Each server module should implement this to provide its components.
+ */
+interface ServerProvider {


This should probably be in another file.

EmmanuelMess · 2026-04-18T17:58:02Z

+ *
+ * Each server module should implement this to provide its components.
+ */
+interface ServerProvider {


Very similar to FileServer (see comment there).

EmmanuelMess · 2026-04-18T17:58:24Z

+ * Each server implementation should provide its own implementation of this interface
+ * to handle server lifecycle and configuration.
+ */
+interface FileServer {


Very similar to ServerProvider, not sure what "server lifecycle and configuration." means in this case.

EmmanuelMess · 2026-04-18T18:00:08Z

This should be in some llm specific folder somewhere. See https://github.com/EmmanuelMess/Multistep-DEVS-Simulator .claude and spec files folders for ideas.

Also its current structure might not be useful, useful information would be:

restrictions applied to the llm in code creation

specfic set of specifications passed, initially and during refinement. Including UI/UX design files and diagrams

a review of code of llm, and changed that were manually applied later

EmmanuelMess · 2026-04-18T18:03:49Z

+│       ├── ServerPreferences.kt
+│       └── ServerRegistry.kt
+
+ftpserver/


If possible this is better as a UML diagram of classes and such, not a semi formatted list. See https://github.com/EmmanuelMess/Multistep-DEVS-Simulator/blob/master/design/class%20diagrams/class%20diagram.svg for an example.

To prompt users to disable battery optimization for better network I/O performance when running FTP server. Fixes TeamAmaze#4603

TranceLove added 3 commits April 11, 2026 09:23

FTP server minor improvements

6fc52c0

- Replace EventBus with kotlinx.coroutines - FtpServerFragment update code to recommended

Migrate ftpserver to separate module

778db40

This enables future integration of other file services more easier.

Move tests to ftpserver module and deprecate classes in app module

b21cc6f

TranceLove requested a review from Copilot April 11, 2026 01:51

Copilot started reviewing on behalf of TranceLove April 11, 2026 01:51 View session

Copilot AI reviewed Apr 11, 2026

View reviewed changes

More moves

3f5f898

TranceLove force-pushed the feature/ftpserver-module branch 3 times, most recently from cbc759a to ed9a33d Compare April 11, 2026 16:18

Changes per PR feedback and fix Codacy errors

9f9a3f0

TranceLove force-pushed the feature/ftpserver-module branch from ed9a33d to 9f9a3f0 Compare April 11, 2026 16:27

TranceLove added 2 commits April 12, 2026 00:48

Remove redundant classes after the move

a6e8ded

TranceLove force-pushed the feature/ftpserver-module branch from 9d063ea to f49db29 Compare April 12, 2026 03:36

TranceLove added 2 commits April 13, 2026 22:58

Changes per PR feedback (again)

25a9058

Wire FtpServerProvider into ServerRegistry

f3a702a

TranceLove force-pushed the feature/ftpserver-module branch 3 times, most recently from 1abd5de to 640126d Compare April 14, 2026 23:19

Migrate from FtpNotification to FtpServerNotification.kt

502d11a

To complete the registry base approach

TranceLove force-pushed the feature/ftpserver-module branch from 640126d to 502d11a Compare April 14, 2026 23:21

TranceLove marked this pull request as ready for review April 14, 2026 23:23

TranceLove force-pushed the feature/ftpserver-module branch from a60a1de to 94a6a98 Compare April 16, 2026 14:55

EmmanuelMess self-requested a review April 18, 2026 16:04

EmmanuelMess requested changes Apr 18, 2026

View reviewed changes

EmmanuelMess added the PR-Requested-Changes this PR is awaiting an update from the author label Apr 18, 2026

EmmanuelMess marked this pull request as draft April 18, 2026 18:05

Add battery optimization prompt

b22a5e2

To prompt users to disable battery optimization for better network I/O performance when running FTP server. Fixes TeamAmaze#4603

TranceLove force-pushed the feature/ftpserver-module branch from 94a6a98 to b22a5e2 Compare May 1, 2026 14:01

Uh oh!

Conversation

TranceLove commented Apr 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Issue tracker

Automatic tests

Manual tests

Build tasks success

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Bambooin commented Apr 18, 2026

Uh oh!

EmmanuelMess left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

TranceLove commented Apr 11, 2026 •

edited

Loading