Changes per PR feedback

Author: TranceLove

app/src/main/java/com/amaze/filemanager/asynchronous/services/ftp/AppFtpReceiver.kt

@@ -21,12 +21,13 @@
 package com.amaze.filemanager.asynchronous.services.ftp
 
 import com.amaze.filemanager.ftpserver.service.FtpReceiver
+import com.amaze.filemanager.ftpserver.service.FtpServerService
 
 /**
  * Concrete implementation of FtpReceiver for the Amaze File Manager app.
  *
  * This receiver handles start/stop intents for the FTP server service.
  */
 class AppFtpReceiver : FtpReceiver() {
-    override fun getFtpServiceClass(): Class<*> = AppFtpService::class.java
+    override fun getFtpServiceClass(): Class<out FtpServerService> = AppFtpService::class.java
 }

app/src/main/java/com/amaze/filemanager/asynchronous/services/ftp/AppFtpService.kt

@@ -38,14 +38,19 @@ import java.io.InputStream
 import java.security.GeneralSecurityException
 
 /**
- * Concrete implementation of FtpServerService for the Amaze File Manager app.
+ * Concrete implementation of [FtpServerService].
  *
  * This class provides app-specific implementations for notifications, keystore access,
  * password decryption, and error messages.
  */
 class AppFtpService : FtpServerService() {
+    companion object {
+        @JvmStatic
+        private val log: Logger = LoggerFactory.getLogger(AppFtpService::class.java)
+    }
+
     private val serverNotification
-        get() = ServerRegistry.getProvider(ServerType.FTP)!!.getNotification()
+        get() = requireNotNull(ServerRegistry.getProvider(ServerType.FTP)).getNotification()
 
     override fun getNotificationId(): Int = serverNotification.getNotificationId()
 
@@ -109,9 +114,4 @@ class AppFtpService : FtpServerService() {
     override fun getFeatResponse(): String {
         return getString(R.string.ftp_command_FEAT)
     }
-
-    companion object {
-        @JvmStatic
-        private val log: Logger = LoggerFactory.getLogger(AppFtpService::class.java)
-    }
 }

app/src/main/java/com/amaze/filemanager/database/typeconverters/JsonTypeConverter.kt

@@ -425,7 +425,7 @@ class FtpServerFragment : Fragment(R.layout.fragment_ftp) {
                 ServerRegistry.getProvider(ServerType.FTP)
                     ?.getNotification()
                     ?.updateRunningNotification(
-                        context ?: return,
+                        requireContext() ?: return,
                         FtpServerEvent.StartedFromTile == signal,
                     )
             }
@@ -646,7 +646,7 @@ class FtpServerFragment : Fragment(R.layout.fragment_ftp) {
                 statusText.text = spannedStatusNotRunning
                 ftpBtn.isEnabled = true
             }
-            url.text = "URL: "
+            url.text = getString(com.amaze.filemanager.ftpserver.R.string.ftpmod_url_label, "")
             ftpBtn.text = resources.getString(R.string.start_ftp).uppercase()
         } else {
             accentColor = mainActivity.accent
@@ -740,9 +740,12 @@ class FtpServerFragment : Fragment(R.layout.fragment_ftp) {
 
     private fun resetFTPPath() {
         mainActivity.prefs
-            .edit()
-            .putString(FtpPreferences.KEY_PREFERENCE_PATH, FtpPreferences.defaultPath(requireContext()))
-            .apply()
+            .edit {
+                putString(
+                    FtpPreferences.KEY_PREFERENCE_PATH,
+                    FtpPreferences.defaultPath(requireContext()),
+                )
+            }
     }
 
     /** Updates the status spans  */
@@ -766,7 +769,7 @@ class FtpServerFragment : Fragment(R.layout.fragment_ftp) {
             )
         spannedStatusUrl =
             HtmlCompat.fromHtml(
-                "URL: $ftpAddress",
+                getString(com.amaze.filemanager.ftpserver.R.string.ftpmod_url_label, ftpAddress),
                 FROM_HTML_MODE_COMPACT,
             )
         spannedStatusNoConnection =
@@ -791,11 +794,6 @@ class FtpServerFragment : Fragment(R.layout.fragment_ftp) {
                     "${resources.getString(R.string.ftp_status_secure_connection)}</font></b>",
                 FROM_HTML_MODE_COMPACT,
             )
-        spannedStatusUrl =
-            HtmlCompat.fromHtml(
-                "URL:&nbsp;$ftpAddress",
-                FROM_HTML_MODE_COMPACT,
-            )
     }
 
     private fun initLoginDialogViews(loginDialogView: DialogFtpLoginBinding) {

app/src/main/java/com/amaze/filemanager/ui/fragments/FtpServerFragment.kt

@@ -86,7 +86,7 @@ object PreferencesConstants {
     const val PREFERENCE_REGEX = "regex"
     const val PREFERENCE_REGEX_MATCHES = "matches"
 
-    // ftp preferences (shared key with FtpPreferences in ftpserver module)
+    // ftp preferences
     const val PREFERENCE_FTP_BATTERY_OPTIMIZATION_ASKED = "ftp_battery_optimization_asked"
 
     // security_prefs.xml

app/src/main/java/com/amaze/filemanager/ui/fragments/preferencefragments/PreferencesConstants.kt

@@ -701,8 +701,10 @@
     <string name="choose_folder">Choose This Folder</string>
     <string name="folder_go_up_one_level" translatable="false">..</string>
     <string name="some_files_failed_invalid_operation">Some files failed due to invalid operation</string>
+    <string name="ftp_readonly">Read-only access</string>
     <string name="ftp_server_prompt_connect_to_network">Connect to a network or enable AP</string>
     <string name="ftp_server_open_settings">Open settings</string>
+    <string name="ftp_prompt_restart_server">You will need to restart the FTP server for changes to take effect.</string>
     <string name="move">Move</string>
     <string name="select_save_location">Select location to save</string>
     <string name="scp_default_path">Default Path (Optional)</string>
@@ -735,11 +737,9 @@
     <string name="choose_different_app">Choose different application</string>
     <string name="clear_open_file">Clear cache</string>
     <string name="clear_open_file_summary">Clears selected default file opening apps</string>
-    <string name="ftp_readonly">Read-only access</string>
     <string name="legacy_listing_title">Use legacy listing for root</string>
     <string name="legacy_listing_summary">If enabled, uses legacy method to list files</string>
     <string name="error_unsupported_v5_rar">RAR archive \"%s\" is unsupported RAR v5 archive.</string>
-    <string name="ftp_prompt_restart_server">You will need to restart the FTP server for changes to take effect.</string>
     <string name="error_permission_denied">Permission denied</string>
     <string name="error_archive_password_incorrect">Wrong archive password.</string>
     <string name="error_archive_cannot_extract">Cannot extract archive entry \"%s\" to \"%s\".</string>
@@ -766,7 +766,7 @@ You only need to do this once, until the next time you select a new location for
     <string name="ftp_battery_optimization_action_settings">Open Settings</string>
     <string name="ftp_battery_optimization_action_skip">Skip</string>
     <string name="ftp_battery_optimization_action_dont_ask">Don\'t ask again</string>
-    <string name="ftp_battery_optimization_tile_warning">Battery optimization is enabled — FTP server may be stopped by the OS</string>
+    <string name="ftp_battery_optimization_tile_warning">Battery optimization is enabled. You may experience lower transfer speeds when using the FTP server.</string>
     <string name="ftp_battery_optimization_pref_title">Disable battery optimization prompt</string>
     <string name="ftp_battery_optimization_pref_summary">Skip battery optimization reminder when starting the FTP server</string>
     <string name="ftp_server_preferences">FTP Server</string>

app/src/main/res/values/strings.xml

@@ -21,7 +21,9 @@
 package com.amaze.filemanager.ftpserver.commands
 
 import com.amaze.filemanager.ftpserver.filesystem.AndroidFileSystemFactory
+import com.amaze.filemanager.ftpserver.filesystem.RootFileSystemFactory
 import org.apache.ftpserver.command.AbstractCommand
+import org.apache.ftpserver.filesystem.nativefs.NativeFileSystemFactory
 import org.apache.ftpserver.ftplet.DefaultFtpReply
 import org.apache.ftpserver.ftplet.FtpFile
 import org.apache.ftpserver.ftplet.FtpReply.REPLY_213_FILE_STATUS
@@ -38,7 +40,7 @@ import java.io.File
 /**
  * Implements FTP extension AVBL command, to answer device remaining space in FTP command.
  *
- * Only supports RootFileSystemFactory and NativeFileSystemFactory. Otherwise will simply return
+ * Only supports [RootFileSystemFactory] and [NativeFileSystemFactory]. Otherwise will simply return
  * 550 Access Denied.
  *
  * See [Draft spec](https://www.ietf.org/archive/id/draft-peterson-streamlined-ftp-command-extensions-10.txt)

ftpserver/src/main/java/com/amaze/filemanager/ftpserver/commands/AVBL.kt

@@ -28,7 +28,7 @@ import org.apache.ftpserver.impl.FtpIoSession
 import org.apache.ftpserver.impl.FtpServerContext
 
 /**
- * Custom FEAT command to add AVBL command to the list.
+ * Custom [org.apache.ftpserver.command.impl.FEAT] command to add [AVBL] command to the list.
  */
 class FEAT(
     private val featResponseProvider: () -> String,

ftpserver/src/main/java/com/amaze/filemanager/ftpserver/commands/FEAT.kt

@@ -27,12 +27,12 @@ import org.apache.ftpserver.command.CommandFactory
 import org.apache.ftpserver.command.CommandFactoryFactory
 
 /**
- * Custom CommandFactory factory with custom commands.
+ * Custom [CommandFactory] factory with custom commands.
  */
 object FtpCommandFactoryFactory {
     /**
-     * Encapsulate custom CommandFactory construction logic. Append custom AVBL and PWD command,
-     * as well as feature flag in FEAT command if not using AndroidFtpFileSystemView.
+     * Encapsulate custom [CommandFactory] construction logic. Append custom [AVBL] and [PWD] command,
+     * as well as feature flag in [FEAT] command if not using AndroidFtpFileSystemView.
      */
     fun create(
         useAndroidFileSystem: Boolean,

ftpserver/src/main/java/com/amaze/filemanager/ftpserver/service/FtpCommandFactoryFactory.kt

@@ -24,29 +24,22 @@ import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
 
 /**
- * Event bus for FTP server events using Kotlin's Flow.
+ * Replacement event bus to handle [FtpServerService] events using Kotlin's Flow.
+ *
+ * Original idea: https://mirchev.medium.com/its-21st-century-stop-using-eventbus-3ff5d9c6a00f
+ *
+ * @see [FtpServerService]
  */
 object FtpEventBus {
     private val _events = MutableSharedFlow<FtpServerEvent>(replay = 0)
     val events = _events.asSharedFlow()
 
     /**
      * Emit the event signal to the event bus.
+     *
+     * @param event The event to be emitted.
      */
     suspend fun emit(event: FtpServerEvent) {
         _events.emit(event)
     }
 }
-
-/**
- * Events broadcast when FTP server state changes.
- */
-sealed class FtpServerEvent {
-    data object Started : FtpServerEvent()
-
-    data object StartedFromTile : FtpServerEvent()
-
-    data object Stopped : FtpServerEvent()
-
-    data object FailedToStart : FtpServerEvent()
-}