TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-01-11 20:03:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
0x330a 2023-01-16 16:54:16 +11:00
parent dd51c9ab41
commit ba87cbc070
No known key found for this signature in database
GPG Key ID: 267811D6E6A2698C
5 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActionBarView.kt
View File

@ -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) {

3
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt
View File

@ -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)
}

1
app/src/main/res/layout/view_conversation_action_bar.xml
View File

@ -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"

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

@ -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() }

4
libsession/src/main/java/org/session/libsession/utilities/recipients/Recipient.java
View File

@ -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;