From 3ccca04f1ce6557903641141298e21102cb0503f Mon Sep 17 00:00:00 2001
From: Jojo-1000 <33495614+Jojo-1000@users.noreply.github.com>
Date: Sat, 1 Jun 2024 22:44:27 +0200
Subject: [PATCH] Change XMPP library to Artalk.Xmpp.
---
.../Duplicati.Library.RestAPI.csproj | 4 +--
.../Duplicati.Library.Modules.Builtin.csproj | 3 +-
.../Modules/Builtin/SendJabberMessage.cs | 29 ++++++++++---------
Duplicati/Server/Duplicati.Server.csproj | 4 +--
4 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/Duplicati.Library.RestAPI/Duplicati.Library.RestAPI.csproj b/Duplicati.Library.RestAPI/Duplicati.Library.RestAPI.csproj
index e10690aa5..839bdb081 100644
--- a/Duplicati.Library.RestAPI/Duplicati.Library.RestAPI.csproj
+++ b/Duplicati.Library.RestAPI/Duplicati.Library.RestAPI.csproj
@@ -12,8 +12,8 @@
-
-
+
+
diff --git a/Duplicati/Library/Modules/Builtin/Duplicati.Library.Modules.Builtin.csproj b/Duplicati/Library/Modules/Builtin/Duplicati.Library.Modules.Builtin.csproj
index 4a27be489..dda965bfd 100644
--- a/Duplicati/Library/Modules/Builtin/Duplicati.Library.Modules.Builtin.csproj
+++ b/Duplicati/Library/Modules/Builtin/Duplicati.Library.Modules.Builtin.csproj
@@ -7,9 +7,8 @@
+
-
-
diff --git a/Duplicati/Library/Modules/Builtin/SendJabberMessage.cs b/Duplicati/Library/Modules/Builtin/SendJabberMessage.cs
index 697d16370..ccb214666 100644
--- a/Duplicati/Library/Modules/Builtin/SendJabberMessage.cs
+++ b/Duplicati/Library/Modules/Builtin/SendJabberMessage.cs
@@ -25,7 +25,7 @@ using Duplicati.Library.Interface;
using Duplicati.Library.Logging;
using System.Net.NetworkInformation;
using Duplicati.Library.Modules.Builtin.ResultSerialization;
-using Sharp.Xmpp.Client;
+using Artalk.Xmpp.Client;
namespace Duplicati.Library.Modules.Builtin
{
@@ -119,7 +119,7 @@ namespace Duplicati.Library.Modules.Builtin
///
/// A localized string describing the module with a friendly name
///
- public override string DisplayName { get { return Strings.SendJabberMessage.DisplayName;} }
+ public override string DisplayName { get { return Strings.SendJabberMessage.DisplayName; } }
///
/// A localized description of the module
@@ -203,31 +203,32 @@ namespace Duplicati.Library.Modules.Builtin
if (string.IsNullOrWhiteSpace(resource))
resource = "Duplicati";
- using (XmppClient client = new XmppClient(uri.Host, uri.Username, string.IsNullOrWhiteSpace(m_password) ? uri.Password : m_password, uri.Port == -1 ? (uri.Scheme == "https" ? 5223 :5222) : uri.Port))
+ using (ArtalkXmppClient client = new ArtalkXmppClient(uri.Host, uri.Username, string.IsNullOrWhiteSpace(m_password) ? uri.Password : m_password, uri.Port == -1 ? (uri.Scheme == "https" ? 5223 : 5222) : uri.Port))
{
client.Connect(resource);
try
{
- foreach(var recipient in m_to.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries))
+ foreach (var recipient in m_to.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries))
{
- client.SendMessage(recipient, new Dictionary(){ {"en", body} });
+ Artalk.Xmpp.Jid jid = new Artalk.Xmpp.Jid(recipient);
+ client.SendMessage(jid, new Dictionary() { { "en", body } });
// hack to work around a failure to send the second time
// (the xmpp server reports a read failure)
- try
- {
- client.Ping(recipient);
- }
- catch {}
+ try
+ {
+ client.Ping(jid);
+ }
+ catch { }
}
- }
+ }
catch (Exception e)
{
Logging.Log.WriteWarningMessage(LOGTAG, "XMPPSendError", e, "Failed to send to XMPP messages: {0}", e.Message);
}
- finally
- {
+ finally
+ {
client.Close();
- }
+ }
}
}
diff --git a/Duplicati/Server/Duplicati.Server.csproj b/Duplicati/Server/Duplicati.Server.csproj
index 256182eb9..37fafe963 100644
--- a/Duplicati/Server/Duplicati.Server.csproj
+++ b/Duplicati/Server/Duplicati.Server.csproj
@@ -10,9 +10,9 @@
-
+
-
+