vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2025-09-09 17:19:39 +02:00
Code Issues Releases Wiki Activity

Delete APIs scheduled for removal with Smack 4.5

Browse source
This commit is contained in:
Florian Schmaus 2024-09-14 21:34:47 +02:00
parent af77e561c5
commit 4a101e2c99
38 changed files with 39 additions and 1534 deletions
Download patch file Download diff file Expand all files Collapse all files

14
smack-im/src/main/java/org/jivesoftware/smack/chat/Chat.java
View file

@ -133,10 +133,12 @@ public class Chat {
public void sendMessage(Message message) throws NotConnectedException, InterruptedException {
// Force the recipient, message type, and thread ID since the user elected
// to send the message through this chat object.
message.setTo(participant);
message.setType(Message.Type.chat);
message.setThread(threadID);
chatManager.sendMessage(this, message);
Message chatMessage = message.asBuilder()
.to(participant)
.ofType(Message.Type.chat)
.setThread(threadID)
.build();
chatManager.sendMessage(this, chatMessage);
}
/**
@ -199,10 +201,10 @@ public class Chat {
// Because the collector and listeners are expecting a thread ID with
// a specific value, set the thread ID on the message even though it
// probably never had one.
message.setThread(threadID);
Message chatMessage = message.asBuilder().setThread(threadID).build();
for (ChatMessageListener listener : listeners) {
listener.processMessage(this, message);
listener.processMessage(this, chatMessage);
}
}

25
smack-im/src/main/java/org/jivesoftware/smack/roster/Roster.java
View file

@ -1,6 +1,6 @@
/**
*
* Copyright 2003-2007 Jive Software, 2016-2022 Florian Schmaus.
* Copyright 2003-2007 Jive Software, 2016-2024 Florian Schmaus.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -218,7 +218,7 @@ public final class Roster extends Manager {
* <p>
* This method will never return <code>null</code>, instead if the user has not yet logged into
* the server all modifying methods of the returned roster object
* like {@link Roster#createEntry(BareJid, String, String[])},
* like {@link Roster#createItemAndRequestSubscription(BareJid, String, String[])},
* {@link Roster#removeEntry(RosterEntry)} , etc. except adding or removing
* {@link RosterListener}s will throw an IllegalStateException.
* </p>
@ -754,27 +754,6 @@ public final class Roster extends Manager {
return group;
}
/**
* Creates a new roster entry and presence subscription. The server will asynchronously
* update the roster with the subscription status.
*
* @param user the user. (e.g. johndoe@jabber.org)
* @param name the nickname of the user.
* @param groups the list of group names the entry will belong to, or <code>null</code> if
* the roster entry won't belong to a group.
* @throws NoResponseException if there was no response from the server.
* @throws XMPPErrorException if an XMPP exception occurs.
* @throws NotLoggedInException If not logged in.
* @throws NotConnectedException if the XMPP connection is not connected.
* @throws InterruptedException if the calling thread was interrupted.
* @deprecated use {@link #createItemAndRequestSubscription(BareJid, String, String[])} instead.
*/
// TODO: Remove in Smack 4.5.
@Deprecated
public void createEntry(BareJid user, String name, String[] groups) throws NotLoggedInException, NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException {
createItemAndRequestSubscription(user, name, groups);
}
/**
* Creates a new roster item. The server will asynchronously update the roster with the subscription status.
* <p>