Store payment address of profiles

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
index 7afa63fcd4aa2c26f6befd93fb127128b9276be5..982acddd4ffa38b049145b960a4f6f44d3c3d83f 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
@@ -1,5 +1,7 @@
 package org.asamk.signal.manager.helper;
 
 package org.asamk.signal.manager.helper;
 

+import com.google.protobuf.InvalidProtocolBufferException;
+

 import org.asamk.signal.manager.SignalDependencies;
 import org.asamk.signal.manager.config.ServiceConfig;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.SignalDependencies;
 import org.asamk.signal.manager.config.ServiceConfig;
 import org.asamk.signal.manager.storage.SignalAccount;


@@ -23,6 +25,7 @@ import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.push.exceptions.NotFoundException;
 import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException;
 import org.whispersystems.signalservice.api.services.ProfileService;
 import org.whispersystems.signalservice.api.push.exceptions.NotFoundException;
 import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException;
 import org.whispersystems.signalservice.api.services.ProfileService;

+import org.whispersystems.signalservice.internal.push.SignalServiceProtos;

 
 import java.io.File;
 import java.io.IOException;
 
 import java.io.File;
 import java.io.IOException;


@@ -138,13 +141,20 @@ public final class ProfileHelper {
                         : avatar.isPresent()
                                 ? AvatarUploadParams.forAvatar(streamDetails)
                                 : AvatarUploadParams.unchanged(false);
                         : avatar.isPresent()
                                 ? AvatarUploadParams.forAvatar(streamDetails)
                                 : AvatarUploadParams.unchanged(false);

+                final var paymentsAddress = Optional.ofNullable(newProfile.getPaymentAddress()).map(data -> {
+                    try {
+                        return SignalServiceProtos.PaymentAddress.parseFrom(data);
+                    } catch (InvalidProtocolBufferException e) {
+                        return null;
+                    }
+                });

                 final var avatarPath = dependencies.getAccountManager()
                         .setVersionedProfile(account.getAci(),
                                 account.getProfileKey(),
                                 newProfile.getInternalServiceName(),
                                 newProfile.getAbout() == null ? "" : newProfile.getAbout(),
                                 newProfile.getAboutEmoji() == null ? "" : newProfile.getAboutEmoji(),
                 final var avatarPath = dependencies.getAccountManager()
                         .setVersionedProfile(account.getAci(),
                                 account.getProfileKey(),
                                 newProfile.getInternalServiceName(),
                                 newProfile.getAbout() == null ? "" : newProfile.getAbout(),
                                 newProfile.getAboutEmoji() == null ? "" : newProfile.getAboutEmoji(),

-                                Optional.empty(),
+                                paymentsAddress,

                                 avatarUploadParams,
                                 List.of(/* TODO */));
                 builder.withAvatarUrlPath(avatarPath.orElse(null));
                                 avatarUploadParams,
                                 List.of(/* TODO */));
                 builder.withAvatarUrlPath(avatarPath.orElse(null));

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index f09714cb9039616cfb6625aa79d22a2717c4e902..7b5411e68f35a4fd7fef56a87f80efcd564b964a 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -757,6 +757,7 @@ public class SignalAccount implements Closeable {
                             profile.getAbout(),
                             profile.getAboutEmoji(),
                             null,
                             profile.getAbout(),
                             profile.getAboutEmoji(),
                             null,

+                            null,

                             profile.isUnrestrictedUnidentifiedAccess()
                                     ? Profile.UnidentifiedAccessMode.UNRESTRICTED
                                     : profile.getUnidentifiedAccess() != null
                             profile.isUnrestrictedUnidentifiedAccess()
                                     ? Profile.UnidentifiedAccessMode.UNRESTRICTED
                                     : profile.getUnidentifiedAccess() != null

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/Profile.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/Profile.java
index dc3aaf534fb6f0f2fee5dc979a6d380901bf9bb8..3f14f645fb35a8eeef97bbdc114ccc1867f06c4e 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/Profile.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/Profile.java
@@ -20,6 +20,8 @@ public class Profile {
 
     private final String avatarUrlPath;
 
 
     private final String avatarUrlPath;
 

+    private final byte[] paymentAddress;
+

     private final UnidentifiedAccessMode unidentifiedAccessMode;
 
     private final Set<Capability> capabilities;
     private final UnidentifiedAccessMode unidentifiedAccessMode;
 
     private final Set<Capability> capabilities;


@@ -31,6 +33,7 @@ public class Profile {
             final String about,
             final String aboutEmoji,
             final String avatarUrlPath,
             final String about,
             final String aboutEmoji,
             final String avatarUrlPath,

+            final byte[] paymentAddress,

             final UnidentifiedAccessMode unidentifiedAccessMode,
             final Set<Capability> capabilities
     ) {
             final UnidentifiedAccessMode unidentifiedAccessMode,
             final Set<Capability> capabilities
     ) {


@@ -40,6 +43,7 @@ public class Profile {
         this.about = about;
         this.aboutEmoji = aboutEmoji;
         this.avatarUrlPath = avatarUrlPath;
         this.about = about;
         this.aboutEmoji = aboutEmoji;
         this.avatarUrlPath = avatarUrlPath;

+        this.paymentAddress = paymentAddress;

         this.unidentifiedAccessMode = unidentifiedAccessMode;
         this.capabilities = capabilities;
     }
         this.unidentifiedAccessMode = unidentifiedAccessMode;
         this.capabilities = capabilities;
     }


@@ -51,6 +55,7 @@ public class Profile {
         about = builder.about;
         aboutEmoji = builder.aboutEmoji;
         avatarUrlPath = builder.avatarUrlPath;
         about = builder.about;
         aboutEmoji = builder.aboutEmoji;
         avatarUrlPath = builder.avatarUrlPath;

+        paymentAddress = builder.paymentAddress;

         unidentifiedAccessMode = builder.unidentifiedAccessMode;
         capabilities = builder.capabilities;
     }
         unidentifiedAccessMode = builder.unidentifiedAccessMode;
         capabilities = builder.capabilities;
     }


@@ -67,6 +72,7 @@ public class Profile {
         builder.about = copy.getAbout();
         builder.aboutEmoji = copy.getAboutEmoji();
         builder.avatarUrlPath = copy.getAvatarUrlPath();
         builder.about = copy.getAbout();
         builder.aboutEmoji = copy.getAboutEmoji();
         builder.avatarUrlPath = copy.getAvatarUrlPath();

+        builder.paymentAddress = copy.getPaymentAddress();

         builder.unidentifiedAccessMode = copy.getUnidentifiedAccessMode();
         builder.capabilities = copy.getCapabilities();
         return builder;
         builder.unidentifiedAccessMode = copy.getUnidentifiedAccessMode();
         builder.capabilities = copy.getCapabilities();
         return builder;


@@ -118,6 +124,10 @@ public class Profile {
         return avatarUrlPath;
     }
 
         return avatarUrlPath;
     }
 

+    public byte[] getPaymentAddress() {
+        return paymentAddress;
+    }
+

     public UnidentifiedAccessMode getUnidentifiedAccessMode() {
         return unidentifiedAccessMode;
     }
     public UnidentifiedAccessMode getUnidentifiedAccessMode() {
         return unidentifiedAccessMode;
     }


@@ -190,6 +200,7 @@ public class Profile {
         private String about;
         private String aboutEmoji;
         private String avatarUrlPath;
         private String about;
         private String aboutEmoji;
         private String avatarUrlPath;

+        private byte[] paymentAddress;

         private UnidentifiedAccessMode unidentifiedAccessMode = UnidentifiedAccessMode.UNKNOWN;
         private Set<Capability> capabilities = Collections.emptySet();
         private long lastUpdateTimestamp = 0;
         private UnidentifiedAccessMode unidentifiedAccessMode = UnidentifiedAccessMode.UNKNOWN;
         private Set<Capability> capabilities = Collections.emptySet();
         private long lastUpdateTimestamp = 0;


@@ -240,5 +251,10 @@ public class Profile {
             lastUpdateTimestamp = val;
             return this;
         }
             lastUpdateTimestamp = val;
             return this;
         }

+
+        public Builder withPaymentAddress(final byte[] val) {
+            paymentAddress = val;
+            return this;
+        }

     }
 }
     }
 }

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
index 9caac144b676283325eb871b727492624a6d1d32..619ec418973787e552e3def034180391536a2a8c 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
@@ -103,6 +103,9 @@ public class RecipientStore implements RecipientResolver, ContactsStore, Profile
                             r.profile.about,
                             r.profile.aboutEmoji,
                             r.profile.avatarUrlPath,
                             r.profile.about,
                             r.profile.aboutEmoji,
                             r.profile.avatarUrlPath,

+                            r.profile.paymentAddress == null
+                                    ? null
+                                    : Base64.getDecoder().decode(r.profile.paymentAddress),

                             Profile.UnidentifiedAccessMode.valueOfOrUnknown(r.profile.unidentifiedAccessMode),
                             r.profile.capabilities.stream()
                                     .map(Profile.Capability::valueOfOrNull)
                             Profile.UnidentifiedAccessMode.valueOfOrUnknown(r.profile.unidentifiedAccessMode),
                             r.profile.capabilities.stream()
                                     .map(Profile.Capability::valueOfOrNull)


@@ -535,27 +538,28 @@ public class RecipientStore implements RecipientResolver, ContactsStore, Profile
         final var base64 = Base64.getEncoder();
         var storage = new Storage(recipients.entrySet().stream().map(pair -> {
             final var recipient = pair.getValue();
         final var base64 = Base64.getEncoder();
         var storage = new Storage(recipients.entrySet().stream().map(pair -> {
             final var recipient = pair.getValue();

-            final var contact = recipient.getContact() == null
+            final var recipientContact = recipient.getContact();
+            final var contact = recipientContact == null

                     ? null
                     ? null

-                    : new Storage.Recipient.Contact(recipient.getContact().getName(),
-                            recipient.getContact().getColor(),
-                            recipient.getContact().getMessageExpirationTime(),
-                            recipient.getContact().isBlocked(),
-                            recipient.getContact().isArchived());
-            final var profile = recipient.getProfile() == null
+                    : new Storage.Recipient.Contact(recipientContact.getName(),
+                            recipientContact.getColor(),
+                            recipientContact.getMessageExpirationTime(),
+                            recipientContact.isBlocked(),
+                            recipientContact.isArchived());
+            final var recipientProfile = recipient.getProfile();
+            final var profile = recipientProfile == null

                     ? null
                     ? null

-                    : new Storage.Recipient.Profile(recipient.getProfile().getLastUpdateTimestamp(),
-                            recipient.getProfile().getGivenName(),
-                            recipient.getProfile().getFamilyName(),
-                            recipient.getProfile().getAbout(),
-                            recipient.getProfile().getAboutEmoji(),
-                            recipient.getProfile().getAvatarUrlPath(),
-                            recipient.getProfile().getUnidentifiedAccessMode().name(),
-                            recipient.getProfile()
-                                    .getCapabilities()
-                                    .stream()
-                                    .map(Enum::name)
-                                    .collect(Collectors.toSet()));
+                    : new Storage.Recipient.Profile(recipientProfile.getLastUpdateTimestamp(),
+                            recipientProfile.getGivenName(),
+                            recipientProfile.getFamilyName(),
+                            recipientProfile.getAbout(),
+                            recipientProfile.getAboutEmoji(),
+                            recipientProfile.getAvatarUrlPath(),
+                            recipientProfile.getPaymentAddress() == null
+                                    ? null
+                                    : base64.encodeToString(recipientProfile.getPaymentAddress()),
+                            recipientProfile.getUnidentifiedAccessMode().name(),
+                            recipientProfile.getCapabilities().stream().map(Enum::name).collect(Collectors.toSet()));

             return new Storage.Recipient(pair.getKey().id(),
                     recipient.getAddress().number().orElse(null),
                     recipient.getAddress().uuid().map(UUID::toString).orElse(null),
             return new Storage.Recipient(pair.getKey().id(),
                     recipient.getAddress().number().orElse(null),
                     recipient.getAddress().uuid().map(UUID::toString).orElse(null),


@@ -605,6 +609,7 @@ public class RecipientStore implements RecipientResolver, ContactsStore, Profile
                     String about,
                     String aboutEmoji,
                     String avatarUrlPath,
                     String about,
                     String aboutEmoji,
                     String avatarUrlPath,

+                    String paymentAddress,

                     String unidentifiedAccessMode,
                     Set<String> capabilities
             ) {}
                     String unidentifiedAccessMode,
                     Set<String> capabilities
             ) {}

diff --git a/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java
index c2bd1fa9d3e65e12a59cb09bcca17f3ce0b8999a..53a9cdb62db5b396c3d2a1c2674d4be6e56c2f70 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java
@@ -32,6 +32,7 @@ public class ProfileUtils {
                     about,
                     aboutEmoji,
                     encryptedProfile.getAvatar(),
                     about,
                     aboutEmoji,
                     encryptedProfile.getAvatar(),

+                    encryptedProfile.getPaymentAddress(),

                     getUnidentifiedAccessMode(encryptedProfile, profileCipher),
                     getCapabilities(encryptedProfile));
         } catch (InvalidCiphertextException e) {
                     getUnidentifiedAccessMode(encryptedProfile, profileCipher),
                     getCapabilities(encryptedProfile));
         } catch (InvalidCiphertextException e) {