Merge pull request #6 from SendSafely/v3.1.1

v3.1.1

Author: SendSafely-GitHub

SendSafelyAPI/src/com/sendsafely/SendSafely.java

@@ -488,7 +488,7 @@ public List<RecipientHistory> getRecipientHistory(String recipientEmail) throws
 	public java.io.File downloadFile(String packageId, String fileId, String keyCode, ProgressInterface progress, String password) throws DownloadFileException, PasswordRequiredException
 	{
 		DownloadAndDecryptFileHandler handler = new DownloadAndDecryptFileHandler(uploadManager);
-		return handler.makeRequest(packageId, null, fileId, keyCode, progress, password);
+		return handler.makeRequestS3(packageId, null, fileId, keyCode, progress, password, ec2Proxy);
 	}
 
 	/**
@@ -505,7 +505,7 @@ public java.io.File downloadFile(String packageId, String fileId, String keyCode
 	public java.io.File downloadFile(String packageId, String fileId, String keyCode, String password) throws DownloadFileException, PasswordRequiredException
 	{
 		DownloadAndDecryptFileHandler handler = new DownloadAndDecryptFileHandler(uploadManager);
-		return handler.makeRequest(packageId, null, fileId, keyCode, null, password);
+		return handler.makeRequestS3(packageId, null, fileId, keyCode, new DefaultProgress(), password, ec2Proxy);
 	}
 
 	/**

SendSafelyAPI/src/com/sendsafely/dto/request/GetDownloadUrlsRequest.java

@@ -35,4 +35,7 @@ public void setChecksum(String checksum){
 	public void setForceProxy(boolean forceProxy){
 		super.setPostParam("forceProxy", forceProxy);
 	}
+	public void setPassword(String password){
+		super.setPostParam("password", password);
+	}
 }

SendSafelyAPI/src/com/sendsafely/handlers/DownloadAndDecryptFileHandler.java

@@ -121,13 +121,15 @@ public java.io.File makeRequestS3(String packageId, String directoryId, String f
 		// Download the file
 		java.io.File file = null;
 		try {
-			file = downloadFileFromS3(systemFile, fileToDownload, forceProxy);
+			file = downloadFileS3(systemFile, fileToDownload, password, forceProxy, 0);
 		} catch (GetDownloadUrlsException e) {
-			throw new DownloadFileException("Unable to get download URLs");
+			throw new DownloadFileException(e.getMessage());
 		} catch (LimitExceededException e){
 			try {
-				file = downloadFileFromS3(systemFile, fileToDownload, true, Integer.parseInt(e.getMessage().toString()));
-			} catch (GetDownloadUrlsException | LimitExceededException e1) {
+				file = downloadFileS3(systemFile, fileToDownload, password, true, Integer.parseInt(e.getMessage().toString()));
+			} catch (GetDownloadUrlsException e1) {
+				throw new DownloadFileException(e.getMessage());
+			} catch (LimitExceededException e1) {
 				throw new DownloadFileException("Unable to get download URLs");
 			}
 		}catch(Exception e){
@@ -232,11 +234,7 @@ private java.io.File downloadFile(java.io.File outFile, File ssFile) throws Down
 		return outFile;
 	}
 
-	private java.io.File downloadFileFromS3(java.io.File systemFile, File fileToDownload, boolean forceProxy) throws DownloadFileException, PasswordRequiredException, GetDownloadUrlsException, LimitExceededException {
-		return downloadFileFromS3(systemFile, fileToDownload, forceProxy, 0);
-	}
-	
-	private java.io.File downloadFileFromS3(java.io.File outFile, File ssFile, boolean forceProxy, int filePart) throws DownloadFileException, PasswordRequiredException, GetDownloadUrlsException, LimitExceededException {
+	private java.io.File downloadFileS3(java.io.File outFile, File ssFile, String password, boolean forceProxy, int filePart) throws DownloadFileException, PasswordRequiredException, GetDownloadUrlsException, LimitExceededException {
 
 		Progress progress = new Progress(this.progress, ssFile.getFileId());
 		progress.setTotal(ssFile.getFileSize());
@@ -256,7 +254,7 @@ private java.io.File downloadFileFromS3(java.io.File outFile, File ssFile, boole
 
 			GetDownloadUrlsHandler urlHandler = new GetDownloadUrlsHandler(uploadManager,ssFile.getParts());
 			String checksum = calculateChecksum(packageInfo.getPackageCode(), packageInfo.getKeyCode());
-			urlHandler.fetchDownloadUrls(packageInfo.getPackageId(), ssFile.getFileId(), this.directoryId, part, forceProxy, checksum);//do we need password here?
+			urlHandler.fetchDownloadUrls(packageInfo.getPackageId(), ssFile.getFileId(), this.directoryId, part, forceProxy, password, checksum);
 
 			while (!urlHandler.getCurrentDownloadUrls().isEmpty()) {
 
@@ -309,7 +307,7 @@ private java.io.File downloadFileFromS3(java.io.File outFile, File ssFile, boole
 				}
 				urlHandler.removeUrl();
 				part++;
-				urlHandler.fetchDownloadUrls(packageInfo.getPackageId(), ssFile.getFileId(), this.directoryId, part, forceProxy, checksum);
+				urlHandler.fetchDownloadUrls(packageInfo.getPackageId(), ssFile.getFileId(), this.directoryId, part, forceProxy, password, checksum);
 			}
 		}catch(LimitExceededException e){
 			throw new LimitExceededException(e.getMessage());

SendSafelyAPI/src/com/sendsafely/handlers/GetDownloadUrlsHandler.java

@@ -29,7 +29,7 @@ public GetDownloadUrlsHandler(UploadManager uploadManager, int totalFileParts) {
 		this.downloadUrls = new ArrayList<Map<String, String>>();
 	}
 
-	public void fetchDownloadUrls(String packageId, String fileId, String directoryId, int filePart, boolean forceProxy, String checksum) throws GetDownloadUrlsException {
+	public void fetchDownloadUrls(String packageId, String fileId, String directoryId, int filePart, boolean forceProxy, String password, String checksum) throws GetDownloadUrlsException {
 
 		int urlBatchSize = 0;
 
@@ -38,7 +38,7 @@ public void fetchDownloadUrls(String packageId, String fileId, String directoryI
 			if(directoryId!=null){
 				createRequest(packageId,fileId,directoryId,filePart,urlBatchSize, forceProxy, checksum);
 			}else{
-				createRequest(packageId,fileId,filePart,urlBatchSize, forceProxy, checksum);
+				createRequest(packageId,fileId,filePart,urlBatchSize, forceProxy, checksum, password);
 			}
 			makeRequest();
 		} else if (filePart == (totalDownloadUrlsFetched - URL_REFRESH_LIMIT)) {
@@ -49,7 +49,7 @@ public void fetchDownloadUrls(String packageId, String fileId, String directoryI
 				if(directoryId!=null){
 					createRequest(packageId,fileId,directoryId,totalDownloadUrlsFetched+1,totalDownloadUrlsFetched+urlBatchSize, forceProxy, checksum);
 				}else{
-					createRequest(packageId,fileId,totalDownloadUrlsFetched+1,totalDownloadUrlsFetched+urlBatchSize, forceProxy, checksum);
+					createRequest(packageId,fileId,totalDownloadUrlsFetched+1,totalDownloadUrlsFetched+urlBatchSize, forceProxy, checksum, password);
 				}
 				makeRequest();
 			}
@@ -73,7 +73,7 @@ private void makeRequest() throws GetDownloadUrlsException {
 
 	}
 
-	private void createRequest (String packageId, String fileId, int startSegment, int endSegment, boolean forceProxy, String checksum) {
+	private void createRequest (String packageId, String fileId, int startSegment, int endSegment, boolean forceProxy, String checksum, String password) {
 
 		this.request = new GetDownloadUrlsRequest(this.uploadManager.getJsonManager());
 		((GetDownloadUrlsRequest) request).setPackageId(packageId);
@@ -82,6 +82,9 @@ private void createRequest (String packageId, String fileId, int startSegment, i
 		((GetDownloadUrlsRequest) request).setEndSegment(endSegment);
 		((GetDownloadUrlsRequest) request).setChecksum(checksum);
 		((GetDownloadUrlsRequest) request).setForceProxy(forceProxy);
+		if(password != null){
+			((GetDownloadUrlsRequest) request).setPassword(password);
+		}
 	}
 	private void createRequest (String packageId, String fileId, String directoryId, int startSegment, int endSegment, boolean forceProxy, String checksum) {