Support download content in offline apps (#90)

fpanizza · jechague · commit f536d1388c18 · 2019-07-29T12:58:34.000-03:00
Issue [#57791](https://issues.genexus.com/viewissue.aspx?57791)
diff --git a/android/src/main/java/com/genexus/db/ForEachCursor.java b/android/src/main/java/com/genexus/db/ForEachCursor.java
@@ -205,7 +205,8 @@ public void setString(int index, String value, int length) throws SQLException {
 	    public void setString(int index, String value) throws SQLException {}
 	    public void setGXDbFileURI(int index, String fileName, String blobPath, int length, String tableName, String fieldName) throws SQLException {}
 	    public void setGXDbFileURI(int index, String fileName, String blobPath, int length) throws SQLException {}
-	    public void setBytes(int index, byte value[]) throws SQLException {}
+		public void setGXDbFileURI(int index, String fileName, String blobPath, int length, String tableName, String fieldName, boolean downloadContent) throws SQLException {}
+		public void setBytes(int index, byte value[]) throws SQLException {}
 	    public void setDateTime(int index, java.util.Date value, boolean onlyTime) throws SQLException {}
 	    public void setDateTime(int index, java.util.Date value, boolean onlyTime, boolean hasmilliseconds) throws SQLException {}
 		public void setDateTime(int index, java.util.Date value, boolean onlyTime, boolean onlyDate, boolean hasmilliseconds) throws SQLException {}
@@ -215,8 +216,9 @@ public void setTime(int index, java.sql.Time value) throws SQLException {}
 	    public void setTimestamp(int index, java.sql.Timestamp value) throws SQLException {}
 	    public void setBLOBFile(int index, String fileName) throws SQLException {}
 	    public void setBLOBFile(int index, String fileName, boolean isMultiMedia) throws SQLException {}
-	
-	    public void setVarchar(int index, String value, int length, boolean allowsNull) throws SQLException {}
+		public void setBLOBFile(int index, String fileName, boolean isMultiMedia, boolean downloadContent) throws SQLException {}
+
+		public void setVarchar(int index, String value, int length, boolean allowsNull) throws SQLException {}
 	    public void setLongVarchar(int index, String value, boolean allowsNull) throws SQLException {}
 	    public void setNLongVarchar(int index, String value, boolean allowsNull) throws SQLException {}
 	    public void setLongVarchar(int index, String value, int maxLength, boolean allowsNull) throws SQLException {}
diff --git a/android/src/main/java/com/genexus/db/driver/GXPreparedStatement.java b/android/src/main/java/com/genexus/db/driver/GXPreparedStatement.java
@@ -727,10 +727,15 @@ public void setString(int index, String value) throws SQLException
 
 	public void setGXDbFileURI(int index, String fileName, String blobPath, int length) throws SQLException
 	{
-		setGXDbFileURI(index, fileName, blobPath, length, null, null);
+		setGXDbFileURI(index, fileName, blobPath, length, null, null, false);
 	}
 
-    public void setGXDbFileURI(int index, String fileName, String blobPath, int length, String tableName, String fieldName) throws SQLException
+	public void setGXDbFileURI(int index, String fileName, String blobPath, int length, String tableName, String fieldName) throws SQLException
+	{
+		setGXDbFileURI(index, fileName, blobPath, length, null, null, false);
+	}
+
+	public void setGXDbFileURI(int index, String fileName, String blobPath, int length, String tableName, String fieldName, boolean downloadContent) throws SQLException
     {
     	if (blobPath.trim().length() == 0)
     		setVarchar(index, fileName, length, false);
@@ -799,7 +804,9 @@ public void setGXDbFileURI(int index, String fileName, String blobPath, int leng
 						}
 					}
 					
-					if (isLocalFile)
+					if (isLocalFile
+						|| (downloadContent && (blobPath.toLowerCase().startsWith("http://") || blobPath.toLowerCase().startsWith("https://")) )
+					)
 					{
 						// Local path in sdcard.
 						//fileNameNew = blobBasePath + "/" + GXutil.getFileName(fileName)+ "." + GXutil.getFileType(fileName);
@@ -1113,10 +1120,15 @@ public void setBLOBFile(java.sql.Blob blob, String fileName) throws SQLException
 
 	public void setBLOBFile(int index, String fileName) throws SQLException
 	{
-		setBLOBFile(index, fileName, false);
+		setBLOBFile(index, fileName, false, false);
+	}
+
+	public void setBLOBFile(int index, String fileName, boolean isMultiMedia) throws SQLException
+	{
+		setBLOBFile(index, fileName, isMultiMedia, false);
 	}
 
-    public void setBLOBFile(int index, String fileName, boolean isMultiMedia) throws SQLException
+	public void setBLOBFile(int index, String fileName, boolean isMultiMedia, boolean downloadContent) throws SQLException
 	{
 		if(skipSetBlobs)
 		{
@@ -1174,10 +1186,11 @@ else if(blobFiles.length < index)
 					// add token if necesary?
 					//Boolean addToken = (fileName.compareTo(GXDbFile.removeTokenFromFileName(fileName)) == 0);
 										
-					if (fileName.toLowerCase().startsWith("http") && isLocalFile)
+					if ( (fileName.toLowerCase().startsWith("http://")  || fileName.toLowerCase().startsWith("https://"))
+						&& isLocalFile || downloadContent)
 					{
 						URL fileURL = new URL(fileName);
-						
+
 						//fileNameNew = GXDbFile.generateUri(fileName, addToken);
 						fileNameNew = blobBasePath + "/" + CommonUtil.getFileName(fileName)+ "." + CommonUtil.getFileType(fileName);
 						//fileName = com.genexus.PrivateUtilities.getTempFileName(blobPath, GXutil.getFileName(fileName), GXutil.getFileType(fileName));
diff --git a/common/src/main/java/com/genexus/db/IFieldSetter.java b/common/src/main/java/com/genexus/db/IFieldSetter.java
@@ -21,9 +21,10 @@ public interface IFieldSetter
     public void setLongVarchar(int index, String value, int maxLength) throws SQLException;
     public void setString(int index, String value, int length) throws SQLException;
     public void setString(int index, String value) throws SQLException;
-    public void setGXDbFileURI(int index, String fileName, String blobPath, int length, String tableName, String fieldName) throws SQLException;
     public void setGXDbFileURI(int index, String fileName, String blobPath, int length) throws SQLException;
-    public void setBytes(int index, byte value[]) throws SQLException;
+	public void setGXDbFileURI(int index, String fileName, String blobPath, int length, String tableName, String fieldName) throws SQLException;
+	public void setGXDbFileURI(int index, String fileName, String blobPath, int length, String tableName, String fieldName, boolean downloadContent) throws SQLException;
+	public void setBytes(int index, byte value[]) throws SQLException;
     public void setDateTime(int index, java.util.Date value, boolean onlyTime) throws SQLException;
     public void setDateTime(int index, java.util.Date value, boolean onlyTime, boolean hasmilliseconds) throws SQLException;
     public void setDateTime(int index, java.util.Date value, boolean onlyTime, boolean onlyDate, boolean hasmilliseconds) throws SQLException;
@@ -33,6 +34,7 @@ public interface IFieldSetter
     public void setTimestamp(int index, java.sql.Timestamp value) throws SQLException;
     public void setBLOBFile(int index, String fileName) throws SQLException;
     public void setBLOBFile(int index, String fileName, boolean isMultiMedia) throws SQLException;
+	public void setBLOBFile(int index, String fileName, boolean isMultiMedia, boolean downloadContent) throws SQLException;
 
     public void setVarchar(int index, String value, int length, boolean allowsNull) throws SQLException;
     public void setLongVarchar(int index, String value, boolean allowsNull) throws SQLException;
diff --git a/java/src/main/java/com/genexus/db/ForEachCursor.java b/java/src/main/java/com/genexus/db/ForEachCursor.java
@@ -313,7 +313,8 @@ public void setString(int index, String value, int length) throws SQLException {
 	    public void setString(int index, String value) throws SQLException {}
 	    public void setGXDbFileURI(int index, String fileName, String blobPath, int length, String tableName, String fieldName) throws SQLException {}
 	    public void setGXDbFileURI(int index, String fileName, String blobPath, int length) throws SQLException {}
-	    public void setBytes(int index, byte value[]) throws SQLException {}
+		public void setGXDbFileURI(int index, String fileName, String blobPath, int length, String tableName, String fieldName, boolean downloadContent) throws SQLException {}
+		public void setBytes(int index, byte value[]) throws SQLException {}
 
 		public void setDateTime(int index, java.util.Date value, boolean onlyTime) throws SQLException {}
 		public void setDateTime(int index, java.util.Date value, boolean onlyTime, boolean hasmilliseconds) throws SQLException{}
@@ -325,8 +326,9 @@ public void setTime(int index, java.sql.Time value) throws SQLException {}
 	    public void setTimestamp(int index, java.sql.Timestamp value) throws SQLException {}
 	    public void setBLOBFile(int index, String fileName) throws SQLException {}
 	    public void setBLOBFile(int index, String fileName, boolean isMultiMedia) throws SQLException {}
-	
-	    public void setVarchar(int index, String value, int length, boolean allowsNull) throws SQLException {}
+		public void setBLOBFile(int index, String fileName, boolean isMultiMedia, boolean downloadContet) throws SQLException {}
+
+		public void setVarchar(int index, String value, int length, boolean allowsNull) throws SQLException {}
 	    public void setLongVarchar(int index, String value, boolean allowsNull) throws SQLException {}
 	    public void setNLongVarchar(int index, String value, boolean allowsNull) throws SQLException {}
 	    public void setLongVarchar(int index, String value, int maxLength, boolean allowsNull) throws SQLException {}
diff --git a/java/src/main/java/com/genexus/db/driver/GXPreparedStatement.java b/java/src/main/java/com/genexus/db/driver/GXPreparedStatement.java
@@ -927,6 +927,12 @@ public void setGXDbFileURI(int index, String fileName, String blobPath, int leng
     {
 		setGXDbFileURI(index, fileName, blobPath, length, null, null);
 	}
+
+	public void setGXDbFileURI(int index, String fileName, String blobPath, int length, String tableName, String fieldName, boolean downloadContent) throws SQLException
+	{
+		setGXDbFileURI(index, fileName, blobPath, length, tableName, fieldName);
+	}
+
     public void setGXDbFileURI(int index, String fileName, String blobPath, int length, String tableName, String fieldName) throws SQLException
     {
 		 
@@ -1349,6 +1355,11 @@ public void setBLOBFile(int index, String fileName) throws SQLException
 		setBLOBFile(index, fileName, false);
 	}
 
+	public void setBLOBFile(int index, String fileName, boolean isMultiMedia, boolean downloadContent) throws SQLException
+	{
+		setBLOBFile(index, fileName, isMultiMedia);
+	}
+
     public void setBLOBFile(int index, String fileName, boolean isMultiMedia) throws SQLException
 	{
 		if (isMultiMedia && Application.getGXServices().get(GXServices.STORAGE_SERVICE) != null)

Original file line number	Diff line number	Diff line change
`@@ -727,10 +727,15 @@ public void setString(int index, String value) throws SQLException`
`727`	`727`
`728`	`728`	`public void setGXDbFileURI(int index, String fileName, String blobPath, int length) throws SQLException`
`729`	`729`	`{`
`730`		`- setGXDbFileURI(index, fileName, blobPath, length, null, null);`
	`730`	`+ setGXDbFileURI(index, fileName, blobPath, length, null, null, false);`
`731`	`731`	`}`
`732`	`732`
`733`		`- public void setGXDbFileURI(int index, String fileName, String blobPath, int length, String tableName, String fieldName) throws SQLException`
	`733`	`+ public void setGXDbFileURI(int index, String fileName, String blobPath, int length, String tableName, String fieldName) throws SQLException`
	`734`	`+ {`
	`735`	`+ setGXDbFileURI(index, fileName, blobPath, length, null, null, false);`
	`736`	`+ }`
	`737`	`+`
	`738`	`+ public void setGXDbFileURI(int index, String fileName, String blobPath, int length, String tableName, String fieldName, boolean downloadContent) throws SQLException`
`734`	`739`	`{`
`735`	`740`	`if (blobPath.trim().length() == 0)`
`736`	`741`	`setVarchar(index, fileName, length, false);`
`@@ -799,7 +804,9 @@ public void setGXDbFileURI(int index, String fileName, String blobPath, int leng`
`799`	`804`	`}`
`800`	`805`	`}`
`801`	`806`
`802`		`- if (isLocalFile)`
	`807`	`+ if (isLocalFile`
	`808`	`+ \|\| (downloadContent && (blobPath.toLowerCase().startsWith("http://") \|\| blobPath.toLowerCase().startsWith("https://")) )`
	`809`	`+ )`
`803`	`810`	`{`
`804`	`811`	`// Local path in sdcard.`
`805`	`812`	`//fileNameNew = blobBasePath + "/" + GXutil.getFileName(fileName)+ "." + GXutil.getFileType(fileName);`
`@@ -1113,10 +1120,15 @@ public void setBLOBFile(java.sql.Blob blob, String fileName) throws SQLException`
`1113`	`1120`
`1114`	`1121`	`public void setBLOBFile(int index, String fileName) throws SQLException`
`1115`	`1122`	`{`
`1116`		`- setBLOBFile(index, fileName, false);`
	`1123`	`+ setBLOBFile(index, fileName, false, false);`
	`1124`	`+ }`
	`1125`	`+`
	`1126`	`+ public void setBLOBFile(int index, String fileName, boolean isMultiMedia) throws SQLException`
	`1127`	`+ {`
	`1128`	`+ setBLOBFile(index, fileName, isMultiMedia, false);`
`1117`	`1129`	`}`
`1118`	`1130`
`1119`		`- public void setBLOBFile(int index, String fileName, boolean isMultiMedia) throws SQLException`
	`1131`	`+ public void setBLOBFile(int index, String fileName, boolean isMultiMedia, boolean downloadContent) throws SQLException`
`1120`	`1132`	`{`
`1121`	`1133`	`if(skipSetBlobs)`
`1122`	`1134`	`{`
`@@ -1174,10 +1186,11 @@ else if(blobFiles.length < index)`
`1174`	`1186`	`// add token if necesary?`
`1175`	`1187`	`//Boolean addToken = (fileName.compareTo(GXDbFile.removeTokenFromFileName(fileName)) == 0);`
`1176`	`1188`
`1177`		`- if (fileName.toLowerCase().startsWith("http") && isLocalFile)`
	`1189`	`+ if ( (fileName.toLowerCase().startsWith("http://") \|\| fileName.toLowerCase().startsWith("https://"))`
	`1190`	`+ && isLocalFile \|\| downloadContent)`
`1178`	`1191`	`{`
`1179`	`1192`	`URL fileURL = new URL(fileName);`
`1180`		`-`
	`1193`	`+`
`1181`	`1194`	`//fileNameNew = GXDbFile.generateUri(fileName, addToken);`
`1182`	`1195`	`fileNameNew = blobBasePath + "/" + CommonUtil.getFileName(fileName)+ "." + CommonUtil.getFileType(fileName);`
`1183`	`1196`	`//fileName = com.genexus.PrivateUtilities.getTempFileName(blobPath, GXutil.getFileName(fileName), GXutil.getFileType(fileName));`
Original file line number	Diff line number	Diff line change
`@@ -927,6 +927,12 @@ public void setGXDbFileURI(int index, String fileName, String blobPath, int leng`
`927`	`927`	`{`
`928`	`928`	`setGXDbFileURI(index, fileName, blobPath, length, null, null);`
`929`	`929`	`}`
	`930`	`+`
	`931`	`+ public void setGXDbFileURI(int index, String fileName, String blobPath, int length, String tableName, String fieldName, boolean downloadContent) throws SQLException`
	`932`	`+ {`
	`933`	`+ setGXDbFileURI(index, fileName, blobPath, length, tableName, fieldName);`
	`934`	`+ }`
	`935`	`+`
`930`	`936`	`public void setGXDbFileURI(int index, String fileName, String blobPath, int length, String tableName, String fieldName) throws SQLException`
`931`	`937`	`{`
`932`	`938`
`@@ -1349,6 +1355,11 @@ public void setBLOBFile(int index, String fileName) throws SQLException`
`1349`	`1355`	`setBLOBFile(index, fileName, false);`
`1350`	`1356`	`}`
`1351`	`1357`
	`1358`	`+ public void setBLOBFile(int index, String fileName, boolean isMultiMedia, boolean downloadContent) throws SQLException`
	`1359`	`+ {`
	`1360`	`+ setBLOBFile(index, fileName, isMultiMedia);`
	`1361`	`+ }`
	`1362`	`+`
`1352`	`1363`	`public void setBLOBFile(int index, String fileName, boolean isMultiMedia) throws SQLException`
`1353`	`1364`	`{`
`1354`	`1365`	`if (isMultiMedia && Application.getGXServices().get(GXServices.STORAGE_SERVICE) != null)`