Store profile sharing enabled for contacts

Automatically enable it when sending direct messages

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ContactHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ContactHelper.java
index 71b2ded8f168dccc0313be22a1262467d64c5c0c..164fea761d2d541986b8b4b8537f034f78947a8f 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/helper/ContactHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/ContactHelper.java
@@ -36,6 +36,9 @@ public class ContactHelper {
     public void setContactBlocked(RecipientId recipientId, boolean blocked) {
         var contact = account.getContactStore().getContact(recipientId);
         final var builder = contact == null ? Contact.newBuilder() : Contact.newBuilder(contact);
     public void setContactBlocked(RecipientId recipientId, boolean blocked) {
         var contact = account.getContactStore().getContact(recipientId);
         final var builder = contact == null ? Contact.newBuilder() : Contact.newBuilder(contact);

+        if (blocked) {
+            builder.withProfileSharingEnabled(false);
+        }

         account.getContactStore().storeContact(recipientId, builder.withBlocked(blocked).build());
     }
 }
         account.getContactStore().storeContact(recipientId, builder.withBlocked(blocked).build());
     }
 }

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
index 0797f84ca1be0d4fd6b26a43ee844d9321e244da..59a7a671342d64464fb9a3953c62399f092dc907 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
@@ -11,6 +11,7 @@ import org.asamk.signal.manager.groups.GroupUtils;
 import org.asamk.signal.manager.groups.NotAGroupMemberException;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.groups.GroupInfo;
 import org.asamk.signal.manager.groups.NotAGroupMemberException;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.groups.GroupInfo;

+import org.asamk.signal.manager.storage.recipients.Contact;

 import org.asamk.signal.manager.storage.recipients.Profile;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 import org.asamk.signal.manager.storage.sendLog.MessageSendLogEntry;
 import org.asamk.signal.manager.storage.recipients.Profile;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 import org.asamk.signal.manager.storage.sendLog.MessageSendLogEntry;


@@ -73,10 +74,20 @@ public class SendHelper {
     public SendMessageResult sendMessage(
             final SignalServiceDataMessage.Builder messageBuilder, final RecipientId recipientId
     ) throws IOException {
     public SendMessageResult sendMessage(
             final SignalServiceDataMessage.Builder messageBuilder, final RecipientId recipientId
     ) throws IOException {

-        final var contact = account.getContactStore().getContact(recipientId);
-        final var expirationTime = contact != null ? contact.getMessageExpirationTime() : 0;
+        var contact = account.getContactStore().getContact(recipientId);
+        if (contact == null || !contact.isProfileSharingEnabled()) {
+            final var contactBuilder = contact == null ? Contact.newBuilder() : Contact.newBuilder(contact);
+            contact = contactBuilder.withProfileSharingEnabled(true).build();
+            account.getContactStore().storeContact(recipientId, contact);
+        }
+
+        final var expirationTime = contact.getMessageExpirationTime();

         messageBuilder.withExpiration(expirationTime);
         messageBuilder.withExpiration(expirationTime);

-        messageBuilder.withProfileKey(account.getProfileKey().serialize());
+
+        if (!contact.isBlocked()) {
+            final var profileKey = account.getProfileKey().serialize();
+            messageBuilder.withProfileKey(profileKey);
+        }

 
         final var message = messageBuilder.build();
         return sendMessage(message, recipientId);
 
         final var message = messageBuilder.build();
         return sendMessage(message, recipientId);

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
index 4ca383e3cb12475f20488a8792b2ebbe6131e7c9..de28638e7984057394986915fc21ca697eafa78e 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
@@ -88,13 +88,18 @@ public class StorageHelper {
 
         final var recipientId = account.getRecipientStore().resolveRecipient(address);
         final var contact = account.getContactStore().getContact(recipientId);
 
         final var recipientId = account.getRecipientStore().resolveRecipient(address);
         final var contact = account.getContactStore().getContact(recipientId);

-        if (contactRecord.getGivenName().isPresent() || contactRecord.getFamilyName().isPresent() || (
-                (contact == null || !contact.isBlocked()) && contactRecord.isBlocked()
-        )) {
-            final var newContact = (contact == null ? Contact.newBuilder() : Contact.newBuilder(contact)).withBlocked(
-                    contactRecord.isBlocked()).withName((
-                    contactRecord.getGivenName().orElse("") + " " + contactRecord.getFamilyName().orElse("")
-            ).trim()).build();
+        final var blocked = contact != null && contact.isBlocked();
+        final var profileShared = contact != null && contact.isProfileSharingEnabled();
+        if (contactRecord.getGivenName().isPresent()
+                || contactRecord.getFamilyName().isPresent()
+                || blocked != contactRecord.isBlocked()
+                || profileShared != contactRecord.isProfileSharingEnabled()) {
+            final var contactBuilder = contact == null ? Contact.newBuilder() : Contact.newBuilder(contact);
+            final var name = contactRecord.getGivenName().orElse("") + " " + contactRecord.getFamilyName().orElse("");
+            final var newContact = contactBuilder.withBlocked(contactRecord.isBlocked())
+                    .withName(name.trim())
+                    .withProfileSharingEnabled(contactRecord.isProfileSharingEnabled())
+                    .build();

             account.getContactStore().storeContact(recipientId, newContact);
         }
 
             account.getContactStore().storeContact(recipientId, newContact);
         }
 

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 79f436701df5f990d115d716755d951f65647524..6b2d063b78530d1411c9f864504fe7dba5903f8b 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
@@ -715,7 +715,8 @@ public class SignalAccount implements Closeable {
                                 contact.color,
                                 contact.messageExpirationTime,
                                 contact.blocked,
                                 contact.color,
                                 contact.messageExpirationTime,
                                 contact.blocked,

-                                contact.archived));
+                                contact.archived,
+                                false));

 
                 // Store profile keys only in profile store
                 var profileKeyString = contact.profileKey;
 
                 // Store profile keys only in profile store
                 var profileKeyString = contact.profileKey;

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/Contact.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/Contact.java
index c03f5c7f2d4338b8b1f2b81c1cd4c3629121646a..25d6151ff101baa49157bf8936fd16bce4fbffe4 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/Contact.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/Contact.java
@@ -14,18 +14,22 @@ public class Contact {
 
     private final boolean archived;
 
 
     private final boolean archived;
 

+    private final boolean profileSharingEnabled;
+

     public Contact(
             final String name,
             final String color,
             final int messageExpirationTime,
             final boolean blocked,
     public Contact(
             final String name,
             final String color,
             final int messageExpirationTime,
             final boolean blocked,

-            final boolean archived
+            final boolean archived,
+            final boolean profileSharingEnabled

     ) {
         this.name = name;
         this.color = color;
         this.messageExpirationTime = messageExpirationTime;
         this.blocked = blocked;
         this.archived = archived;
     ) {
         this.name = name;
         this.color = color;
         this.messageExpirationTime = messageExpirationTime;
         this.blocked = blocked;
         this.archived = archived;

+        this.profileSharingEnabled = profileSharingEnabled;

     }
 
     private Contact(final Builder builder) {
     }
 
     private Contact(final Builder builder) {


@@ -34,6 +38,7 @@ public class Contact {
         messageExpirationTime = builder.messageExpirationTime;
         blocked = builder.blocked;
         archived = builder.archived;
         messageExpirationTime = builder.messageExpirationTime;
         blocked = builder.blocked;
         archived = builder.archived;

+        profileSharingEnabled = builder.profileSharingEnabled;

     }
 
     public static Builder newBuilder() {
     }
 
     public static Builder newBuilder() {


@@ -47,6 +52,7 @@ public class Contact {
         builder.messageExpirationTime = copy.getMessageExpirationTime();
         builder.blocked = copy.isBlocked();
         builder.archived = copy.isArchived();
         builder.messageExpirationTime = copy.getMessageExpirationTime();
         builder.blocked = copy.isBlocked();
         builder.archived = copy.isArchived();

+        builder.profileSharingEnabled = copy.isProfileSharingEnabled();

         return builder;
     }
 
         return builder;
     }
 


@@ -70,6 +76,10 @@ public class Contact {
         return archived;
     }
 
         return archived;
     }
 

+    public boolean isProfileSharingEnabled() {
+        return profileSharingEnabled;
+    }
+

     @Override
     public boolean equals(final Object o) {
         if (this == o) return true;
     @Override
     public boolean equals(final Object o) {
         if (this == o) return true;


@@ -78,13 +88,14 @@ public class Contact {
         return messageExpirationTime == contact.messageExpirationTime
                 && blocked == contact.blocked
                 && archived == contact.archived
         return messageExpirationTime == contact.messageExpirationTime
                 && blocked == contact.blocked
                 && archived == contact.archived

+                && profileSharingEnabled == contact.profileSharingEnabled

                 && Objects.equals(name, contact.name)
                 && Objects.equals(color, contact.color);
     }
 
     @Override
     public int hashCode() {
                 && Objects.equals(name, contact.name)
                 && Objects.equals(color, contact.color);
     }
 
     @Override
     public int hashCode() {

-        return Objects.hash(name, color, messageExpirationTime, blocked, archived);
+        return Objects.hash(name, color, messageExpirationTime, blocked, archived, profileSharingEnabled);

     }
 
     public static final class Builder {
     }
 
     public static final class Builder {


@@ -94,6 +105,7 @@ public class Contact {
         private int messageExpirationTime;
         private boolean blocked;
         private boolean archived;
         private int messageExpirationTime;
         private boolean blocked;
         private boolean archived;

+        private boolean profileSharingEnabled;

 
         private Builder() {
         }
 
         private Builder() {
         }


@@ -123,6 +135,11 @@ public class Contact {
             return this;
         }
 
             return this;
         }
 

+        public Builder withProfileSharingEnabled(final boolean val) {
+            profileSharingEnabled = val;
+            return this;
+        }
+

         public Contact build() {
             return new Contact(this);
         }
         public Contact build() {
             return new Contact(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 619ec418973787e552e3def034180391536a2a8c..16ec9bed5fa8c240590b40c7da093362d43fd1bc 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
@@ -26,6 +26,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Base64;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Base64;

+import java.util.Collection;

 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;


@@ -75,7 +76,8 @@ public class RecipientStore implements RecipientResolver, ContactsStore, Profile
                             r.contact.color,
                             r.contact.messageExpirationTime,
                             r.contact.blocked,
                             r.contact.color,
                             r.contact.messageExpirationTime,
                             r.contact.blocked,

-                            r.contact.archived);
+                            r.contact.archived,
+                            r.contact.profileSharingEnabled);

                 }
 
                 ProfileKey profileKey = null;
                 }
 
                 ProfileKey profileKey = null;


@@ -149,10 +151,6 @@ public class RecipientStore implements RecipientResolver, ContactsStore, Profile
         this.lastId = lastId;
     }
 
         this.lastId = lastId;
     }
 

-    public boolean isBulkUpdating() {
-        return isBulkUpdating;
-    }
-

     public void setBulkUpdating(final boolean bulkUpdating) {
         isBulkUpdating = bulkUpdating;
         if (!bulkUpdating) {
     public void setBulkUpdating(final boolean bulkUpdating) {
         isBulkUpdating = bulkUpdating;
         if (!bulkUpdating) {


@@ -174,6 +172,15 @@ public class RecipientStore implements RecipientResolver, ContactsStore, Profile
         }
     }
 
         }
     }
 

+    public Collection<RecipientId> getRecipientIdsWithEnabledProfileSharing() {
+        synchronized (recipients) {
+            return recipients.values().stream().filter(r -> {
+                final var contact = r.getContact();
+                return contact != null && !contact.isBlocked() && contact.isProfileSharingEnabled();
+            }).map(Recipient::getRecipientId).toList();
+        }
+    }
+

     @Override
     public RecipientId resolveRecipient(ServiceId serviceId) {
         return resolveRecipient(new RecipientAddress(serviceId.uuid()), false, false);
     @Override
     public RecipientId resolveRecipient(ServiceId serviceId) {
         return resolveRecipient(new RecipientAddress(serviceId.uuid()), false, false);


@@ -545,7 +552,8 @@ public class RecipientStore implements RecipientResolver, ContactsStore, Profile
                             recipientContact.getColor(),
                             recipientContact.getMessageExpirationTime(),
                             recipientContact.isBlocked(),
                             recipientContact.getColor(),
                             recipientContact.getMessageExpirationTime(),
                             recipientContact.isBlocked(),

-                            recipientContact.isArchived());
+                            recipientContact.isArchived(),
+                            recipientContact.isProfileSharingEnabled());

             final var recipientProfile = recipient.getProfile();
             final var profile = recipientProfile == null
                     ? null
             final var recipientProfile = recipient.getProfile();
             final var profile = recipientProfile == null
                     ? null


@@ -599,7 +607,12 @@ public class RecipientStore implements RecipientResolver, ContactsStore, Profile
         ) {
 
             private record Contact(
         ) {
 
             private record Contact(

-                    String name, String color, int messageExpirationTime, boolean blocked, boolean archived
+                    String name,
+                    String color,
+                    int messageExpirationTime,
+                    boolean blocked,
+                    boolean archived,
+                    boolean profileSharingEnabled

             ) {}
 
             private record Profile(
             ) {}
 
             private record Profile(

diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index 29889c3d32fc5106a96b38629fda21e716bc5aaf..5b33b039ab86708a470d10b7d5476d0677208dc4 100644 (file)
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -554,7 +554,7 @@ public class DbusManagerImpl implements Manager {
                 return null;
             }
             return new Pair<>(new RecipientAddress(null, n),
                 return null;
             }
             return new Pair<>(new RecipientAddress(null, n),

-                    new Contact(contactName, null, 0, signal.isContactBlocked(n), false));
+                    new Contact(contactName, null, 0, signal.isContactBlocked(n), false, false));

         }).filter(Objects::nonNull).toList();
     }
 
         }).filter(Objects::nonNull).toList();
     }