mirror of
https://github.com/vanitasvitae/Smack.git
synced 2024-12-22 02:27:58 +01:00
[sid] Check if there is already a <origin-id/> in addOriginId()
This commit is contained in:
parent
b276b89916
commit
800c771700
1 changed files with 13 additions and 3 deletions
|
@ -1,6 +1,6 @@
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* Copyright 2018 Paul Schaub
|
* Copyright 2018 Paul Schaub, 2021 Florian Schmaus
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
|
@ -48,7 +48,12 @@ public class OriginIdElement extends StableAndUniqueIdElement {
|
||||||
@Deprecated
|
@Deprecated
|
||||||
// TODO: Remove in Smack 4.5.
|
// TODO: Remove in Smack 4.5.
|
||||||
public static OriginIdElement addOriginId(Message message) {
|
public static OriginIdElement addOriginId(Message message) {
|
||||||
OriginIdElement originId = new OriginIdElement();
|
OriginIdElement originId = message.getExtension(OriginIdElement.class);
|
||||||
|
if (originId != null) {
|
||||||
|
return originId;
|
||||||
|
}
|
||||||
|
|
||||||
|
originId = new OriginIdElement();
|
||||||
message.addExtension(originId);
|
message.addExtension(originId);
|
||||||
// TODO: Find solution to have both the originIds stanzaId and a nice to look at incremental stanzaID.
|
// TODO: Find solution to have both the originIds stanzaId and a nice to look at incremental stanzaID.
|
||||||
// message.setStanzaId(originId.getId());
|
// message.setStanzaId(originId.getId());
|
||||||
|
@ -62,7 +67,12 @@ public class OriginIdElement extends StableAndUniqueIdElement {
|
||||||
* @return the added origin-id element.
|
* @return the added origin-id element.
|
||||||
*/
|
*/
|
||||||
public static OriginIdElement addTo(MessageBuilder messageBuilder) {
|
public static OriginIdElement addTo(MessageBuilder messageBuilder) {
|
||||||
OriginIdElement originId = new OriginIdElement();
|
OriginIdElement originId = messageBuilder.getExtension(OriginIdElement.class);
|
||||||
|
if (originId != null) {
|
||||||
|
return originId;
|
||||||
|
}
|
||||||
|
|
||||||
|
originId = new OriginIdElement();
|
||||||
messageBuilder.addExtension(originId);
|
messageBuilder.addExtension(originId);
|
||||||
// TODO: Find solution to have both the originIds stanzaId and a nice to look at incremental stanzaID.
|
// TODO: Find solution to have both the originIds stanzaId and a nice to look at incremental stanzaID.
|
||||||
// message.setStanzaId(originId.getId());
|
// message.setStanzaId(originId.getId());
|
||||||
|
|
Loading…
Reference in a new issue