Save account state after ending session even if sending the message has failed

[signal-cli] / src / main / java / org / asamk / signal / manager / Utils.java

diff --git a/src/main/java/org/asamk/signal/manager/Utils.java b/src/main/java/org/asamk/signal/manager/Utils.java
index 28dd7a0783e0dd03ebff099e2a594e46296abda8..a5b37b0585f135970192ff435f354532e38622c2 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/Utils.java
+++ b/src/main/java/org/asamk/signal/manager/Utils.java
@@ -97,7 +97,7 @@ class Utils {
 
     static CertificateValidator getCertificateValidator() {
         try {
 
     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);
             return new CertificateValidator(unidentifiedSenderTrustRoot);
         } catch (InvalidKeyException | IOException e) {
             throw new AssertionError(e);


@@ -246,7 +246,7 @@ class Utils {
         byte[] ownId;
         byte[] theirId;
 
         byte[] ownId;
         byte[] theirId;
 

-        if (BaseConfig.capabilities.isUuid()
+        if (ServiceConfig.capabilities.isUuid()

                 && ownAddress.getUuid().isPresent() && theirAddress.getUuid().isPresent()) {
             // Version 2: UUID user
             version = 2;
                 && ownAddress.getUuid().isPresent() && theirAddress.getUuid().isPresent()) {
             // Version 2: UUID user
             version = 2;