diff --git a/Core/src/com/basistech/df/cybertriage/autopsy/ctapi/json/DecryptedLicenseResponse.java b/Core/src/com/basistech/df/cybertriage/autopsy/ctapi/json/DecryptedLicenseResponse.java index 5be0996a9e..c6f91721ef 100644 --- a/Core/src/com/basistech/df/cybertriage/autopsy/ctapi/json/DecryptedLicenseResponse.java +++ b/Core/src/com/basistech/df/cybertriage/autopsy/ctapi/json/DecryptedLicenseResponse.java @@ -41,6 +41,7 @@ public class DecryptedLicenseResponse { private final String limitType; private final String timezone; private final String customerEmail; + private final String customerName; @JsonCreator public DecryptedLicenseResponse( @@ -55,7 +56,8 @@ public class DecryptedLicenseResponse { @JsonProperty("product") String product, @JsonProperty("limitType") String limitType, @JsonProperty("timezone") String timezone, - @JsonProperty("customerEmail") String customerEmail + @JsonProperty("customerEmail") String customerEmail, + @JsonProperty("customerName") String customerName ) { this.boostLicenseId = boostLicenseId; this.licenseHostId = licenseHostId; @@ -67,6 +69,7 @@ public class DecryptedLicenseResponse { this.limitType = limitType; this.timezone = timezone; this.customerEmail = customerEmail; + this.customerName = customerName; } public String getBoostLicenseId() { @@ -108,4 +111,8 @@ public class DecryptedLicenseResponse { public String getCustomerEmail() { return customerEmail; } + + public String getCustomerName() { + return customerName; + } } diff --git a/Core/src/com/basistech/df/cybertriage/autopsy/ctoptions/ctcloud/CTMalwareScannerOptionsPanel.java b/Core/src/com/basistech/df/cybertriage/autopsy/ctoptions/ctcloud/CTMalwareScannerOptionsPanel.java index d68168c3b6..b9757e69a8 100644 --- a/Core/src/com/basistech/df/cybertriage/autopsy/ctoptions/ctcloud/CTMalwareScannerOptionsPanel.java +++ b/Core/src/com/basistech/df/cybertriage/autopsy/ctoptions/ctcloud/CTMalwareScannerOptionsPanel.java @@ -408,15 +408,15 @@ public class CTMalwareScannerOptionsPanel extends CTOptionsSubPanel { } else { this.licenseInfoExpiresLabel.setVisible(true); this.licenseInfoExpiresLabel.setText(Bundle.CTMalwareScannerOptionsPanel_licenseInfo_expires( - this.licenseInfo.getDecryptedLicense().getExpirationDate() == null - ? "" - : LICENSE_EXPIRES_FORMAT.format(this.licenseInfo.getDecryptedLicense().getExpirationDate()))); + this.licenseInfo.getDecryptedLicense().getExpirationDate() == null + ? "" + : LICENSE_EXPIRES_FORMAT.format(this.licenseInfo.getDecryptedLicense().getExpirationDate()))); this.licenseInfoIdLabel.setVisible(true); - this.licenseInfoIdLabel.setText(Bundle.CTMalwareScannerOptionsPanel_licenseInfo_id(this.licenseInfo.getDecryptedLicense().getBoostLicenseId())); + this.licenseInfoIdLabel.setText(Bundle.CTMalwareScannerOptionsPanel_licenseInfo_id(StringUtils.defaultString(this.licenseInfo.getDecryptedLicense().getBoostLicenseId()))); this.licenseInfoUserLabel.setVisible(true); this.licenseInfoUserLabel.setText(Bundle.CTMalwareScannerOptionsPanel_licenseInfo_userInfo( - "TBD", - this.licenseInfo.getDecryptedLicense().getCustomerEmail())); + StringUtils.defaultString(this.licenseInfo.getDecryptedLicense().getCustomerName()), + StringUtils.defaultString(this.licenseInfo.getDecryptedLicense().getCustomerEmail()))); } this.malwareScansPanel.setVisible(StringUtils.isNotBlank(this.authTokenMessage) || authTokenResponse != null);