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

Refactor receive api

Browse source
This commit is contained in:
AsamK 2021-11-03 20:43:39 +01:00
parent b615a4b04d
commit 9075cc1a30
36 changed files with 1510 additions and 970 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,10 +1,10 @@
package org.asamk.signal.json;
import org.asamk.signal.manager.api.MessageEnvelope;
import org.asamk.signal.util.Util;
import org.whispersystems.signalservice.api.messages.shared.SharedContact;
public record JsonContactAddress(
SharedContact.PostalAddress.Type type,
String type,
String label,
String street,
String pobox,
@ -15,15 +15,15 @@ public record JsonContactAddress(
String country
) {
static JsonContactAddress from(SharedContact.PostalAddress address) {
return new JsonContactAddress(address.getType(),
Util.getStringIfNotBlank(address.getLabel()),
Util.getStringIfNotBlank(address.getStreet()),
Util.getStringIfNotBlank(address.getPobox()),
Util.getStringIfNotBlank(address.getNeighborhood()),
Util.getStringIfNotBlank(address.getCity()),
Util.getStringIfNotBlank(address.getRegion()),
Util.getStringIfNotBlank(address.getPostcode()),
Util.getStringIfNotBlank(address.getCountry()));
static JsonContactAddress from(MessageEnvelope.Data.SharedContact.Address address) {
return new JsonContactAddress(address.type().name(),
Util.getStringIfNotBlank(address.label()),
Util.getStringIfNotBlank(address.street()),
Util.getStringIfNotBlank(address.pobox()),
Util.getStringIfNotBlank(address.neighborhood()),
Util.getStringIfNotBlank(address.city()),
Util.getStringIfNotBlank(address.region()),
Util.getStringIfNotBlank(address.postcode()),
Util.getStringIfNotBlank(address.country()));
}
}