Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3 from SendSafely/v3.1
Updates for v3.1 release
- Loading branch information
Showing
25 changed files
with
693 additions
and
112 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| package com.sendsafely; | ||
|
|
||
| public class Privatekey { | ||
|
|
||
| private String privateKey; | ||
| private String publicKeyId; | ||
|
|
||
| public String getArmoredKey() { | ||
| return privateKey; | ||
| } | ||
| public void setArmoredKey(String privateKey) { | ||
| this.privateKey = privateKey; | ||
| } | ||
| public String getPublicKeyId() { | ||
| return publicKeyId; | ||
| } | ||
| public void setPublicKeyId(String publicKeyId) { | ||
| this.publicKeyId = publicKeyId; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
110 changes: 110 additions & 0 deletions
110
SendSafelyAPI/src/com/sendsafely/dto/RecipientHistory.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,110 @@ | ||
| package com.sendsafely.dto; | ||
|
|
||
| import java.util.Date; | ||
| import java.util.Set; | ||
|
|
||
| import com.sendsafely.Recipient; | ||
|
|
||
| public class RecipientHistory { | ||
|
|
||
| private String packageId; | ||
| private String packageUserName; | ||
| private String packageUserId; | ||
| private int packageState; | ||
| private String packageStateStr; | ||
| private String packageStateColor; | ||
| private int packageLife; | ||
| private String packageUpdateTimestampStr; | ||
| private Date packageUpdateTimestamp; | ||
| private String packageCode; | ||
| private String packageOS; | ||
| private Recipient packageRecipientResponse; | ||
| private Set<String> filenames; | ||
| private boolean packageContainsMessage; | ||
| public String getPackageId() { | ||
| return packageId; | ||
| } | ||
| public void setPackageId(String packageId) { | ||
| this.packageId = packageId; | ||
| } | ||
| public String getPackageUserName() { | ||
| return packageUserName; | ||
| } | ||
| public void setPackageUserName(String packageUserName) { | ||
| this.packageUserName = packageUserName; | ||
| } | ||
| public String getPackageUserId() { | ||
| return packageUserId; | ||
| } | ||
| public void setPackageUserId(String packageUserId) { | ||
| this.packageUserId = packageUserId; | ||
| } | ||
| public int getPackageState() { | ||
| return packageState; | ||
| } | ||
| public void setPackageState(int packageState) { | ||
| this.packageState = packageState; | ||
| } | ||
| public String getPackageStateStr() { | ||
| return packageStateStr; | ||
| } | ||
| public void setPackageStateStr(String packageStateStr) { | ||
| this.packageStateStr = packageStateStr; | ||
| } | ||
| public String getPackageStateColor() { | ||
| return packageStateColor; | ||
| } | ||
| public void setPackageStateColor(String packageStateColor) { | ||
| this.packageStateColor = packageStateColor; | ||
| } | ||
| public int getPackageLife() { | ||
| return packageLife; | ||
| } | ||
| public void setPackageLife(int packageLife) { | ||
| this.packageLife = packageLife; | ||
| } | ||
| public String getPackageUpdateTimestampStr() { | ||
| return packageUpdateTimestampStr; | ||
| } | ||
| public void setPackageUpdateTimestampStr(String packageUpdateTimestampStr) { | ||
| this.packageUpdateTimestampStr = packageUpdateTimestampStr; | ||
| } | ||
| public Date getPackageUpdateTimestamp() { | ||
| return packageUpdateTimestamp; | ||
| } | ||
| public void setPackageUpdateTimestamp(Date packageUpdateTimestamp) { | ||
| this.packageUpdateTimestamp = packageUpdateTimestamp; | ||
| } | ||
| public String getPackageCode() { | ||
| return packageCode; | ||
| } | ||
| public void setPackageCode(String packageCode) { | ||
| this.packageCode = packageCode; | ||
| } | ||
| public String getPackageOS() { | ||
| return packageOS; | ||
| } | ||
| public void setPackageOS(String packageOS) { | ||
| this.packageOS = packageOS; | ||
| } | ||
| public Recipient getPackageRecipientResponse() { | ||
| return packageRecipientResponse; | ||
| } | ||
| public void setPackageRecipientResponse(Recipient packageRecipientResponse) { | ||
| this.packageRecipientResponse = packageRecipientResponse; | ||
| } | ||
| public Set<String> getFilenames() { | ||
| return filenames; | ||
| } | ||
| public void setFilenames(Set<String> filenames) { | ||
| this.filenames = filenames; | ||
| } | ||
| public boolean isPackageContainsMessage() { | ||
| return packageContainsMessage; | ||
| } | ||
| public void setPackageContainsMessage(boolean packageContainsMessage) { | ||
| this.packageContainsMessage = packageContainsMessage; | ||
| } | ||
|
|
||
|
|
||
| } |
25 changes: 25 additions & 0 deletions
25
SendSafelyAPI/src/com/sendsafely/dto/request/AddPublicKeyRequest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| package com.sendsafely.dto.request; | ||
|
|
||
| import com.sendsafely.enums.HTTPMethod; | ||
| import com.sendsafely.json.JsonManager; | ||
|
|
||
| public class AddPublicKeyRequest extends BaseRequest | ||
| { | ||
|
|
||
| private HTTPMethod method = HTTPMethod.PUT; | ||
| private String path = "/public-key/"; | ||
|
|
||
| public AddPublicKeyRequest(JsonManager jsonManager) { | ||
| initialize(jsonManager, method, path); | ||
| } | ||
|
|
||
| public void setPublicKey(String publicKey) | ||
| { | ||
| super.setPostParam("publicKey", publicKey); | ||
| } | ||
|
|
||
| public void setDescription(String description){ | ||
| super.setPostParam("description", description); | ||
| } | ||
|
|
||
| } |
21 changes: 21 additions & 0 deletions
21
SendSafelyAPI/src/com/sendsafely/dto/request/DeleteTempPackageRequest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| package com.sendsafely.dto.request; | ||
|
|
||
| import com.sendsafely.enums.GetParam; | ||
| import com.sendsafely.enums.HTTPMethod; | ||
| import com.sendsafely.json.JsonManager; | ||
|
|
||
| public class DeleteTempPackageRequest extends BaseRequest | ||
| { | ||
|
|
||
| private HTTPMethod method = HTTPMethod.DELETE; | ||
| private String path = "/package/" + GetParam.PACKAGE_ID + "/temp/"; | ||
|
|
||
| public DeleteTempPackageRequest(JsonManager jsonManager) { | ||
| initialize(jsonManager, method, path); | ||
| } | ||
|
|
||
| public void setPackageId(String packageId) | ||
| { | ||
| super.setGetParam(GetParam.PACKAGE_ID, packageId); | ||
| } | ||
| } |
Oops, something went wrong.