X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/4ab904b88e0b445c5e886fe91add69fb215dd455..6d016bcfc97c49deb76fa2c3a07ce62aee4ca8d8:/src/main/java/org/asamk/signal/util/Util.java diff --git a/src/main/java/org/asamk/signal/util/Util.java b/src/main/java/org/asamk/signal/util/Util.java index c0efd271..d6b467b0 100644 --- a/src/main/java/org/asamk/signal/util/Util.java +++ b/src/main/java/org/asamk/signal/util/Util.java @@ -1,10 +1,69 @@ package org.asamk.signal.util; -import java.io.File; +import com.fasterxml.jackson.databind.JsonNode; + +import org.whispersystems.signalservice.api.push.SignalServiceAddress; +import org.whispersystems.signalservice.api.util.InvalidNumberException; +import org.whispersystems.signalservice.api.util.PhoneNumberFormatter; +import org.whispersystems.signalservice.api.util.UuidUtil; +import org.whispersystems.util.Base64; + import java.io.IOException; +import java.io.InvalidObjectException; public class Util { - public static File createTempFile() throws IOException { - return File.createTempFile("signal_tmp_", ".tmp"); + + private Util() { + } + + public static String formatSafetyNumber(String digits) { + final int partCount = 12; + int partSize = digits.length() / partCount; + StringBuilder f = new StringBuilder(digits.length() + partCount); + for (int i = 0; i < partCount; i++) { + f.append(digits, i * partSize, (i * partSize) + partSize).append(" "); + } + return f.toString(); + } + + public static String join(CharSequence separator, Iterable list) { + StringBuilder buf = new StringBuilder(); + for (CharSequence str : list) { + if (buf.length() > 0) { + buf.append(separator); + } + buf.append(str); + } + + return buf.toString(); + } + + public static JsonNode getNotNullNode(JsonNode parent, String name) throws InvalidObjectException { + JsonNode node = parent.get(name); + if (node == null) { + throw new InvalidObjectException(String.format("Incorrect file format: expected parameter %s not found ", name)); + } + + return node; + } + + public static byte[] decodeGroupId(String groupId) throws GroupIdFormatException { + try { + return Base64.decode(groupId); + } catch (IOException e) { + throw new GroupIdFormatException(groupId, e); + } + } + + public static String canonicalizeNumber(String number, String localNumber) throws InvalidNumberException { + return PhoneNumberFormatter.formatNumber(number, localNumber); + } + + public static SignalServiceAddress getSignalServiceAddressFromIdentifier(final String identifier) { + if (UuidUtil.isUuid(identifier)) { + return new SignalServiceAddress(UuidUtil.parseOrNull(identifier), null); + } else { + return new SignalServiceAddress(null, identifier); + } } }