support ftp url upload

itaibenari · itaibenari · commit d6882f006e61 · 2015-04-06T12:20:51.000+03:00
diff --git a/cloudinary-android/src/main/java/com/cloudinary/android/UploaderStrategy.java b/cloudinary-android/src/main/java/com/cloudinary/android/UploaderStrategy.java
@@ -60,7 +60,7 @@ public Map callApi(String action, Map<String, Object> params, Map options, Objec
 			}
 		}
 
-		if (file instanceof String && !((String) file).matches("https?:.*|s3:.*|data:[^;]*;base64,([a-zA-Z0-9/+\n=]+)")) {
+		if (file instanceof String && !((String) file).matches("ftp:.*|https?:.*|s3:.*|data:[^;]*;base64,([a-zA-Z0-9/+\n=]+)")) {
 			file = new File((String) file);
 		}
 		if (file instanceof File) {
diff --git a/cloudinary-http42/src/main/java/com/cloudinary/http42/UploaderStrategy.java b/cloudinary-http42/src/main/java/com/cloudinary/http42/UploaderStrategy.java
@@ -81,7 +81,7 @@ public Map callApi(String action, Map<String, Object> params, Map options, Objec
 			}
 		}
 
-		if (file instanceof String && !((String) file).matches("https?:.*|s3:.*|data:[^;]*;base64,([a-zA-Z0-9/+\n=]+)")) {
+		if (file instanceof String && !((String) file).matches("ftp:.*|https?:.*|s3:.*|data:[^;]*;base64,([a-zA-Z0-9/+\n=]+)")) {
 			file = new File((String) file);
 		}
 		if (file instanceof File) {
diff --git a/cloudinary-http44/src/main/java/com/cloudinary/http44/UploaderStrategy.java b/cloudinary-http44/src/main/java/com/cloudinary/http44/UploaderStrategy.java
@@ -92,7 +92,7 @@ public Map callApi(String action, Map<String, Object> params, Map options, Objec
 			}
 		}
 
-		if (file instanceof String && !((String) file).matches("https?:.*|s3:.*|data:[^;]*;base64,([a-zA-Z0-9/+\n=]+)")) {
+		if (file instanceof String && !((String) file).matches("ftp:.*|https?:.*|s3:.*|data:[^;]*;base64,([a-zA-Z0-9/+\n=]+)")) {
 			file = new File((String) file);
 		}
 		if (file instanceof File) {

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public Map callApi(String action, Map<String, Object> params, Map options, Objec`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`
`63`		`- if (file instanceof String && !((String) file).matches("https?:.\|s3:.\|data:[^;]*;base64,([a-zA-Z0-9/+\n=]+)")) {`
	`63`	`+ if (file instanceof String && !((String) file).matches("ftp:.\|https?:.\|s3:.\|data:[^;];base64,([a-zA-Z0-9/+\n=]+)")) {`
`64`	`64`	`file = new File((String) file);`
`65`	`65`	`}`
`66`	`66`	`if (file instanceof File) {`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public Map callApi(String action, Map<String, Object> params, Map options, Objec`
`81`	`81`	`}`
`82`	`82`	`}`
`83`	`83`
`84`		`- if (file instanceof String && !((String) file).matches("https?:.\|s3:.\|data:[^;]*;base64,([a-zA-Z0-9/+\n=]+)")) {`
	`84`	`+ if (file instanceof String && !((String) file).matches("ftp:.\|https?:.\|s3:.\|data:[^;];base64,([a-zA-Z0-9/+\n=]+)")) {`
`85`	`85`	`file = new File((String) file);`
`86`	`86`	`}`
`87`	`87`	`if (file instanceof File) {`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public Map callApi(String action, Map<String, Object> params, Map options, Objec`
`92`	`92`	`}`
`93`	`93`	`}`
`94`	`94`
`95`		`- if (file instanceof String && !((String) file).matches("https?:.\|s3:.\|data:[^;]*;base64,([a-zA-Z0-9/+\n=]+)")) {`
	`95`	`+ if (file instanceof String && !((String) file).matches("ftp:.\|https?:.\|s3:.\|data:[^;];base64,([a-zA-Z0-9/+\n=]+)")) {`
`96`	`96`	`file = new File((String) file);`
`97`	`97`	`}`
`98`	`98`	`if (file instanceof File) {`