Make sure remote directory isn't empty when using it

Sleeksnap · Jan 23, 2014 · 3127cd7 · 3127cd7
1 parent 2293caf
commit 3127cd7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/org/sleeksnap/uploaders/generic/FTPUploader.java b/src/org/sleeksnap/uploaders/generic/FTPUploader.java
@@ -81,7 +81,7 @@ public String ftpUpload(String fileName, InputStream input)
 			throw new UploaderConfigurationException("Unable to connect to FTP server, please check your username and password.");
 		}
 
-		if (settings.has("remotedir")) {
+		if (settings.has("remotedir") && !settings.isEmpty("remotedir")) {
 			if(!ftp.cwd(settings.getString("remotedir"))) {
 				throw new UploaderConfigurationException("Unable to change FTP directory.");
 			}

diff --git a/src/org/sleeksnap/uploaders/settings/UploaderSettings.java b/src/org/sleeksnap/uploaders/settings/UploaderSettings.java
@@ -172,4 +172,8 @@ public JSONObject getJSONObject(String string) {
 	public String toString() {
 		return settings.toString();
 	}
+
+	public boolean isEmpty(String string) {
+		return settings.getString(string, "").equals("");
+	}
 }