From 81e9b4c0e24d1b70e3fefbefc6ac81aad049670d Mon Sep 17 00:00:00 2001
From: Nicolas Fella <nicolas.fella@gmx.de>
Date: Mon, 23 May 2022 17:10:02 +0200
Subject: [PATCH] Add activation token parameter to Email portal

This may be needed by the email client to function properly
---
 data/org.freedesktop.impl.portal.Email.xml |  6 ++++++
 data/org.freedesktop.portal.Email.xml      | 10 +++++++++-
 src/email.c                                |  5 +++--
 tests/test-portals.c                       |  2 +-
 tests/test_email.py                        |  2 +-
 5 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/data/org.freedesktop.impl.portal.Email.xml b/data/org.freedesktop.impl.portal.Email.xml
index 4fdd2400e..d95879801 100644
--- a/data/org.freedesktop.impl.portal.Email.xml
+++ b/data/org.freedesktop.impl.portal.Email.xml
@@ -81,6 +81,12 @@
               The uris for files to attach.
             </para></listitem>
           </varlistentry>
+          <varlistentry>
+            <term>activation_token s</term>
+            <listitem><para>
+              A token that can be used to activate the chosen application.
+            </para></listitem>
+          </varlistentry>
         </variablelist>
     -->
     <method name="ComposeEmail">
diff --git a/data/org.freedesktop.portal.Email.xml b/data/org.freedesktop.portal.Email.xml
index 39959e3f7..98e79da49 100644
--- a/data/org.freedesktop.portal.Email.xml
+++ b/data/org.freedesktop.portal.Email.xml
@@ -26,7 +26,7 @@
       This simple portal lets sandboxed applications request to send an email,
       optionally providing an address, subject, body and attachments.
 
-      This documentation describes version 3 of this interface.
+      This documentation describes version 4 of this interface.
   -->
   <interface name="org.freedesktop.portal.Email">
     <!--
@@ -109,6 +109,14 @@
               File descriptors for files to attach.
             </para></listitem>
           </varlistentry>
+          <varlistentry>
+            <term>activation_token s</term>
+            <listitem><para>
+              A token that can be used to activate the chosen application.
+            </para><para>
+              The activation_token option was introduced in version 4 of the interface.
+            </para></listitem>
+          </varlistentry>
         </variablelist>
 
         All the keys in the options are are optional.
diff --git a/src/email.c b/src/email.c
index 403da4e7c..5806c7667 100644
--- a/src/email.c
+++ b/src/email.c
@@ -192,7 +192,8 @@ static XdpOptionKey compose_email_options[] = {
   { "cc", G_VARIANT_TYPE_STRING_ARRAY, validate_email_addresses },
   { "bcc", G_VARIANT_TYPE_STRING_ARRAY, validate_email_addresses },
   { "subject", G_VARIANT_TYPE_STRING, validate_email_subject },
-  { "body", G_VARIANT_TYPE_STRING, NULL }
+  { "body", G_VARIANT_TYPE_STRING, NULL },
+  { "activation_token", G_VARIANT_TYPE_STRING, NULL },
 };
 
 static gboolean
@@ -301,7 +302,7 @@ email_iface_init (XdpDbusEmailIface *iface)
 static void
 email_init (Email *email)
 {
-  xdp_dbus_email_set_version (XDP_DBUS_EMAIL (email), 3);
+  xdp_dbus_email_set_version (XDP_DBUS_EMAIL (email), 4);
 }
 
 static void
diff --git a/tests/test-portals.c b/tests/test-portals.c
index bae93a5dc..461604ebc 100644
--- a/tests/test-portals.c
+++ b/tests/test-portals.c
@@ -424,7 +424,7 @@ test_##pp##_exists (void) \
 DEFINE_TEST_EXISTS(account, ACCOUNT, 1)
 DEFINE_TEST_EXISTS(background, BACKGROUND, 2)
 DEFINE_TEST_EXISTS(camera, CAMERA, 1)
-DEFINE_TEST_EXISTS(email, EMAIL, 3)
+DEFINE_TEST_EXISTS(email, EMAIL, 4)
 DEFINE_TEST_EXISTS(file_chooser, FILE_CHOOSER, 3)
 DEFINE_TEST_EXISTS(game_mode, GAME_MODE, 4)
 DEFINE_TEST_EXISTS(inhibit, INHIBIT, 3)
diff --git a/tests/test_email.py b/tests/test_email.py
index d15e101ac..487099c4f 100644
--- a/tests/test_email.py
+++ b/tests/test_email.py
@@ -20,7 +20,7 @@ def portal_has_impl():
 
 class TestEmail:
     def test_version(self, portal_mock):
-        portal_mock.check_version(3)
+        portal_mock.check_version(4)
 
     def test_email_basic(self, portal_mock):
         addresses = ["mclasen@redhat.com"]