Skip to content

Commit 7e098b0

Browse files
Fix missing package properties
1 parent 31e99ec commit 7e098b0

File tree

5 files changed

+31
-3
lines changed

5 files changed

+31
-3
lines changed

SendSafelyAPI/src/com/sendsafely/dto/response/PackageInformationResponse.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.sendsafely.dto.response;
22

3+
import java.util.Date;
34
import java.util.List;
45

56
import com.sendsafely.ContactGroup;
@@ -24,6 +25,8 @@ public class PackageInformationResponse extends BaseResponse {
2425
private String label;
2526
private boolean isVDR;
2627
private String rootDirectoryId;
28+
private Date packageTimestamp;
29+
private String packageSender;
2730

2831
public List<RecipientResponse> getRecipients() {
2932
return recipients;
@@ -128,6 +131,18 @@ public String getRootDirectoryId() {
128131
public void setRootDirectoryId(String rootDirectoryId) {
129132
this.rootDirectoryId = rootDirectoryId;
130133
}
134+
public Date getPackageTimestamp() {
135+
return packageTimestamp;
136+
}
137+
public void setPackageTimestamp(Date packageTimestamp) {
138+
this.packageTimestamp = packageTimestamp;
139+
}
140+
public String getPackageSender() {
141+
return packageSender;
142+
}
143+
public void setPackageSender(String packageSender) {
144+
this.packageSender = packageSender;
145+
}
131146

132147

133148

SendSafelyAPI/src/com/sendsafely/dto/response/PackageListResponse.java

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ public class PackageListResponse extends BaseResponse {
1919
private PackageState state;
2020
private int packageState;
2121
private int life;
22-
private String description;
22+
private String packageLabel;
23+
private boolean packageIsVdr;
2324
private String packageUserName;
2425
private Date packageUpdateTimestamp;
2526

@@ -84,10 +85,16 @@ public void setLife(int life) {
8485
this.life = life;
8586
}
8687
public String getDescription() {
87-
return description;
88+
return packageLabel;
8889
}
8990
public void setDescription(String description) {
90-
this.description = description;
91+
this.packageLabel = description;
92+
}
93+
public boolean getIsWorkspace() {
94+
return packageIsVdr;
95+
}
96+
public void setIsWorkspace(boolean isWorkspace) {
97+
this.packageIsVdr = isWorkspace;
9198
}
9299
public String getPackageUserName() {
93100
return packageUserName;

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ protected PackageReference convert(PackageListResponse obj) {
7979
info.setStatus(convert(obj.getPackageState()));
8080
info.setPackageOwner(obj.getPackageUserName());
8181
info.setPackageTimestamp(obj.getPackageUpdateTimestamp());
82+
info.setPackageDescriptor(obj.getDescription());
83+
info.setIsWorkspace(obj.getIsWorkspace());
8284
return info;
8385
}
8486

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ protected PackageReference convert(PackageListResponse obj) {
6666
info.setContactGroupNames(obj.getContactGroups());
6767
info.setServerSecret(obj.getServerSecret());
6868
info.setState(obj.getState());
69+
info.setPackageTimestamp(obj.getPackageUpdateTimestamp());
70+
info.setPackageOwner(obj.getPackageUserName());
6971

7072
return info;
7173
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,8 @@ protected Package convert(PackageInformationResponse obj)
8686
info.setRootDirectoryId(obj.getRootDirectoryId());
8787
info.setPackageDescriptor(obj.getLabel());
8888
info.setIsWorkspace(obj.isVDR());
89+
info.setPackageTimestamp(obj.getPackageTimestamp());
90+
info.setPackageOwner(obj.getPackageSender());
8991
return info;
9092
}
9193

0 commit comments

Comments
 (0)