branch master updated: gnu: jami: Apply a patch to fix receiving of text messages over SIP.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

apteryx pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new e7502b3300 gnu: jami: Apply a patch to fix receiving of text messages 
over SIP.
e7502b3300 is described below

commit e7502b3300cc4f70194fc28856b84bfccbdeb46d
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Tue Nov 29 11:22:53 2022 -0500

    gnu: jami: Apply a patch to fix receiving of text messages over SIP.
    
    * gnu/packages/patches/jami-sip-contacts.patch: New patch.
    * gnu/local.mk (dist_patch_DATA): Register it.
    * gnu/packages/jami.scm (%jami-sources): Apply it.
---
 gnu/local.mk                                 |  1 +
 gnu/packages/jami.scm                        |  1 +
 gnu/packages/patches/jami-sip-contacts.patch | 38 ++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+)

diff --git a/gnu/local.mk b/gnu/local.mk
index 9120d7a263..9443dd617a 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1345,6 +1345,7 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/jami-fix-unit-tests-build.patch          \
   %D%/packages/patches/jami-libjami-headers-search.patch       \
   %D%/packages/patches/jami-no-webengine.patch                 \
+  %D%/packages/patches/jami-sip-contacts.patch                 \
   %D%/packages/patches/jami-sip-unregister.patch               \
   %D%/packages/patches/jami-xcb-link.patch                     \
   %D%/packages/patches/jamvm-1.5.1-aarch64-support.patch       \
diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index a9a988ca5a..45618beb9b 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -99,6 +99,7 @@
                              "jami-fix-unit-tests-build.patch"
                              "jami-fix-qml-imports.patch"
                              "jami-no-webengine.patch"
+                             "jami-sip-contacts.patch"
                              "jami-sip-unregister.patch"
                              "jami-xcb-link.patch"))))
 
diff --git a/gnu/packages/patches/jami-sip-contacts.patch 
b/gnu/packages/patches/jami-sip-contacts.patch
new file mode 100644
index 0000000000..dce8f6b98d
--- /dev/null
+++ b/gnu/packages/patches/jami-sip-contacts.patch
@@ -0,0 +1,38 @@
+From 3ba007d02bc19e499c8f3c2345302453028831a8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
+ <sebastien.blin@savoirfairelinux.com>
+Date: Tue, 29 Nov 2022 09:26:20 -0500
+Subject: [PATCH] misc: fix incoming message sip
+
+We do not need to check contacts for SIP as it will be considered
+automatically as a contact
+
+Change-Id: If78113e9d79dcd695c39c2d12c0441e2cb282737
+---
+ src/libclient/conversationmodel.cpp | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/client-qt/src/libclient/conversationmodel.cpp 
b/client-qt/src/libclient/conversationmodel.cpp
+index dba206bd..5604a17c 100644
+--- a/client-qt/src/libclient/conversationmodel.cpp
++++ b/client-qt/src/libclient/conversationmodel.cpp
+@@ -3611,8 +3611,12 @@ ConversationModelPimpl::addIncomingMessage(const 
QString& peerId,
+         try {
+             auto contact = linked.owner.contactModel->getContact(peerId);
+             isRequest = contact.profileInfo.type == profile::Type::PENDING;
+-            if (isRequest && !contact.isBanned && peerId != 
linked.owner.profileInfo.uri) {
+-                addContactRequest(peerId);
++            // if isSip, it will be a contact!
++            auto isSip = linked.owner.profileInfo.type == profile::Type::SIP;
++            if (isSip
++                || (isRequest && !contact.isBanned && peerId != 
linked.owner.profileInfo.uri)) {
++                if (!isSip)
++                    addContactRequest(peerId);
+                 convIds.push_back(storage::beginConversationWithPeer(db, 
contact.profileInfo.uri));
+                 auto& conv = 
getConversationForPeerUri(contact.profileInfo.uri).get();
+                 conv.uid = convIds[0];
+
+base-commit: 6f30acf0043d07dcbe63ee8636509885a9b6fd76
+--
+2.38.1
+