diff --git a/app/src/main/java/com/duolebo/blyrobot/data/Task.kt b/app/src/main/java/com/duolebo/blyrobot/data/Task.kt index 97be1ce79960ca17894a7435804e3ebda3702794..ab0f0d55672880ee3992c1168f0d5904e16db812 100644 --- a/app/src/main/java/com/duolebo/blyrobot/data/Task.kt +++ b/app/src/main/java/com/duolebo/blyrobot/data/Task.kt @@ -329,15 +329,15 @@ class Task : IAppBaseCallback { .setUsernameAndPassword(Config.instance.getFtpUserName(), Config.instance.getFtpPassword()) .setNotificationConfig(UploadNotificationConfig()) .setCreatedDirectoriesPermissions(UnixPermissions("777")) - .setSocketTimeout(5000) - .setConnectTimeout(5000) + .setSocketTimeout(15000) + .setConnectTimeout(15000) .setDelegate(uploadImageCallback()) .setMaxRetries(4) this.uploadImages.forEach { val uploadFile = File(it) if (uploadFile.exists()) { - uploadRequest.addFileToUpload(it, Config.instance.getFtpRemotePath() + "/" + uploadFile.name) + uploadRequest.addFileToUpload(it, Config.instance.getFtpRemotePath() + uploadFile.name) } } diff --git a/app/src/main/java/com/duolebo/blyrobot/util/Config.kt b/app/src/main/java/com/duolebo/blyrobot/util/Config.kt index 878bf10d2a9e6861d91bbe85e5fc35be8dc6a80a..140c4bd4ac3312168e49e2a6aaad4a38e59b5849 100644 --- a/app/src/main/java/com/duolebo/blyrobot/util/Config.kt +++ b/app/src/main/java/com/duolebo/blyrobot/util/Config.kt @@ -51,7 +51,7 @@ class Config: IProtocolConfig { fun getFtpRemotePath(): String { if (isDebug) return "/upload" - return "/test" + return "/" } companion object { diff --git a/uploadservice-ftp/src/main/java/net/gotev/uploadservice/ftp/FTPUploadTask.java b/uploadservice-ftp/src/main/java/net/gotev/uploadservice/ftp/FTPUploadTask.java index a91dd0cedb1166096d585bda6fd89886533ffdd0..d2fcc3195e39d2ac088d15f81a0ae58ccb564fc4 100644 --- a/uploadservice-ftp/src/main/java/net/gotev/uploadservice/ftp/FTPUploadTask.java +++ b/uploadservice-ftp/src/main/java/net/gotev/uploadservice/ftp/FTPUploadTask.java @@ -97,7 +97,8 @@ public class FTPUploadTask extends UploadTask implements CopyStreamListener { Logger.debug(LOG_TAG, "Socket timeout set to " + ftpParams.socketTimeout + "ms. Enabled control keep alive every " + controlKeepAliveTimeout + "s"); - ftpClient.enterLocalPassiveMode(); +// ftpClient.enterLocalPassiveMode(); + ftpClient.enterLocalActiveMode(); ftpClient.setFileType(FTP.BINARY_FILE_TYPE); ftpClient.setFileTransferMode(ftpParams.compressedFileTransfer ? FTP.COMPRESSED_TRANSFER_MODE : FTP.STREAM_TRANSFER_MODE);