webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-08-29 10:30:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Split manager ServiceConfig from BaseConfig

Browse source
This commit is contained in:
AsamK 2020-05-11 14:51:55 +02:00
parent 06caf4ebb3
commit 8163a42d3a
5 changed files with 55 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/org/asamk/signal/manager/Utils.java
View file

@ -97,7 +97,7 @@ class Utils {
static CertificateValidator getCertificateValidator() {
try {
ECPublicKey unidentifiedSenderTrustRoot = Curve.decodePoint(Base64.decode(BaseConfig.UNIDENTIFIED_SENDER_TRUST_ROOT), 0);
ECPublicKey unidentifiedSenderTrustRoot = Curve.decodePoint(Base64.decode(ServiceConfig.UNIDENTIFIED_SENDER_TRUST_ROOT), 0);
return new CertificateValidator(unidentifiedSenderTrustRoot);
} catch (InvalidKeyException | IOException e) {
throw new AssertionError(e);
@ -246,7 +246,7 @@ class Utils {
byte[] ownId;
byte[] theirId;
if (BaseConfig.capabilities.isUuid()
if (ServiceConfig.capabilities.isUuid()
&& ownAddress.getUuid().isPresent() && theirAddress.getUuid().isPresent()) {
// Version 2: UUID user
version = 2;