[SES-1002] Synced blind requests (#1303)

* feat: update config to use blinded-msg-requests pr

* feat: add block community message requests bool to protos

* feat: add everything needed for recipientDB to have blocked community requests potentially

* feat: add db migrations

* feat: add sending community block flags and preference options

* feat: add parsing block request flag

* fix: open group message requests were broken anyway

* fix: delete all encoded open group inbox ID bs, fix privacy settings using user config as privacy store

* feat: initial creation sets flag, rename to match libsession implementation value

* fix: recipient blinded checks from open group message for blocking community requests on blinded ID version of recipient, use correct (inverted) values from before for checking polling and empty states etc

* fix: pr comments for view model factory context ref, simplified user config object check for category in PrivacySettingsPreferenceFragment

* fix: pr comments

* fix: migrate some dependencies and functionality out of VM into repository to remove content resolver and context dependecy so tests pass again

* refactor: better naming for hidesInputBar and add more tests for expected recipient view states

* fix: use contact information as opposed to active conversations

* fix: PR comments

libsession/src/main/java/org/session/libsession/database/StorageProtocol.kt

@@ -42,6 +42,7 @@ interface StorageProtocol {
     fun getUserProfile(): Profile
     fun setProfileAvatar(recipient: Recipient, profileAvatar: String?)
     fun setProfilePicture(recipient: Recipient, newProfilePicture: String?, newProfileKey: ByteArray?)
+    fun setBlocksCommunityMessageRequests(recipient: Recipient, blocksMessageRequests: Boolean)
     fun setUserProfilePicture(newProfilePicture: String?, newProfileKey: ByteArray?)
     fun clearUserPic()
     // Signal
@@ -228,4 +229,5 @@ interface StorageProtocol {
     fun notifyConfigUpdates(forConfigObject: ConfigBase)
     fun conversationInConfig(publicKey: String?, groupPublicKey: String?, openGroupId: String?, visibleOnly: Boolean): Boolean
     fun canPerformConfigChange(variant: String, publicKey: String, changeTimestampMs: Long): Boolean
+    fun isCheckingCommunityRequests(): Boolean
 }

libsession/src/main/java/org/session/libsession/messaging/messages/visible/VisibleMessage.kt

@@ -25,7 +25,8 @@ class VisibleMessage(
     var profile: Profile? = null,
     var openGroupInvitation: OpenGroupInvitation? = null,
     var reaction: Reaction? = null,
-    var hasMention: Boolean = false
+    var hasMention: Boolean = false,
+    var blocksMessageRequests: Boolean = false
 ) : Message()  {
 
     override val isSelfSendValid: Boolean = true
@@ -74,6 +75,9 @@ class VisibleMessage(
                 val reaction = Reaction.fromProto(reactionProto)
                 result.reaction = reaction
             }
+
+            result.blocksMessageRequests = with (dataMessage) { hasBlocksCommunityMessageRequests() && blocksCommunityMessageRequests }
+
             return result
         }
     }
@@ -141,6 +145,8 @@ class VisibleMessage(
                 return null
             }
         }
+        // Community blocked message requests flag
+        dataMessage.blocksCommunityMessageRequests = blocksMessageRequests
         // Sync target
         if (syncTarget != null) {
             dataMessage.syncTarget = syncTarget

libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupApi.kt

@@ -753,7 +753,8 @@ object OpenGroupApi {
             )
         }
         val serverCapabilities = storage.getServerCapabilities(server)
-        if (serverCapabilities.contains(Capability.BLIND.name.lowercase())) {
+        val isAcceptingCommunityRequests = storage.isCheckingCommunityRequests()
+        if (serverCapabilities.contains(Capability.BLIND.name.lowercase()) && isAcceptingCommunityRequests) {
             requests.add(
                 if (lastInboxMessageId == null) {
                     BatchRequestInfo(

libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt

@@ -242,9 +242,16 @@ object MessageSender {
     private fun sendToOpenGroupDestination(destination: Destination, message: Message): Promise<Unit, Exception> {
         val deferred = deferred<Unit, Exception>()
         val storage = MessagingModuleConfiguration.shared.storage
+        val configFactory = MessagingModuleConfiguration.shared.configFactory
         if (message.sentTimestamp == null) {
             message.sentTimestamp = SnodeAPI.nowWithOffset
         }
+        // Attach the blocks message requests info
+        configFactory.user?.let { user ->
+            if (message is VisibleMessage) {
+                message.blocksMessageRequests = !user.getCommunityMessageRequests()
+            }
+        }
         val userEdKeyPair = MessagingModuleConfiguration.shared.getUserED25519KeyPair()!!
         var serverCapabilities = listOf<String>()
         var blindedPublicKey: ByteArray? = null

libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt

@@ -304,6 +304,10 @@ fun MessageReceiver.handleVisibleMessage(
                 profileManager.setProfilePicture(context, recipient, null, null)
             }
         }
+
+        if (userPublicKey != messageSender && !isUserBlindedSender) {
+            storage.setBlocksCommunityMessageRequests(recipient, message.blocksMessageRequests)
+        }
     }
     // Parse quote if needed
     var quoteModel: QuoteModel? = null

libsession/src/main/java/org/session/libsession/utilities/GroupUtil.kt

@@ -1,6 +1,7 @@
 package org.session.libsession.utilities
 
-import network.loki.messenger.libsession_util.util.GroupInfo
+import org.session.libsession.messaging.open_groups.OpenGroup
+import org.session.libsession.messaging.utilities.SessionId
 import org.session.libsignal.messages.SignalServiceGroup
 import org.session.libsignal.utilities.Hex
 import java.io.IOException
@@ -16,8 +17,15 @@ object GroupUtil {
     }
 
     @JvmStatic
-    fun getEncodedOpenGroupInboxID(groupInboxID: ByteArray): String {
-        return OPEN_GROUP_INBOX_PREFIX + Hex.toStringCondensed(groupInboxID)
+    fun getEncodedOpenGroupInboxID(openGroup: OpenGroup, sessionId: SessionId): Address {
+        val openGroupInboxId =
+            "${openGroup.server}!${openGroup.publicKey}!${sessionId.hexString}".toByteArray()
+        return getEncodedOpenGroupInboxID(openGroupInboxId)
+    }
+
+    @JvmStatic
+    fun getEncodedOpenGroupInboxID(groupInboxID: ByteArray): Address {
+        return Address.fromSerialized(OPEN_GROUP_INBOX_PREFIX + Hex.toStringCondensed(groupInboxID))
     }
 
     @JvmStatic
@@ -52,7 +60,7 @@ object GroupUtil {
     }
 
     @JvmStatic
-    fun getDecodedOpenGroupInbox(groupID: String): String {
+    fun getDecodedOpenGroupInboxSessionId(groupID: String): String {
         val decodedGroupId = getDecodedGroupID(groupID)
         if (decodedGroupId.split("!").count() > 2) {
             return decodedGroupId.split("!", limit = 3)[2]

libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt

@@ -287,6 +287,8 @@ interface TextSecurePreferences {
         const val OCEAN_DARK = "ocean.dark"
         const val OCEAN_LIGHT = "ocean.light"
 
+        const val ALLOW_MESSAGE_REQUESTS = "libsession.ALLOW_MESSAGE_REQUESTS"
+
         @JvmStatic
         fun getLastConfigurationSyncTime(context: Context): Long {
             return getLongPreference(context, LAST_CONFIGURATION_SYNC_TIME, 0)

libsession/src/main/java/org/session/libsession/utilities/recipients/Recipient.java

@@ -100,6 +100,7 @@ public class Recipient implements RecipientModifiedListener {
   private           String         notificationChannel;
   private           boolean        forceSmsSelection;
   private           String         wrapperHash;
+  private           boolean        blocksCommunityMessageRequests;
 
   private @NonNull  UnidentifiedAccessMode unidentifiedAccessMode = UnidentifiedAccessMode.ENABLED;
 
@@ -192,6 +193,7 @@ public class Recipient implements RecipientModifiedListener {
       this.unidentifiedAccessMode = details.get().unidentifiedAccessMode;
       this.forceSmsSelection      = details.get().forceSmsSelection;
       this.notifyType             = details.get().notifyType;
+      this.blocksCommunityMessageRequests = details.get().blocksCommunityMessageRequests;
 
       this.participants.clear();
       this.participants.addAll(details.get().participants);
@@ -228,6 +230,7 @@ public class Recipient implements RecipientModifiedListener {
             Recipient.this.unidentifiedAccessMode = result.unidentifiedAccessMode;
             Recipient.this.forceSmsSelection      = result.forceSmsSelection;
             Recipient.this.notifyType             = result.notifyType;
+            Recipient.this.blocksCommunityMessageRequests = result.blocksCommunityMessageRequests;
 
             Recipient.this.participants.clear();
             Recipient.this.participants.addAll(result.participants);
@@ -281,6 +284,7 @@ public class Recipient implements RecipientModifiedListener {
     this.unidentifiedAccessMode = details.unidentifiedAccessMode;
     this.forceSmsSelection      = details.forceSmsSelection;
     this.wrapperHash            = details.wrapperHash;
+    this.blocksCommunityMessageRequests = details.blocksCommunityMessageRequests;
 
     this.participants.addAll(details.participants);
     this.resolving    = false;
@@ -321,7 +325,7 @@ public class Recipient implements RecipientModifiedListener {
         return this.name;
       }
     } else if (isOpenGroupInboxRecipient()){
-      String inboxID = GroupUtil.getDecodedOpenGroupInbox(sessionID);
+      String inboxID = GroupUtil.getDecodedOpenGroupInboxSessionId(sessionID);
       Contact contact = storage.getContactWithSessionID(inboxID);
       if (contact == null) { return sessionID; }
       return contact.displayName(Contact.ContactContext.REGULAR);
@@ -345,6 +349,18 @@ public class Recipient implements RecipientModifiedListener {
     if (notify) notifyListeners();
   }
 
+  public boolean getBlocksCommunityMessageRequests() {
+    return blocksCommunityMessageRequests;
+  }
+
+  public void setBlocksCommunityMessageRequests(boolean blocksCommunityMessageRequests) {
+    synchronized (this) {
+      this.blocksCommunityMessageRequests = blocksCommunityMessageRequests;
+    }
+
+    notifyListeners();
+  }
+
   public synchronized @NonNull MaterialColor getColor() {
     if      (isGroupRecipient()) return MaterialColor.GROUP;
     else if (color != null)      return color;
@@ -759,12 +775,43 @@ public class Recipient implements RecipientModifiedListener {
     if (this == o) return true;
     if (o == null || getClass() != o.getClass()) return false;
     Recipient recipient = (Recipient) o;
-    return resolving == recipient.resolving && mutedUntil == recipient.mutedUntil && notifyType == recipient.notifyType && blocked == recipient.blocked && approved == recipient.approved && approvedMe == recipient.approvedMe && expireMessages == recipient.expireMessages && address.equals(recipient.address) && Objects.equals(name, recipient.name) && Objects.equals(customLabel, recipient.customLabel) && Objects.equals(groupAvatarId, recipient.groupAvatarId) && Arrays.equals(profileKey, recipient.profileKey) && Objects.equals(profileName, recipient.profileName) && Objects.equals(profileAvatar, recipient.profileAvatar) && Objects.equals(wrapperHash, recipient.wrapperHash);
+    return resolving == recipient.resolving
+            && mutedUntil == recipient.mutedUntil
+            && notifyType == recipient.notifyType
+            && blocked == recipient.blocked
+            && approved == recipient.approved
+            && approvedMe == recipient.approvedMe
+            && expireMessages == recipient.expireMessages
+            && address.equals(recipient.address)
+            && Objects.equals(name, recipient.name)
+            && Objects.equals(customLabel, recipient.customLabel)
+            && Objects.equals(groupAvatarId, recipient.groupAvatarId)
+            && Arrays.equals(profileKey, recipient.profileKey)
+            && Objects.equals(profileName, recipient.profileName)
+            && Objects.equals(profileAvatar, recipient.profileAvatar)
+            && Objects.equals(wrapperHash, recipient.wrapperHash)
+            && blocksCommunityMessageRequests == recipient.blocksCommunityMessageRequests;
   }
 
   @Override
   public int hashCode() {
-    int result = Objects.hash(address, name, customLabel, resolving, groupAvatarId, mutedUntil, notifyType, blocked, approved, approvedMe, expireMessages, profileName, profileAvatar, wrapperHash);
+    int result = Objects.hash(
+            address,
+            name,
+            customLabel,
+            resolving,
+            groupAvatarId,
+            mutedUntil,
+            notifyType,
+            blocked,
+            approved,
+            approvedMe,
+            expireMessages,
+            profileName,
+            profileAvatar,
+            wrapperHash,
+            blocksCommunityMessageRequests
+    );
     result = 31 * result + Arrays.hashCode(profileKey);
     return result;
   }
@@ -869,55 +916,59 @@ public class Recipient implements RecipientModifiedListener {
     private final UnidentifiedAccessMode unidentifiedAccessMode;
     private final boolean                forceSmsSelection;
     private final String                 wrapperHash;
+    private final boolean                blocksCommunityMessageRequests;
 
     public RecipientSettings(boolean blocked, boolean approved, boolean approvedMe, long muteUntil,
-                      int notifyType,
-                      @NonNull VibrateState messageVibrateState,
-                      @NonNull VibrateState callVibrateState,
-                      @Nullable Uri messageRingtone,
-                      @Nullable Uri callRingtone,
-                      @Nullable MaterialColor color,
-                      int defaultSubscriptionId,
-                      int expireMessages,
-                      @NonNull RegisteredState registered,
-                      @Nullable byte[] profileKey,
-                      @Nullable String systemDisplayName,
-                      @Nullable String systemContactPhoto,
-                      @Nullable String systemPhoneLabel,
-                      @Nullable String systemContactUri,
-                      @Nullable String signalProfileName,
-                      @Nullable String signalProfileAvatar,
-                      boolean profileSharing,
-                      @Nullable String notificationChannel,
-                      @NonNull UnidentifiedAccessMode unidentifiedAccessMode,
-                      boolean forceSmsSelection,
-                      String wrapperHash)
+                             int notifyType,
+                             @NonNull VibrateState messageVibrateState,
+                             @NonNull VibrateState callVibrateState,
+                             @Nullable Uri messageRingtone,
+                             @Nullable Uri callRingtone,
+                             @Nullable MaterialColor color,
+                             int defaultSubscriptionId,
+                             int expireMessages,
+                             @NonNull RegisteredState registered,
+                             @Nullable byte[] profileKey,
+                             @Nullable String systemDisplayName,
+                             @Nullable String systemContactPhoto,
+                             @Nullable String systemPhoneLabel,
+                             @Nullable String systemContactUri,
+                             @Nullable String signalProfileName,
+                             @Nullable String signalProfileAvatar,
+                             boolean profileSharing,
+                             @Nullable String notificationChannel,
+                             @NonNull UnidentifiedAccessMode unidentifiedAccessMode,
+                             boolean forceSmsSelection,
+                             String wrapperHash,
+                             boolean blocksCommunityMessageRequests
+    )
     {
-      this.blocked                = blocked;
-      this.approved               = approved;
-      this.approvedMe             = approvedMe;
-      this.muteUntil              = muteUntil;
-      this.notifyType             = notifyType;
-      this.messageVibrateState    = messageVibrateState;
-      this.callVibrateState       = callVibrateState;
-      this.messageRingtone        = messageRingtone;
-      this.callRingtone           = callRingtone;
-      this.color                  = color;
-      this.defaultSubscriptionId  = defaultSubscriptionId;
-      this.expireMessages         = expireMessages;
-      this.registered             = registered;
-      this.profileKey             = profileKey;
-      this.systemDisplayName      = systemDisplayName;
-      this.systemContactPhoto     = systemContactPhoto;
-      this.systemPhoneLabel       = systemPhoneLabel;
-      this.systemContactUri       = systemContactUri;
-      this.signalProfileName      = signalProfileName;
-      this.signalProfileAvatar    = signalProfileAvatar;
-      this.profileSharing         = profileSharing;
-      this.notificationChannel    = notificationChannel;
-      this.unidentifiedAccessMode = unidentifiedAccessMode;
-      this.forceSmsSelection      = forceSmsSelection;
-      this.wrapperHash            = wrapperHash;
+      this.blocked                        = blocked;
+      this.approved                       = approved;
+      this.approvedMe                     = approvedMe;
+      this.muteUntil                      = muteUntil;
+      this.notifyType                     = notifyType;
+      this.messageVibrateState            = messageVibrateState;
+      this.callVibrateState               = callVibrateState;
+      this.messageRingtone                = messageRingtone;
+      this.callRingtone                   = callRingtone;
+      this.color                          = color;
+      this.defaultSubscriptionId          = defaultSubscriptionId;
+      this.expireMessages                 = expireMessages;
+      this.registered                     = registered;
+      this.profileKey                     = profileKey;
+      this.systemDisplayName              = systemDisplayName;
+      this.systemContactPhoto             = systemContactPhoto;
+      this.systemPhoneLabel               = systemPhoneLabel;
+      this.systemContactUri               = systemContactUri;
+      this.signalProfileName              = signalProfileName;
+      this.signalProfileAvatar            = signalProfileAvatar;
+      this.profileSharing                 = profileSharing;
+      this.notificationChannel            = notificationChannel;
+      this.unidentifiedAccessMode         = unidentifiedAccessMode;
+      this.forceSmsSelection              = forceSmsSelection;
+      this.wrapperHash                    = wrapperHash;
+      this.blocksCommunityMessageRequests = blocksCommunityMessageRequests;
     }
 
     public @Nullable MaterialColor getColor() {
@@ -1020,6 +1071,10 @@ public class Recipient implements RecipientModifiedListener {
       return wrapperHash;
     }
 
+    public boolean getBlocksCommunityMessageRequests() {
+      return blocksCommunityMessageRequests;
+    }
+
   }
 
 

libsession/src/main/java/org/session/libsession/utilities/recipients/RecipientProvider.java

@@ -178,6 +178,7 @@ class RecipientProvider {
     @NonNull  final UnidentifiedAccessMode unidentifiedAccessMode;
               final boolean                forceSmsSelection;
               final String                 wrapperHash;
+              final boolean                blocksCommunityMessageRequests;
 
     RecipientDetails(@Nullable String name, @Nullable Long groupAvatarId,
                      boolean systemContact, boolean isLocalNumber, @Nullable RecipientSettings settings,
@@ -211,6 +212,7 @@ class RecipientProvider {
       this.unidentifiedAccessMode          = settings     != null ? settings.getUnidentifiedAccessMode() : UnidentifiedAccessMode.DISABLED;
       this.forceSmsSelection               = settings     != null && settings.isForceSmsSelection();
       this.wrapperHash                     = settings     != null ? settings.getWrapperHash() : null;
+      this.blocksCommunityMessageRequests  = settings     != null && settings.getBlocksCommunityMessageRequests();
 
       if (name == null && settings != null) this.name = settings.getSystemDisplayName();
       else                                  this.name = name;