Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-26 00:02:06 +01:00
Code Issues Releases Wiki Activity

Merge pull request #407 from vanitasvitae/oxDeadCode

Browse source 
OX-IM: Remove redundant code to add self to recipients
This commit is contained in:
Florian Schmaus 2020-07-18 14:46:35 +02:00 committed by GitHub
commit 037bf3a27c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
smack-openpgp/src/main/java/org/jivesoftware/smackx/ox_im/OXInstantMessagingManager.java
View file

@ -264,7 +264,7 @@ public final class OXInstantMessagingManager extends Manager {
* Add an OX-IM message element to a message. * Add an OX-IM message element to a message.
* *
* @param messageBuilder message * @param messageBuilder message
* @param contacts recipients of the message * @param recipients recipients of the message
* @param payload payload which will be encrypted and signed * @param payload payload which will be encrypted and signed
* *
* @return metadata about the messages encryption + signatures. * @return metadata about the messages encryption + signatures.
@ -273,13 +273,9 @@ public final class OXInstantMessagingManager extends Manager {
* @throws PGPException in case something goes wrong during encryption * @throws PGPException in case something goes wrong during encryption
* @throws IOException IO is dangerous (we need to read keys) * @throws IOException IO is dangerous (we need to read keys)
*/ */
public OpenPgpMetadata addOxMessage(MessageBuilder messageBuilder, Set<OpenPgpContact> contacts, List<ExtensionElement> payload) public OpenPgpMetadata addOxMessage(MessageBuilder messageBuilder, Set<OpenPgpContact> recipients, List<ExtensionElement> payload)
throws SmackException.NotLoggedInException, IOException, PGPException { throws SmackException.NotLoggedInException, IOException, PGPException {
HashSet<OpenPgpContact> recipients = new HashSet<>(contacts);
OpenPgpContact self = openPgpManager.getOpenPgpSelf();
recipients.add(self);
OpenPgpElementAndMetadata openPgpElementAndMetadata = signAndEncrypt(recipients, payload); OpenPgpElementAndMetadata openPgpElementAndMetadata = signAndEncrypt(recipients, payload);
messageBuilder.addExtension(openPgpElementAndMetadata.getElement()); messageBuilder.addExtension(openPgpElementAndMetadata.getElement());