From ba87cbc0705f3137f098b9ea0c7ea9c161bc0427 Mon Sep 17 00:00:00 2001
From: 0x330a <92654767+0x330a@users.noreply.github.com>
Date: Mon, 16 Jan 2023 16:54:16 +1100
Subject: [PATCH] fix: standardise call menu recipient function to share with
 the new action bar to center better. issue with closed group creation on
 multi device potentially

---
 .../securesms/conversation/ConversationActionBarView.kt  | 9 +++++++++
 .../conversation/v2/menus/ConversationMenuHelper.kt      | 3 +--
 app/src/main/res/layout/view_conversation_action_bar.xml | 1 +
 .../sending_receiving/ReceivedMessageHandler.kt          | 4 ++--
 .../libsession/utilities/recipients/Recipient.java       | 4 ++++
 5 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActionBarView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActionBarView.kt
index 21b3fb82df..7aa3ba7e9c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActionBarView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActionBarView.kt
@@ -100,6 +100,15 @@ class ConversationActionBarView : LinearLayout {
             else -> recipient.toShortString()
         }
         updateSubtitle(recipient, openGroup, config)
+
+        val marginEnd = if (recipient.showCallMenu()) {
+            0
+        } else {
+            binding.profilePictureView.root.width
+        }
+        val lp = binding.conversationTitleContainer.layoutParams as MarginLayoutParams
+        lp.marginEnd = marginEnd
+        binding.conversationTitleContainer.layoutParams = lp
     }
 
     fun updateSubtitle(recipient: Recipient, openGroup: OpenGroup? = null, config: ExpirationConfiguration? = null) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt
index ef5c36061e..709bf4df68 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt
@@ -18,7 +18,6 @@ import androidx.core.content.pm.ShortcutInfoCompat
 import androidx.core.content.pm.ShortcutManagerCompat
 import androidx.core.graphics.drawable.IconCompat
 import network.loki.messenger.R
-import org.session.libsession.messaging.messages.ExpirationConfiguration
 import org.session.libsession.messaging.sending_receiving.MessageSender
 import org.session.libsession.messaging.sending_receiving.leave
 import org.session.libsession.utilities.GroupUtil.doubleDecodeGroupID
@@ -85,7 +84,7 @@ object ConversationMenuHelper {
             inflater.inflate(R.menu.menu_conversation_notification_settings, menu)
         }
 
-        if (!thread.isGroupRecipient && thread.hasApprovedMe()) {
+        if (thread.showCallMenu()) {
             inflater.inflate(R.menu.menu_conversation_call, menu)
         }
 
diff --git a/app/src/main/res/layout/view_conversation_action_bar.xml b/app/src/main/res/layout/view_conversation_action_bar.xml
index c14a366a2d..2d6f574f71 100644
--- a/app/src/main/res/layout/view_conversation_action_bar.xml
+++ b/app/src/main/res/layout/view_conversation_action_bar.xml
@@ -13,6 +13,7 @@
         android:layout_height="@dimen/medium_profile_picture_size" />
 
     <LinearLayout
+        android:id="@+id/conversationTitleContainer"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:gravity="center_horizontal|center_vertical"
diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt
index d486fdcaf1..c8e7e3c855 100644
--- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt
@@ -173,7 +173,7 @@ private fun handleConfigurationMessage(message: ConfigurationMessage) {
         if (allClosedGroupPublicKeys.contains(closedGroup.publicKey)) {
             // just handle the closed group encryption key pairs to avoid sync'd devices getting out of sync
             storage.addClosedGroupEncryptionKeyPair(closedGroup.encryptionKeyPair!!, closedGroup.publicKey)
-        } else if (firstTimeSync) {
+        } else {
             // only handle new closed group if it's first time sync
             handleNewClosedGroup(message.sender!!, message.sentTimestamp!!, closedGroup.publicKey, closedGroup.name,
                 closedGroup.encryptionKeyPair!!, closedGroup.members, closedGroup.admins, message.sentTimestamp!!, closedGroup.expirationTimer)
@@ -502,7 +502,7 @@ private fun MessageReceiver.handleClosedGroupControlMessage(message: ClosedGroup
 private fun MessageReceiver.handleNewClosedGroup(message: ClosedGroupControlMessage) {
     val kind = message.kind!! as? ClosedGroupControlMessage.Kind.New ?: return
     val recipient = Recipient.from(MessagingModuleConfiguration.shared.context, Address.fromSerialized(message.sender!!), false)
-    if (!recipient.isApproved) return
+    if (!recipient.isApproved && !recipient.isLocalNumber) return
     val groupPublicKey = kind.publicKey.toByteArray().toHexString()
     val members = kind.members.map { it.toByteArray().toHexString() }
     val admins = kind.admins.map { it.toByteArray().toHexString() }
diff --git a/libsession/src/main/java/org/session/libsession/utilities/recipients/Recipient.java b/libsession/src/main/java/org/session/libsession/utilities/recipients/Recipient.java
index 247b802ed6..a82ffdf954 100644
--- a/libsession/src/main/java/org/session/libsession/utilities/recipients/Recipient.java
+++ b/libsession/src/main/java/org/session/libsession/utilities/recipients/Recipient.java
@@ -750,6 +750,10 @@ public class Recipient implements RecipientModifiedListener {
     return this;
   }
 
+  public synchronized boolean showCallMenu() {
+    return !isGroupRecipient() && hasApprovedMe();
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) return true;