webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-09-06 14:10:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Made empty strings for json null and fixed plaintext output

Browse source
This commit is contained in:
david-harley 2021-02-17 16:27:47 +10:30
parent ec77074d0c
commit 7317291d7a
4 changed files with 129 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/main/java/org/asamk/signal/json/JsonContactAddress.java
View file

@ -33,15 +33,27 @@ public class JsonContactAddress {
@JsonProperty
private final String country;
private String getValueIfActuallyPopulated(String string) {
if (string == null || string.isBlank()) {
return null;
}
return string;
}
public JsonContactAddress(SharedContact.PostalAddress address) {
type = address.getType();
label = address.getLabel().orNull();
street = address.getStreet().orNull();
pobox = address.getPobox().orNull();
neighborhood = address.getNeighborhood().orNull();
city = address.getCity().orNull();
region = address.getRegion().orNull();
postcode = address.getPostcode().orNull();
country = address.getCountry().orNull();
label = getValueIfActuallyPopulated(address.getLabel().orNull());
street = getValueIfActuallyPopulated(address.getStreet().orNull());
pobox = getValueIfActuallyPopulated(address.getPobox().orNull());
neighborhood = getValueIfActuallyPopulated(address.getNeighborhood().orNull());
city = getValueIfActuallyPopulated(address.getCity().orNull());
region = getValueIfActuallyPopulated(address.getRegion().orNull());
postcode = getValueIfActuallyPopulated(address.getPostcode().orNull());
country = getValueIfActuallyPopulated(address.getCountry().orNull());
if (country == null) {
System.out.println("Is null");
} else {
System.out.println("Present: " + country);
}
}
}