From 729388de4aeee976428be6c29caa4025a5ee2f08 Mon Sep 17 00:00:00 2001 From: sisterfuture Date: Wed, 13 May 2026 16:14:23 +0800 Subject: [PATCH] Fix STOR command reply message: improve client compatibility --- .../ftpserver/lib/ControlConnectHandler.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/builtinftp/src/main/java/com/stupidbeauty/ftpserver/lib/ControlConnectHandler.java b/builtinftp/src/main/java/com/stupidbeauty/ftpserver/lib/ControlConnectHandler.java index fbf22c4..f736c1a 100644 --- a/builtinftp/src/main/java/com/stupidbeauty/ftpserver/lib/ControlConnectHandler.java +++ b/builtinftp/src/main/java/com/stupidbeauty/ftpserver/lib/ControlConnectHandler.java @@ -93,8 +93,8 @@ public class ControlConnectHandler implements DataServerManagerInterface private DocumentFile writingFile; //!< 当前正在写入的文件。 private ParcelFileDescriptor pfd = null; private FileOutputStream fileOutputStream = null; - private long totalWritten = 0; // 用于速度统计 - private long lastLogTime = 0; // 用于速度统计 + private long totalWritten = 0; //! 用于速度统计 + private long lastLogTime = 0; //! 用于速度统计 private DocumentFile renamingFile; //!< The file being renamed. private boolean isUploading=false; //!< 是否正在上传。陈欣 @@ -300,7 +300,7 @@ public void onConnectCompleted(Exception ex, final AsyncSocket socket) logDebug("CONNECT_TO_CLIENT", "port=" + port); // [DEBUG] } // private void connectToClientDataPort() - + /** * 打开指向客户端特定端口的连接。 */ @@ -572,7 +572,7 @@ private void processRetrCommand(String data51) */ private void processStorCommand(String data51) { - String replyString="150 "; // 回复内容。 + String replyString="150 Opening data connection for STOR"; // 回复内容。 boolean storStartResult = startStor(data51, currentWorkingDirectory); // Start stor process. @@ -925,6 +925,7 @@ private void processRntoCommand(String data51) } // else // rename failed + // Chen xin. remove cache DocumentFile. // Chen xin @@ -1310,7 +1311,7 @@ else if (command.equalsIgnoreCase("MKD")) // 创建目录 Log.d(TAG, "reply string: " + replyString); //Debug. - binaryStringSender.sendStringInBinaryMode(replyString); // 回复。 + binaryStringSender.sendStringInBinaryMode(replyString); // 发送。 } //else if (command.equals("EPSV")) // Extended passive mode. } // private void processCommand(String command, String content) @@ -1467,7 +1468,7 @@ private void requestAndroidDataPermission() // try // { // Uri uri = Uri.parse("content://com.android.externalstorage.documents/document/primary%3AAndroid%2Fdata"); - + File androidDataFile=new File(Constants.FilePath.AndroidData); // Get the file object. Uri uri = Uri.parse("content://com.android.externalstorage.documents/document/primary%3AAndroid%2Fdata"); @@ -1967,4 +1968,4 @@ private void logDebug(String tag, String message) { Log.e(TAG, "[DEBUG] Failed: " + e.getMessage()); } } -} \ No newline at end of file +}