--- a/sat/plugins/plugin_sec_aesgcm.py	Thu Oct 06 16:02:05 2022 +0200
+++ b/sat/plugins/plugin_sec_aesgcm.py	Thu Oct 06 16:02:05 2022 +0200
@@ -63,13 +63,13 @@
         log.info(_("AESGCM plugin initialization"))
         self._http_upload = host.plugins['XEP-0363']
         self._attach = host.plugins["ATTACH"]
-        host.plugins["DOWNLOAD"].registerScheme(
+        host.plugins["DOWNLOAD"].register_scheme(
             "aesgcm", self.download
         )
         self._attach.register(
             self.canHandleAttachment, self.attach, encrypted=True)
-        host.trigger.add("XEP-0363_upload_size", self._uploadSizeTrigger)
-        host.trigger.add("XEP-0363_upload", self._uploadTrigger)
+        host.trigger.add("XEP-0363_upload_pre_slot", self._upload_pre_slot)
+        host.trigger.add("XEP-0363_upload", self._upload_trigger)
         host.trigger.add("messageReceived", self._messageReceivedTrigger)
 
     async def download(self, client, uri_parsed, dest_path, options):
@@ -129,7 +129,7 @@
                 decryptor=decryptor))
         else:
             d = defer.Deferred()
-            self.host.plugins["DOWNLOAD"].errbackDownload(file_obj, d, resp)
+            self.host.plugins["DOWNLOAD"].errback_download(file_obj, d, resp)
         return progress_id, d
 
     async def canHandleAttachment(self, client, data):
@@ -140,13 +140,13 @@
         else:
             return True
 
-    async def _uploadCb(self, client, filepath, filename, options):
-        options['encryption'] = C.ENC_AES_GCM
-        return await self._http_upload.fileHTTPUpload(
+    async def _upload_cb(self, client, filepath, filename, extra):
+        extra['encryption'] = C.ENC_AES_GCM
+        return await self._http_upload.file_http_upload(
             client=client,
             filepath=filepath,
             filename=filename,
-            options=options
+            extra=extra
         )
 
     async def attach(self, client, data):
@@ -160,14 +160,16 @@
         if not data['message'] or data['message'] == {'': ''}:
             extra_attachments = attachments[1:]
             del attachments[1:]
-            await self._attach.uploadFiles(client, data, upload_cb=self._uploadCb)
+            await self._attach.upload_files(client, data, upload_cb=self._upload_cb)
         else:
             # we have a message, we must send first attachment separately
             extra_attachments = attachments[:]
             attachments.clear()
             del data["extra"][C.MESS_KEY_ATTACHMENTS]
 
-        body_elt = next(data["xml"].elements(C.NS_CLIENT, "body"))
+        body_elt = data["xml"].body
+        if body_elt is None:
+            body_elt = data["xml"].addElement("body")
 
         for attachment in attachments:
             body_elt.addContent(attachment["url"])
@@ -219,11 +221,11 @@
             decrypted = decryptor.update(data)
             file_obj.write(decrypted)
 
-    def _uploadSizeTrigger(self, client, options, file_path, size, size_adjust):
-        if options.get('encryption') != C.ENC_AES_GCM:
+    def _upload_pre_slot(self, client, extra, file_metadata):
+        if extra.get('encryption') != C.ENC_AES_GCM:
             return True
         # the tag is appended to the file
-        size_adjust.append(16)
+        file_metadata["size"] += 16
         return True
 
     def _encrypt(self, data, encryptor):
@@ -239,8 +241,8 @@
                 # as we have already finalized, we can now send EOF
                 return b''
 
-    def _uploadTrigger(self, client, options, sat_file, file_producer, slot):
-        if options.get('encryption') != C.ENC_AES_GCM:
+    def _upload_trigger(self, client, extra, sat_file, file_producer, slot):
+        if extra.get('encryption') != C.ENC_AES_GCM:
             return True
         log.debug("encrypting file with AES-GCM")
         iv = secrets.token_bytes(12)
@@ -255,7 +257,7 @@
         # so we need to check with final data length to avoid a warning on close()
         sat_file.check_size_with_read = True
 
-        # file_producer get length directly from file, and this cause trouble has
+        # file_producer get length directly from file, and this cause trouble as
         # we have to change the size because of encryption. So we adapt it here,
         # else the producer would stop reading prematurely
         file_producer.length = sat_file.size